From 4b234044d559e11afed48cf2e8335f4d44f4ba1c Mon Sep 17 00:00:00 2001 From: "glaznev@webrtc.org" Date: Thu, 4 Sep 2014 19:50:07 +0000 Subject: [PATCH] Reduce maximum video resolution for Android. HW video encoder and decoder can not be initialized with 3840x2160 resolution. BUG=3757,3738 R=juberti@webrtc.org Review URL: https://webrtc-codereview.appspot.com/25379004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7071 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/jsepsessiondescription.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/talk/app/webrtc/jsepsessiondescription.cc b/talk/app/webrtc/jsepsessiondescription.cc index ac0fe05b0a..8e8ebc41d1 100644 --- a/talk/app/webrtc/jsepsessiondescription.cc +++ b/talk/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 = 3840; const int JsepSessionDescription::kMaxVideoCodecHeight = 2160; +#endif const int JsepSessionDescription::kDefaultVideoCodecPreference = 1; SessionDescriptionInterface* CreateSessionDescription(const std::string& type,