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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/decoder_stream.cc

Issue 491733002: Minor cleanup of DecoderStreamTraits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove now-unnecessary DISALLOW_IMPLICIT_CONSTRUCTORS from DecoderStream Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decoder_stream.h ('k') | media/filters/decoder_stream_traits.h » ('j') | media/filters/decoder_stream_traits.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_stream.cc
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index 45172901410c22f0f03977224e00f774fe119afc..0e11c4ecbca90101027cb6cd9131f7c948fad8f9 100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc
@@ -227,16 +227,17 @@ void DecoderStream<StreamType>::OnDecoderSelected(
if (!selected_decoder) {
state_ = STATE_UNINITIALIZED;
- StreamTraits::FinishInitialization(
- base::ResetAndReturn(&init_cb_), selected_decoder.get(), stream_);
+ base::ResetAndReturn(&init_cb_).Run(false);
return;
}
state_ = STATE_NORMAL;
decoder_ = selected_decoder.Pass();
decrypting_demuxer_stream_ = decrypting_demuxer_stream.Pass();
- StreamTraits::FinishInitialization(
- base::ResetAndReturn(&init_cb_), decoder_.get(), stream_);
+
+ if (StreamTraits::NeedsBitstreamConversion(decoder_.get()))
+ stream_->EnableBitstreamConverter();
+ base::ResetAndReturn(&init_cb_).Run(true);
}
template <DemuxerStream::Type StreamType>
« no previous file with comments | « media/filters/decoder_stream.h ('k') | media/filters/decoder_stream_traits.h » ('j') | media/filters/decoder_stream_traits.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698