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

Side by Side Diff: media/filters/opus_audio_decoder.h

Issue 1446713003: Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 unified diff | Download patch
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/opus_audio_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_
6 #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_ 6 #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "media/base/audio_decoder.h" 10 #include "media/base/audio_decoder.h"
(...skipping 15 matching lines...) Expand all
26 26
27 class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder { 27 class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder {
28 public: 28 public:
29 explicit OpusAudioDecoder( 29 explicit OpusAudioDecoder(
30 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 30 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
31 ~OpusAudioDecoder() override; 31 ~OpusAudioDecoder() override;
32 32
33 // AudioDecoder implementation. 33 // AudioDecoder implementation.
34 std::string GetDisplayName() const override; 34 std::string GetDisplayName() const override;
35 void Initialize(const AudioDecoderConfig& config, 35 void Initialize(const AudioDecoderConfig& config,
36 const SetCdmReadyCB& set_cdm_ready_cb,
37 const InitCB& init_cb, 36 const InitCB& init_cb,
38 const OutputCB& output_cb) override; 37 const OutputCB& output_cb) override;
39 void Decode(const scoped_refptr<DecoderBuffer>& buffer, 38 void Decode(const scoped_refptr<DecoderBuffer>& buffer,
40 const DecodeCB& decode_cb) override; 39 const DecodeCB& decode_cb) override;
41 void Reset(const base::Closure& closure) override; 40 void Reset(const base::Closure& closure) override;
42 41
43 private: 42 private:
44 // Reads from the demuxer stream with corresponding callback method. 43 // Reads from the demuxer stream with corresponding callback method.
45 void ReadFromDemuxerStream(); 44 void ReadFromDemuxerStream();
46 void DecodeBuffer(const scoped_refptr<DecoderBuffer>& input, 45 void DecodeBuffer(const scoped_refptr<DecoderBuffer>& input,
(...skipping 11 matching lines...) Expand all
58 OutputCB output_cb_; 57 OutputCB output_cb_;
59 OpusMSDecoder* opus_decoder_; 58 OpusMSDecoder* opus_decoder_;
60 scoped_ptr<AudioDiscardHelper> discard_helper_; 59 scoped_ptr<AudioDiscardHelper> discard_helper_;
61 60
62 DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder); 61 DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder);
63 }; 62 };
64 63
65 } // namespace media 64 } // namespace media
66 65
67 #endif // MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_ 66 #endif // MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/opus_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698