media/filters/ffmpeg_audio_decoder.cc - Issue 1422113002: Enable pcm_s32le audio decoding.

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.cc

Issue 1422113002: Enable pcm_s32le audio decoding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: DEPS roll Created 5 years, 1 month 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.cc

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

index 206f971a19a301bd8b543974581bbb8673f7ef76..2ad55cdbba94d4344e4b2ce7ace0e9da91467b7c 100644

--- a/media/filters/ffmpeg_audio_decoder.cc

+++ b/media/filters/ffmpeg_audio_decoder.cc

@@ -58,7 +58,8 @@ static int GetAudioBuffer(struct AVCodecContext* s, AVFrame* frame, int flags) {

// data, use the values supplied by FFmpeg (ignoring the current settings).

// FFmpegDecode() gets to determine if the buffer is useable or not.

AVSampleFormat format = static_cast<AVSampleFormat>(frame->format);

- SampleFormat sample_format = AVSampleFormatToSampleFormat(format);

+ SampleFormat sample_format =

+ AVSampleFormatToSampleFormat(format, s->codec_id);

int channels = DetermineChannels(frame);

if (channels <= 0 || channels >= limits::kMaxChannels) {

DLOG(ERROR) << "Requested number of channels (" << channels

« no previous file with comments | « media/ffmpeg/ffmpeg_common_unittest.cc ('k') | media/mojo/interfaces/media_types.mojom » ('j') | no next file with comments »