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

Unified Diff: webrtc/media/engine/webrtcvideoengine2.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc ('k') | webrtc/test/encoder_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index 3f9d5f6596bfdc8031c3b3eff81f5ac7fc1cb726..cdc0659eba6951df29e0dea2f9381e0e6b654f98 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -25,6 +25,7 @@
#include "webrtc/common_video/h264/profile_level_id.h"
#include "webrtc/media/engine/constants.h"
#include "webrtc/media/engine/internalencoderfactory.h"
+#include "webrtc/media/engine/internaldecoderfactory.h"
#include "webrtc/media/engine/simulcast.h"
#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
@@ -2251,28 +2252,14 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::CreateOrReuseVideoDecoder(
external_decoder_factory_->CreateVideoDecoderWithParams(
type, {stream_params_.id});
if (decoder != NULL) {
- return AllocatedDecoder(decoder, type, true);
+ return AllocatedDecoder(decoder, type, true /* is_external */);
}
}
- if (type == webrtc::kVideoCodecVP8) {
- return AllocatedDecoder(
- webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kVp8), type, false);
- }
-
- if (type == webrtc::kVideoCodecVP9) {
- return AllocatedDecoder(
- webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kVp9), type, false);
- }
-
- if (type == webrtc::kVideoCodecH264) {
- return AllocatedDecoder(
- webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kH264), type, false);
- }
-
- return AllocatedDecoder(
- webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kUnsupportedCodec),
- webrtc::kVideoCodecUnknown, false);
+ InternalDecoderFactory internal_decoder_factory;
+ return AllocatedDecoder(internal_decoder_factory.CreateVideoDecoderWithParams(
+ type, {stream_params_.id}),
+ type, false /* is_external */);
}
void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ConfigureCodecs(
« no previous file with comments | « webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc ('k') | webrtc/test/encoder_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698