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

Unified Diff: media/filters/decoder_selector.h

Issue 398163004: Fold DecoderSelector::Abort() into the dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 6 years, 5 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/audio_decoder_selector_unittest.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_selector.h
diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h
index 662e8082ea297ad25faf11708a2cfc306af468a8..c50f9fba718f3fbff909271f0200b39442f26108 100644
--- a/media/filters/decoder_selector.h
+++ b/media/filters/decoder_selector.h
@@ -57,6 +57,9 @@ class MEDIA_EXPORT DecoderSelector {
const scoped_refptr<base::SingleThreadTaskRunner>& message_loop,
ScopedVector<Decoder> decoders,
const SetDecryptorReadyCB& set_decryptor_ready_cb);
+
+ // Aborts pending Decoder selection and fires |select_decoder_cb| with
+ // NULL and NULL immediately if it's pending.
~DecoderSelector();
// Initializes and selects a Decoder that can decode the |stream|.
@@ -67,10 +70,6 @@ class MEDIA_EXPORT DecoderSelector {
const SelectDecoderCB& select_decoder_cb,
const typename Decoder::OutputCB& output_cb);
- // Aborts pending Decoder selection and fires |select_decoder_cb| with
- // NULL and NULL immediately if it's pending.
- void Abort();
-
private:
void DecryptingDecoderInitDone(PipelineStatus status);
void DecryptingDemuxerStreamInitDone(PipelineStatus status);
« no previous file with comments | « media/filters/audio_decoder_selector_unittest.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698