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

Unified Diff: media/filters/decoder_stream_traits.cc

Issue 491733002: Minor cleanup of DecoderStreamTraits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove DCHECK 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_traits.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_stream_traits.cc
diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc
index c86862f7fa4e4dd1ebf6f9fd9d68da5142e4debd..824b91282594cd07b2f01b11d93aada8e6acd05e 100644
--- a/media/filters/decoder_stream_traits.cc
+++ b/media/filters/decoder_stream_traits.cc
@@ -27,19 +27,6 @@ void DecoderStreamTraits<DemuxerStream::AUDIO>::Initialize(
decoder->Initialize(config, status_cb, output_cb);
}
-bool DecoderStreamTraits<DemuxerStream::AUDIO>::FinishInitialization(
- const StreamInitCB& init_cb,
- DecoderType* decoder,
- DemuxerStream* stream) {
- DCHECK(stream);
- if (!decoder) {
- init_cb.Run(false);
- return false;
- }
- init_cb.Run(true);
- return true;
-}
-
void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
const StatisticsCB& statistics_cb,
int bytes_decoded) {
@@ -72,19 +59,9 @@ void DecoderStreamTraits<DemuxerStream::VIDEO>::Initialize(
decoder->Initialize(config, low_delay, status_cb, output_cb);
}
-bool DecoderStreamTraits<DemuxerStream::VIDEO>::FinishInitialization(
- const StreamInitCB& init_cb,
- DecoderType* decoder,
- DemuxerStream* stream) {
- DCHECK(stream);
- if (!decoder) {
- init_cb.Run(false);
- return false;
- }
- if (decoder->NeedsBitstreamConversion())
- stream->EnableBitstreamConverter();
- init_cb.Run(true);
- return true;
+bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion(
+ DecoderType* decoder) {
+ return decoder->NeedsBitstreamConversion();
}
void DecoderStreamTraits<DemuxerStream::VIDEO>::ReportStatistics(
« no previous file with comments | « media/filters/decoder_stream_traits.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698