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

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

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « media/filters/fake_video_decoder_unittest.cc ('k') | media/filters/ffmpeg_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_FFMPEG_AUDIO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
6 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 6 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 21 matching lines...) Expand all
32 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder { 32 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
33 public: 33 public:
34 FFmpegAudioDecoder( 34 FFmpegAudioDecoder(
35 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 35 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
36 const scoped_refptr<MediaLog>& media_log); 36 const scoped_refptr<MediaLog>& media_log);
37 ~FFmpegAudioDecoder() override; 37 ~FFmpegAudioDecoder() override;
38 38
39 // AudioDecoder implementation. 39 // AudioDecoder implementation.
40 std::string GetDisplayName() const override; 40 std::string GetDisplayName() const override;
41 void Initialize(const AudioDecoderConfig& config, 41 void Initialize(const AudioDecoderConfig& config,
42 const SetCdmReadyCB& set_cdm_ready_cb, 42 CdmContext* cdm_context,
43 const InitCB& init_cb, 43 const InitCB& init_cb,
44 const OutputCB& output_cb) override; 44 const OutputCB& output_cb) override;
45 void Decode(const scoped_refptr<DecoderBuffer>& buffer, 45 void Decode(const scoped_refptr<DecoderBuffer>& buffer,
46 const DecodeCB& decode_cb) override; 46 const DecodeCB& decode_cb) override;
47 void Reset(const base::Closure& closure) override; 47 void Reset(const base::Closure& closure) override;
48 48
49 private: 49 private:
50 // There are four states the decoder can be in: 50 // There are four states the decoder can be in:
51 // 51 //
52 // - kUninitialized: The decoder is not initialized. 52 // - kUninitialized: The decoder is not initialized.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 scoped_ptr<AudioDiscardHelper> discard_helper_; 110 scoped_ptr<AudioDiscardHelper> discard_helper_;
111 111
112 scoped_refptr<MediaLog> media_log_; 112 scoped_refptr<MediaLog> media_log_;
113 113
114 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder); 114 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
115 }; 115 };
116 116
117 } // namespace media 117 } // namespace media
118 118
119 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 119 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/fake_video_decoder_unittest.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698