diff options
| author | stefan@webrtc.org <stefan@webrtc.org> | 2014-11-04 19:41:15 +0000 |
|---|---|---|
| committer | stefan@webrtc.org <stefan@webrtc.org> | 2014-11-04 19:41:15 +0000 |
| commit | 385606f67068b2ae15fbc8b9ef3eca7495a50caf (patch) | |
| tree | 4cc6f74d38567feb44e8b2e2bc407ffb18f50a45 | |
| parent | c4cd81a0dadc61761efb1e14bbec0f191d45c971 (diff) | |
| download | webrtc-385606f67068b2ae15fbc8b9ef3eca7495a50caf.tar.gz | |
Add support for VP9 in webrtc::Call and video_loopback.
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/31959004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7622 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | test/encoder_settings.cc | 2 | ||||
| -rw-r--r-- | video/call.cc | 2 | ||||
| -rw-r--r-- | video/loopback.cc | 2 | ||||
| -rw-r--r-- | video_decoder.h | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/test/encoder_settings.cc b/test/encoder_settings.cc index db064bb8..bae13505 100644 --- a/test/encoder_settings.cc +++ b/test/encoder_settings.cc @@ -60,6 +60,8 @@ VideoReceiveStream::Decoder CreateMatchingDecoder( decoder.payload_name = encoder_settings.payload_name; 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); } else { decoder.decoder = new FakeDecoder(); } diff --git a/video/call.cc b/video/call.cc index fd41d75f..b03b6c91 100644 --- a/video/call.cc +++ b/video/call.cc @@ -58,6 +58,8 @@ VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { switch (codec_type) { case kVp8: return VP8Decoder::Create(); + case kVp9: + return VP9Decoder::Create(); } assert(false); return NULL; diff --git a/video/loopback.cc b/video/loopback.cc index 4b49c31e..8013833d 100644 --- a/video/loopback.cc +++ b/video/loopback.cc @@ -142,6 +142,8 @@ void Loopback() { scoped_ptr<VideoEncoder> encoder; if (flags::Codec() == "VP8") { encoder.reset(VideoEncoder::Create(VideoEncoder::kVp8)); + } else if (flags::Codec() == "VP9") { + encoder.reset(VideoEncoder::Create(VideoEncoder::kVp9)); } else { // Codec not supported. assert(false && "Codec not supported!"); diff --git a/video_decoder.h b/video_decoder.h index 03a564e3..941c0ac1 100644 --- a/video_decoder.h +++ b/video_decoder.h @@ -40,6 +40,7 @@ class VideoDecoder { public: enum DecoderType { kVp8, + kVp9 }; static VideoDecoder* Create(DecoderType codec_type); |