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

Unified Diff: webrtc/modules/video_coding/codec_database.cc

Issue 1490703002: Revert of Add _decoder CHECK to VCMGenericDecoder constructor. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | webrtc/modules/video_coding/generic_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/codec_database.cc
diff --git a/webrtc/modules/video_coding/codec_database.cc b/webrtc/modules/video_coding/codec_database.cc
index 2b358dd123b4815a2811bb7ca0a140669333a27d..9f016d99245a419f19c2af0f4bec6a3560e712c7 100644
--- a/webrtc/modules/video_coding/codec_database.cc
+++ b/webrtc/modules/video_coding/codec_database.cc
@@ -423,7 +423,7 @@
// because payload type may be out of date (e.g. before we decode the first
// frame after RegisterReceiveCodec)
if (ptr_decoder_ != nullptr &&
- ptr_decoder_->_decoder == (*it).second->external_decoder_instance) {
+ &ptr_decoder_->_decoder == (*it).second->external_decoder_instance) {
// Release it if it was registered and in use.
ReleaseDecoder(ptr_decoder_);
ptr_decoder_ = nullptr;
@@ -571,7 +571,7 @@
if (external_dec_item) {
// External codec.
ptr_decoder = new VCMGenericDecoder(
- external_dec_item->external_decoder_instance, true);
+ *external_dec_item->external_decoder_instance, true);
} else {
// Create decoder.
ptr_decoder = CreateDecoder(decoder_item->settings->codecType);
@@ -607,14 +607,14 @@
VCMGenericDecoder* VCMCodecDataBase::CreateDecoder(VideoCodecType type) const {
switch (type) {
case kVideoCodecVP8:
- return new VCMGenericDecoder(VP8Decoder::Create(), false);
+ return new VCMGenericDecoder(*(VP8Decoder::Create()));
case kVideoCodecVP9:
- return new VCMGenericDecoder(VP9Decoder::Create(), false);
+ return new VCMGenericDecoder(*(VP9Decoder::Create()));
case kVideoCodecI420:
- return new VCMGenericDecoder(new I420Decoder(), false);
+ return new VCMGenericDecoder(*(new I420Decoder));
case kVideoCodecH264:
if (H264Decoder::IsSupported()) {
- return new VCMGenericDecoder(H264Decoder::Create(), false);
+ return new VCMGenericDecoder(*(H264Decoder::Create()));
}
break;
default:
« no previous file with comments | « no previous file | webrtc/modules/video_coding/generic_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698