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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/test/encoder_settings.cc

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Misc (WebRtcVideoChannel2::...::ConfigureVideoEncoderSettings care about H264 case) Created 5 years, 3 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
« webrtc/modules/video_coding/codecs/test/videoprocessor.cc ('K') | « webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | webrtc/video/end_to_end_tests.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/encoder_settings.cc
diff --git a/webrtc/test/encoder_settings.cc b/webrtc/test/encoder_settings.cc
index bae13505c01fcdd2d0882af6575521ced6ed7dbd..64339df4aad89af0b917dbd9bea8f9d12ce6a5db 100644
--- a/webrtc/test/encoder_settings.cc
+++ b/webrtc/test/encoder_settings.cc
@@ -58,7 +58,9 @@ VideoReceiveStream::Decoder CreateMatchingDecoder(
VideoReceiveStream::Decoder decoder;
decoder.payload_type = encoder_settings.payload_type;
decoder.payload_name = encoder_settings.payload_name;
- if (encoder_settings.payload_name == "VP8") {
+ if (encoder_settings.payload_name == "H264") {
+ decoder.decoder = VideoDecoder::Create(VideoDecoder::kH264);
+ } else if (encoder_settings.payload_name == "VP8") {
decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp8);
} else if (encoder_settings.payload_name == "VP9") {
decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp9);
« webrtc/modules/video_coding/codecs/test/videoprocessor.cc ('K') | « webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | webrtc/video/end_to_end_tests.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698