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

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

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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
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 #include <memory> 9 #include <memory>
10 10
(...skipping 16 matching lines...) Expand all
27 27
28 namespace media { 28 namespace media {
29 29
30 class AudioDiscardHelper; 30 class AudioDiscardHelper;
31 class DecoderBuffer; 31 class DecoderBuffer;
32 32
33 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder { 33 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
34 public: 34 public:
35 FFmpegAudioDecoder( 35 FFmpegAudioDecoder(
36 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 36 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
37 const scoped_refptr<MediaLog>& media_log); 37 MediaLog* media_log);
38 ~FFmpegAudioDecoder() override; 38 ~FFmpegAudioDecoder() override;
39 39
40 // AudioDecoder implementation. 40 // AudioDecoder implementation.
41 std::string GetDisplayName() const override; 41 std::string GetDisplayName() const override;
42 void Initialize(const AudioDecoderConfig& config, 42 void Initialize(const AudioDecoderConfig& config,
43 CdmContext* cdm_context, 43 CdmContext* cdm_context,
44 const InitCB& init_cb, 44 const InitCB& init_cb,
45 const OutputCB& output_cb) override; 45 const OutputCB& output_cb) override;
46 void Decode(const scoped_refptr<DecoderBuffer>& buffer, 46 void Decode(const scoped_refptr<DecoderBuffer>& buffer,
47 const DecodeCB& decode_cb) override; 47 const DecodeCB& decode_cb) override;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; 108 std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
109 std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_; 109 std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
110 110
111 AudioDecoderConfig config_; 111 AudioDecoderConfig config_;
112 112
113 // AVSampleFormat initially requested; not Chrome's SampleFormat. 113 // AVSampleFormat initially requested; not Chrome's SampleFormat.
114 int av_sample_format_; 114 int av_sample_format_;
115 115
116 std::unique_ptr<AudioDiscardHelper> discard_helper_; 116 std::unique_ptr<AudioDiscardHelper> discard_helper_;
117 117
118 scoped_refptr<MediaLog> media_log_; 118 MediaLog* media_log_;
119 119
120 scoped_refptr<AudioBufferMemoryPool> pool_; 120 scoped_refptr<AudioBufferMemoryPool> pool_;
121 121
122 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder); 122 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
123 }; 123 };
124 124
125 } // namespace media 125 } // namespace media
126 126
127 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 127 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/decrypting_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