summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglaznev@webrtc.org <glaznev@webrtc.org>2014-09-18 21:11:29 +0000
committerglaznev@webrtc.org <glaznev@webrtc.org>2014-09-18 21:11:29 +0000
commit34f765950b7a4adb07c284f4522e2a64c9364aff (patch)
tree17ab8bf359d95ae055095d558847552cf1ee3459
parentf6cfdbfa66a2ff7cfd93df5d49d6cf624cd80d95 (diff)
downloadtalk-34f765950b7a4adb07c284f4522e2a64c9364aff.tar.gz
Revert maximum video codec resolution on Android back to 720p again.
Some low end Android devices still have problems with 1080p support. BUG=3757 R=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/24639004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7228 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--app/webrtc/jsepsessiondescription.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/webrtc/jsepsessiondescription.cc b/app/webrtc/jsepsessiondescription.cc
index 9d47fe3..c318d91 100644
--- a/app/webrtc/jsepsessiondescription.cc
+++ b/app/webrtc/jsepsessiondescription.cc
@@ -61,8 +61,15 @@ const int JsepSessionDescription::kDefaultVideoCodecId = 100;
const int JsepSessionDescription::kDefaultVideoCodecFramerate = 60;
const char JsepSessionDescription::kDefaultVideoCodecName[] = "VP8";
// Used as default max video codec size before we have it in signaling.
+#if defined(ANDROID)
+// Limit default max video codec size for Android to avoid
+// HW VP8 codec initialization failure for resolution higher than 720p.
+const int JsepSessionDescription::kMaxVideoCodecWidth = 1280;
+const int JsepSessionDescription::kMaxVideoCodecHeight = 720;
+#else
const int JsepSessionDescription::kMaxVideoCodecWidth = 1920;
const int JsepSessionDescription::kMaxVideoCodecHeight = 1080;
+#endif
const int JsepSessionDescription::kDefaultVideoCodecPreference = 1;
SessionDescriptionInterface* CreateSessionDescription(const std::string& type,