Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: webrtc/media/engine/webrtcvideoengine.cc

Issue 2982053002: Revert "Prefer external video codecs over internal in SDP" (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/webrtcvideoengine.cc
diff --git a/webrtc/media/engine/webrtcvideoengine.cc b/webrtc/media/engine/webrtcvideoengine.cc
index e1939c35d01e2ddce412c67271eb59272da09982..b6447329e265519da1f19d29f1227006feeff8c0 100644
--- a/webrtc/media/engine/webrtcvideoengine.cc
+++ b/webrtc/media/engine/webrtcvideoengine.cc
@@ -537,6 +537,8 @@ static std::vector<VideoCodec> GetSupportedCodecs(
<< CodecVectorToString(internal_codecs);
std::vector<VideoCodec> unified_codecs;
+ AppendVideoCodecs(internal_codecs, &unified_codecs);
+
if (external_encoder_factory != nullptr) {
const std::vector<VideoCodec>& external_codecs =
external_encoder_factory->supported_codecs();
@@ -545,8 +547,6 @@ static std::vector<VideoCodec> GetSupportedCodecs(
<< CodecVectorToString(external_codecs);
}
- AppendVideoCodecs(internal_codecs, &unified_codecs);
-
return unified_codecs;
}
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698