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

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

Issue 9325044: Remove AudioDecoder from the Filter heirarchy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
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/message_loop.h" 10 #include "base/message_loop.h"
11 #include "media/base/filters.h" 11 #include "media/base/audio_decoder.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.
25 virtual void Flush(const base::Closure& callback) OVERRIDE;
26
27 // AudioDecoder implementation. 24 // AudioDecoder implementation.
28 virtual void Initialize(DemuxerStream* stream, 25 virtual void Initialize(DemuxerStream* stream,
29 const PipelineStatusCB& callback, 26 const PipelineStatusCB& callback,
30 const StatisticsCallback& stats_callback) OVERRIDE; 27 const StatisticsCallback& stats_callback) OVERRIDE;
31 virtual void Read(const ReadCB& callback) OVERRIDE; 28 virtual void Read(const ReadCB& callback) OVERRIDE;
32 virtual int bits_per_channel() OVERRIDE; 29 virtual int bits_per_channel() OVERRIDE;
33 virtual ChannelLayout channel_layout() OVERRIDE; 30 virtual ChannelLayout channel_layout() OVERRIDE;
34 virtual int samples_per_second() OVERRIDE; 31 virtual int samples_per_second() OVERRIDE;
35 32
36 private: 33 private:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 uint8* decoded_audio_; // Allocated via av_malloc(). 74 uint8* decoded_audio_; // Allocated via av_malloc().
78 75
79 ReadCB read_cb_; 76 ReadCB read_cb_;
80 77
81 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder); 78 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
82 }; 79 };
83 80
84 } // namespace media 81 } // namespace media
85 82
86 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 83 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698