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

Side by Side 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: (Alphabetical sorting in common_video.gyp deps) Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include "webrtc/test/encoder_settings.h" 10 #include "webrtc/test/encoder_settings.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 stream_settings[2].max_qp = 56; 51 stream_settings[2].max_qp = 56;
52 stream_settings.resize(num_streams); 52 stream_settings.resize(num_streams);
53 return stream_settings; 53 return stream_settings;
54 } 54 }
55 55
56 VideoReceiveStream::Decoder CreateMatchingDecoder( 56 VideoReceiveStream::Decoder CreateMatchingDecoder(
57 const VideoSendStream::Config::EncoderSettings& encoder_settings) { 57 const VideoSendStream::Config::EncoderSettings& encoder_settings) {
58 VideoReceiveStream::Decoder decoder; 58 VideoReceiveStream::Decoder decoder;
59 decoder.payload_type = encoder_settings.payload_type; 59 decoder.payload_type = encoder_settings.payload_type;
60 decoder.payload_name = encoder_settings.payload_name; 60 decoder.payload_name = encoder_settings.payload_name;
61 if (encoder_settings.payload_name == "VP8") { 61 if (encoder_settings.payload_name == "H264") {
62 decoder.decoder = VideoDecoder::Create(VideoDecoder::kH264);
63 } else if (encoder_settings.payload_name == "VP8") {
62 decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp8); 64 decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp8);
63 } else if (encoder_settings.payload_name == "VP9") { 65 } else if (encoder_settings.payload_name == "VP9") {
64 decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp9); 66 decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp9);
65 } else { 67 } else {
66 decoder.decoder = new FakeDecoder(); 68 decoder.decoder = new FakeDecoder();
67 } 69 }
68 return decoder; 70 return decoder;
69 } 71 }
70 } // namespace test 72 } // namespace test
71 } // namespace webrtc 73 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698