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

Issue 11280301: Roll FFMpeg for M26. Fix ffmpeg float audio decoding. (Closed)

Created:
8 years ago by DaleCurtis
Modified:
7 years, 11 months ago
CC:
chromium-reviews, feature-media-reviews_chromium.org, xhwang
Visibility:
Public.

Description

Roll FFMpeg for M26. Fix ffmpeg float audio decoding. FFmpeg now outputs float for some audio decoders. Unfortunately our pipeline doesn't support float between the FFmpegAudioDecoder and AudioRenderer at present. As such, we need to convert the data into an integer format first. As a byproduct of this, AMR support for ChromeOS is finally fixed and adding support for PCM float is trivial. In summary this patch adds: - A SampleFormat property to AudioDecoderConfig. - AVSampleFormat <-> SampleFormat converters in FFmpegCommon. - Fixes ChromeOS AMR playback. - Finally plumbs pcm_f32le support (enabled in FFmpeg long ago). - Add decoder support for float planar and float interleaved playback. BUG=109085, 158187, 167069 TEST=unittests, layout tests, and demos all pass under tooling without issue. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175180

Patch Set 1 : Fix AFR. #

Total comments: 15

Patch Set 2 : Rebase. Comments. #

Patch Set 3 : Rebase. Add SampleFormat UMA. Update DEPS. #

Patch Set 4 : Fix DCHECK. Roll DEPS for fix. #

Total comments: 1

Patch Set 5 : Add support for S16P for MP3 decoding. #

Patch Set 6 : Fixes. #

Patch Set 7 : Fix hash checks on windows. #

Total comments: 9

Patch Set 8 : Comments. Add F32LE test. #

Patch Set 9 : Update DEPS. Explicit S16P check. #

Patch Set 10 : Fix rebase. #

Patch Set 11 : Rebase. Disable hash checks. #

Patch Set 12 : Fix win compile. #

Patch Set 13 : Rebase again! #

Patch Set 14 : Rebase again... Role DEPS. #

Patch Set 15 : ... rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+327 lines, -156 lines) Patch
M DEPS View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 chunk +2 lines, -2 lines 0 comments Download
M media/base/audio_decoder_config.h View 1 2 3 4 5 6 7 8 9 10 5 chunks +32 lines, -14 lines 0 comments Download
M media/base/audio_decoder_config.cc View 1 2 3 4 7 chunks +39 lines, -48 lines 0 comments Download
M media/base/limits.h View 1 1 chunk +1 line, -1 line 0 comments Download
M media/ffmpeg/ffmpeg_common.cc View 1 2 3 4 5 6 7 8 9 10 6 chunks +62 lines, -40 lines 0 comments Download
M media/filters/audio_decoder_selector_unittest.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +4 lines, -2 lines 0 comments Download
M media/filters/audio_file_reader.cc View 1 2 3 4 5 6 7 8 2 chunks +36 lines, -6 lines 0 comments Download
M media/filters/audio_file_reader_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 6 chunks +19 lines, -5 lines 0 comments Download
M media/filters/audio_renderer_impl_unittest.cc View 1 2 3 4 5 6 7 8 9 2 chunks +4 lines, -4 lines 0 comments Download
M media/filters/chunk_demuxer_unittest.cc View 1 2 3 4 5 6 7 8 9 10 1 chunk +2 lines, -1 line 0 comments Download
M media/filters/decrypting_audio_decoder_unittest.cc View 1 2 3 4 5 6 7 8 9 10 3 chunks +11 lines, -11 lines 0 comments Download
M media/filters/decrypting_demuxer_stream.cc View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -1 line 0 comments Download
M media/filters/decrypting_demuxer_stream_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +10 lines, -5 lines 0 comments Download
M media/filters/ffmpeg_audio_decoder.h View 1 2 chunks +5 lines, -0 lines 0 comments Download
M media/filters/ffmpeg_audio_decoder.cc View 1 2 3 4 5 6 7 8 6 chunks +72 lines, -7 lines 0 comments Download
M media/filters/ffmpeg_audio_decoder_unittest.cc View 1 2 chunks +4 lines, -4 lines 0 comments Download
M media/filters/ffmpeg_demuxer_unittest.cc View 1 1 chunk +2 lines, -1 line 0 comments Download
M media/filters/pipeline_integration_test.cc View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -1 line 0 comments Download
M media/mp4/mp4_stream_parser.cc View 1 1 chunk +13 lines, -1 line 0 comments Download
M media/webm/webm_stream_parser.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 1 chunk +3 lines, -2 lines 0 comments Download

Messages

Total messages: 34 (0 generated)
DaleCurtis
FFmpeg roll is still in testing, but this should be the complete Chrome side change ...
8 years ago (2012-12-05 21:35:45 UTC) #1
DaleCurtis
+rbultje to ensure I'm not forgetting something in FFmpeg land. cc:xhwang for cdm stuff.
8 years ago (2012-12-05 21:43:31 UTC) #2
rbultje1
Did you re-apply the x86inc.asm manual re-alignment (for MSVC x86 assembly) patch? It's still not ...
8 years ago (2012-12-05 21:48:38 UTC) #3
DaleCurtis
I haven't done Windows testing yet, but there were no conflicts in that area during ...
8 years ago (2012-12-05 22:19:27 UTC) #4
rbultje1
On 2012/12/05 22:19:27, DaleCurtis wrote: > I haven't done Windows testing yet, but there were ...
8 years ago (2012-12-05 22:20:17 UTC) #5
scherkus (not reviewing)
https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc File media/base/audio_decoder_config.cc (right): https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc#newcode65 media/base/audio_decoder_config.cc:65: // vorbis are going to be kFormatFLTP. Float PCM ...
8 years ago (2012-12-06 17:25:31 UTC) #6
DaleCurtis
(no changes in this message, just comments) https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc File media/base/audio_decoder_config.cc (right): https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc#newcode65 media/base/audio_decoder_config.cc:65: // vorbis ...
8 years ago (2012-12-06 22:15:41 UTC) #7
DaleCurtis
PTAL. https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc File media/base/audio_decoder_config.cc (right): https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc#newcode65 media/base/audio_decoder_config.cc:65: // vorbis are going to be kFormatFLTP. Float ...
8 years ago (2012-12-11 03:03:44 UTC) #8
scherkus (not reviewing)
https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc File media/base/audio_decoder_config.cc (right): https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc#newcode65 media/base/audio_decoder_config.cc:65: // vorbis are going to be kFormatFLTP. Float PCM ...
8 years ago (2012-12-11 21:18:46 UTC) #9
DaleCurtis
https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc File media/base/audio_decoder_config.cc (right): https://codereview.chromium.org/11280301/diff/2001/media/base/audio_decoder_config.cc#newcode65 media/base/audio_decoder_config.cc:65: // vorbis are going to be kFormatFLTP. Float PCM ...
8 years ago (2012-12-12 01:02:57 UTC) #10
scherkus (not reviewing)
lgtm... but I see a lot of media_unittest failures know what's up?
8 years ago (2012-12-12 23:04:25 UTC) #11
DaleCurtis
On 2012/12/12 23:04:25, scherkus wrote: > lgtm... but I see a lot of media_unittest failures ...
8 years ago (2012-12-12 23:29:36 UTC) #12
DaleCurtis
On 2012/12/12 23:29:36, DaleCurtis wrote: > On 2012/12/12 23:04:25, scherkus wrote: > > lgtm... but ...
8 years ago (2012-12-12 23:44:11 UTC) #13
scherkus (not reviewing)
On 2012/12/12 23:44:11, DaleCurtis wrote: > On 2012/12/12 23:29:36, DaleCurtis wrote: > > On 2012/12/12 ...
8 years ago (2012-12-13 00:12:16 UTC) #14
DaleCurtis
New patch set should fix all unittests. I'll run a more thorough manual pass tomorrow. ...
8 years ago (2012-12-13 02:39:38 UTC) #15
DaleCurtis
Whoops, last patch set fixes unittests, but needs some work. Will update tomorrow.
8 years ago (2012-12-13 08:10:29 UTC) #16
DaleCurtis
Latest patch set is ready minus some windows hash fixes, will add #if OS_WIN for ...
8 years ago (2012-12-13 21:06:01 UTC) #17
rbultje1
On 2012/12/13 21:06:01, DaleCurtis wrote: > Latest patch set is ready minus some windows hash ...
8 years ago (2012-12-13 22:22:10 UTC) #18
DaleCurtis
On 2012/12/13 22:22:10, rbultje1 wrote: > On 2012/12/13 21:06:01, DaleCurtis wrote: > > Latest patch ...
8 years ago (2012-12-13 22:22:56 UTC) #19
rbultje1
On 2012/12/13 22:22:56, DaleCurtis wrote: > On 2012/12/13 22:22:10, rbultje1 wrote: > > On 2012/12/13 ...
8 years ago (2012-12-13 22:24:00 UTC) #20
rbultje1
On 2012/12/13 22:24:00, rbultje1 wrote: > On 2012/12/13 22:22:56, DaleCurtis wrote: > > On 2012/12/13 ...
8 years ago (2012-12-13 22:24:38 UTC) #21
scherkus (not reviewing)
few qs https://codereview.chromium.org/11280301/diff/57001/media/filters/audio_file_reader.cc File media/filters/audio_file_reader.cc (right): https://codereview.chromium.org/11280301/diff/57001/media/filters/audio_file_reader.cc#newcode82 media/filters/audio_file_reader.cc:82: // MP3 decodes to S16P which we ...
8 years ago (2012-12-13 22:40:11 UTC) #22
DaleCurtis
https://codereview.chromium.org/11280301/diff/57001/media/filters/audio_file_reader.cc File media/filters/audio_file_reader.cc (right): https://codereview.chromium.org/11280301/diff/57001/media/filters/audio_file_reader.cc#newcode82 media/filters/audio_file_reader.cc:82: // MP3 decodes to S16P which we don't support, ...
8 years ago (2012-12-13 22:51:28 UTC) #23
DaleCurtis
https://codereview.chromium.org/11280301/diff/57001/media/filters/audio_file_reader.cc File media/filters/audio_file_reader.cc (right): https://codereview.chromium.org/11280301/diff/57001/media/filters/audio_file_reader.cc#newcode83 media/filters/audio_file_reader.cc:83: bool request_s16_format = codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P; On 2012/12/13 22:51:28, ...
8 years ago (2012-12-14 20:48:32 UTC) #24
scherkus (not reviewing)
lgtm
8 years ago (2012-12-14 20:50:10 UTC) #25
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/11280301/52008
8 years ago (2012-12-15 00:46:47 UTC) #26
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/11280301/54004
8 years ago (2012-12-15 01:02:54 UTC) #27
Paweł Hajdan Jr.
CQ has aborted processing for some reason. Do you want to try again, or possibly ...
8 years ago (2012-12-18 18:10:19 UTC) #28
DaleCurtis
On 2012/12/18 18:10:19, Paweł Hajdan Jr. wrote: > CQ has aborted processing for some reason. ...
8 years ago (2012-12-18 18:35:27 UTC) #29
Paweł Hajdan Jr.
On 2012/12/18 18:35:27, DaleCurtis wrote: > On 2012/12/18 18:10:19, Paweł Hajdan Jr. wrote: > > ...
7 years, 11 months ago (2013-01-02 20:17:18 UTC) #30
DaleCurtis
Rebased, hash checks disabled for float audio for now, filed http://crbug.com/168204 to track. CQ'ing.
7 years, 11 months ago (2013-01-03 19:20:05 UTC) #31
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/11280301/70001
7 years, 11 months ago (2013-01-03 19:21:23 UTC) #32
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/11280301/83001
7 years, 11 months ago (2013-01-03 19:41:47 UTC) #33
commit-bot: I haz the power
7 years, 11 months ago (2013-01-03 20:44:23 UTC) #34
Retried try job too often on win_rel for step(s) browser_tests

Powered by Google App Engine
This is Rietveld 408576698