diff options
author | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-09-04 19:50:07 +0000 |
---|---|---|
committer | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-09-04 19:50:07 +0000 |
commit | 469a71af9d5f8022635ba955d2715f8a81c4be65 (patch) | |
tree | f3eff1d881134059456ded5f419e19a2acc44a27 /app | |
parent | 64453e03f1d9f59e06f09dcbc560e7a210e22179 (diff) | |
download | talk-469a71af9d5f8022635ba955d2715f8a81c4be65.tar.gz |
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/talk@7071 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'app')
-rw-r--r-- | app/webrtc/jsepsessiondescription.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/webrtc/jsepsessiondescription.cc b/app/webrtc/jsepsessiondescription.cc index ac0fe05..8e8ebc4 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 = 3840; const int JsepSessionDescription::kMaxVideoCodecHeight = 2160; +#endif const int JsepSessionDescription::kDefaultVideoCodecPreference = 1; SessionDescriptionInterface* CreateSessionDescription(const std::string& type, |