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

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

Issue 9310028: Update AudioRenderer, VideoRenderer, and AudioDecoder Initialize() methods to use PipelineStatusCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix AudioRendererImplTest Created 8 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/audio_renderer_base_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/message_loop.h" 10 #include "base/message_loop.h"
11 #include "media/base/filters.h" 11 #include "media/base/filters.h"
12 12
13 struct AVCodecContext; 13 struct AVCodecContext;
14 14
15 namespace media { 15 namespace media {
16 16
17 class DataBuffer; 17 class DataBuffer;
18 18
19 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder { 19 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
20 public: 20 public:
21 explicit FFmpegAudioDecoder(MessageLoop* message_loop); 21 explicit FFmpegAudioDecoder(MessageLoop* message_loop);
22 virtual ~FFmpegAudioDecoder(); 22 virtual ~FFmpegAudioDecoder();
23 23
24 // Filter implementation. 24 // Filter implementation.
25 virtual void Flush(const base::Closure& callback) OVERRIDE; 25 virtual void Flush(const base::Closure& callback) OVERRIDE;
26 26
27 // AudioDecoder implementation. 27 // AudioDecoder implementation.
28 virtual void Initialize(DemuxerStream* stream, const base::Closure& callback, 28 virtual void Initialize(DemuxerStream* stream,
29 const PipelineStatusCB& callback,
29 const StatisticsCallback& stats_callback) OVERRIDE; 30 const StatisticsCallback& stats_callback) OVERRIDE;
30 virtual void Read(const ReadCB& callback) OVERRIDE; 31 virtual void Read(const ReadCB& callback) OVERRIDE;
31 virtual int bits_per_channel() OVERRIDE; 32 virtual int bits_per_channel() OVERRIDE;
32 virtual ChannelLayout channel_layout() OVERRIDE; 33 virtual ChannelLayout channel_layout() OVERRIDE;
33 virtual int samples_per_second() OVERRIDE; 34 virtual int samples_per_second() OVERRIDE;
34 35
35 private: 36 private:
36 // Methods running on decoder thread. 37 // Methods running on decoder thread.
37 void DoInitialize(const scoped_refptr<DemuxerStream>& stream, 38 void DoInitialize(const scoped_refptr<DemuxerStream>& stream,
38 const base::Closure& callback, 39 const PipelineStatusCB& callback,
39 const StatisticsCallback& stats_callback); 40 const StatisticsCallback& stats_callback);
40 void DoFlush(const base::Closure& callback); 41 void DoFlush(const base::Closure& callback);
41 void DoRead(const ReadCB& callback); 42 void DoRead(const ReadCB& callback);
42 void DoDecodeBuffer(const scoped_refptr<Buffer>& input); 43 void DoDecodeBuffer(const scoped_refptr<Buffer>& input);
43 44
44 // Reads from the demuxer stream with corresponding callback method. 45 // Reads from the demuxer stream with corresponding callback method.
45 void ReadFromDemuxerStream(); 46 void ReadFromDemuxerStream();
46 void DecodeBuffer(const scoped_refptr<Buffer>& buffer); 47 void DecodeBuffer(const scoped_refptr<Buffer>& buffer);
47 48
48 // Updates the output buffer's duration and timestamp based on the input 49 // Updates the output buffer's duration and timestamp based on the input
(...skipping 27 matching lines...) Expand all
76 uint8* decoded_audio_; // Allocated via av_malloc(). 77 uint8* decoded_audio_; // Allocated via av_malloc().
77 78
78 ReadCB read_cb_; 79 ReadCB read_cb_;
79 80
80 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder); 81 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
81 }; 82 };
82 83
83 } // namespace media 84 } // namespace media
84 85
85 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 86 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/audio_renderer_base_unittest.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698