media/filters/ffmpeg_audio_decoder.h - Issue 7796033: Replace AudioDecoderConfig with simple accessors on AudioDecoder.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/ffmpeg_audio_decoder.h

Issue 7796033: Replace AudioDecoderConfig with simple accessors on AudioDecoder. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: rebase Created 9 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: media/filters/ffmpeg_audio_decoder.h

diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h

index 1025083598c29fba952380f309024c7c301a50cf..e92a8517fcf74d4f714bc3fcac6222e3ae71617a 100644

--- a/media/filters/ffmpeg_audio_decoder.h

+++ b/media/filters/ffmpeg_audio_decoder.h

@@ -21,8 +21,10 @@ class MEDIA_EXPORT FFmpegAudioDecoder

virtual ~FFmpegAudioDecoder();

// AudioDecoder implementation.

- virtual AudioDecoderConfig config();

virtual void ProduceAudioSamples(scoped_refptr<Buffer> output);

+ virtual int bits_per_channel();

+ virtual ChannelLayout channel_layout();

+ virtual int sample_rate();

protected:

virtual void DoInitialize(DemuxerStream* demuxer_stream, bool* success,

@@ -41,7 +43,10 @@ class MEDIA_EXPORT FFmpegAudioDecoder

// is initialized in OnInitialize().

AVCodecContext* codec_context_;

- AudioDecoderConfig config_;

+ // Decoded audio format.

+ int bits_per_channel_;

+ ChannelLayout channel_layout_;

+ int sample_rate_;

// Estimated timestamp for next packet. Useful for packets without timestamps.

base::TimeDelta estimated_next_timestamp_;

« no previous file with comments | « media/filters/audio_renderer_impl.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »