zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temporary revert maximum video codec resolution back to 1080p.

Browse Source 
BUG=3757, 3738
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/27439004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7171 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
glaznev@webrtc.org
2014-09-12 16:40:35 +00:00
parent 3decd9b776
commit 192a54ff2f
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
talk/app/webrtc/jsepsessiondescription.cc
View File

@ -61,15 +61,8 @@ const int JsepSessionDescription::kDefaultVideoCodecId = 100;
const int JsepSessionDescription::kDefaultVideoCodecFramerate = 60; const int JsepSessionDescription::kDefaultVideoCodecFramerate = 60;
const char JsepSessionDescription::kDefaultVideoCodecName[] = "VP8"; const char JsepSessionDescription::kDefaultVideoCodecName[] = "VP8";
// Used as default max video codec size before we have it in signaling. // Used as default max video codec size before we have it in signaling.
#if defined(ANDROID) const int JsepSessionDescription::kMaxVideoCodecWidth = 1920;
// Limit default max video codec size for Android to avoid const int JsepSessionDescription::kMaxVideoCodecHeight = 1080;
// 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; const int JsepSessionDescription::kDefaultVideoCodecPreference = 1;
SessionDescriptionInterface* CreateSessionDescription(const std::string& type, SessionDescriptionInterface* CreateSessionDescription(const std::string& type,