media/filters/ffmpeg_audio_decoder.h - Issue 12224114: Guard against midstream audio configuration changes.

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 12224114: Guard against midstream audio configuration changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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:

Index: media/filters/ffmpeg_audio_decoder.h

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

index d2ba8c53408f0b4c405046c86d960ddce14f64a1..99fef1b943b12620a48e0cb586bec60c1946b441 100644

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

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

@@ -65,8 +65,12 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {

// Decoded audio format.

int bits_per_channel_;

ChannelLayout channel_layout_;

+ int channels_;

int samples_per_second_;

+ // AVSampleFormat initially requested; not Chrome's SampleFormat.

+ int av_sample_format_;

// Used for computing output timestamps.

scoped_ptr<AudioTimestampHelper> output_timestamp_helper_;

int bytes_per_frame_;