From 192a54ff2f7e91e8ac3e21eff62fe8f5a8a21410 Mon Sep 17 00:00:00 2001 From: "glaznev@webrtc.org" Date: Fri, 12 Sep 2014 16:40:35 +0000 Subject: [PATCH] Temporary revert maximum video codec resolution back to 1080p. 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 --- talk/app/webrtc/jsepsessiondescription.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/talk/app/webrtc/jsepsessiondescription.cc b/talk/app/webrtc/jsepsessiondescription.cc index 8e8ebc41d1..9d47fe38d0 100644 --- a/talk/app/webrtc/jsepsessiondescription.cc +++ b/talk/app/webrtc/jsepsessiondescription.cc @@ -61,15 +61,8 @@ 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::kMaxVideoCodecWidth = 1920; +const int JsepSessionDescription::kMaxVideoCodecHeight = 1080; const int JsepSessionDescription::kDefaultVideoCodecPreference = 1; SessionDescriptionInterface* CreateSessionDescription(const std::string& type,