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

Side by Side Diff: webrtc/test/encoder_settings.cc

Issue 2521203002: Move VideoDecoder::Create() logic to separate internal video decoder factory (Closed)
Patch Set: Add unittest Created 4 years 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
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/video/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 11
12 #include <algorithm> 12 #include <algorithm>
13 #include <string> 13 #include <string>
14 14
15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
16 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
17 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
15 #include "webrtc/test/fake_decoder.h" 18 #include "webrtc/test/fake_decoder.h"
16 #include "webrtc/video_decoder.h"
17 19
18 namespace webrtc { 20 namespace webrtc {
19 namespace test { 21 namespace test {
20 22
21 const size_t DefaultVideoStreamFactory::kMaxNumberOfStreams; 23 const size_t DefaultVideoStreamFactory::kMaxNumberOfStreams;
22 const int DefaultVideoStreamFactory::kMaxBitratePerStream[] = {150000, 450000, 24 const int DefaultVideoStreamFactory::kMaxBitratePerStream[] = {150000, 450000,
23 1500000}; 25 1500000};
24 const int DefaultVideoStreamFactory::kDefaultMinBitratePerStream[] = { 26 const int DefaultVideoStreamFactory::kDefaultMinBitratePerStream[] = {
25 50000, 200000, 700000}; 27 50000, 200000, 700000};
26 28
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 DefaultVideoStreamFactory::kMaxBitratePerStream[i]; 80 DefaultVideoStreamFactory::kMaxBitratePerStream[i];
79 } 81 }
80 } 82 }
81 83
82 VideoReceiveStream::Decoder CreateMatchingDecoder( 84 VideoReceiveStream::Decoder CreateMatchingDecoder(
83 const VideoSendStream::Config::EncoderSettings& encoder_settings) { 85 const VideoSendStream::Config::EncoderSettings& encoder_settings) {
84 VideoReceiveStream::Decoder decoder; 86 VideoReceiveStream::Decoder decoder;
85 decoder.payload_type = encoder_settings.payload_type; 87 decoder.payload_type = encoder_settings.payload_type;
86 decoder.payload_name = encoder_settings.payload_name; 88 decoder.payload_name = encoder_settings.payload_name;
87 if (encoder_settings.payload_name == "H264") { 89 if (encoder_settings.payload_name == "H264") {
88 decoder.decoder = VideoDecoder::Create(VideoDecoder::kH264); 90 decoder.decoder = H264Decoder::Create();
89 } else if (encoder_settings.payload_name == "VP8") { 91 } else if (encoder_settings.payload_name == "VP8") {
90 decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp8); 92 decoder.decoder = VP8Decoder::Create();
91 } else if (encoder_settings.payload_name == "VP9") { 93 } else if (encoder_settings.payload_name == "VP9") {
92 decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp9); 94 decoder.decoder = VP9Decoder::Create();
93 } else { 95 } else {
94 decoder.decoder = new FakeDecoder(); 96 decoder.decoder = new FakeDecoder();
95 } 97 }
96 return decoder; 98 return decoder;
97 } 99 }
98 } // namespace test 100 } // namespace test
99 } // namespace webrtc 101 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/video/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698