New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 718142 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jun 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: All
Pri: 2
Type: Bug



Sign in to add a comment

Roll FFmpeg for M60

Project Member Reported by jrumm...@chromium.org, May 3 2017

Issue description

Tracking bug for FFMPEG roll
 
Project Member

Comment 1 by bugdroid1@chromium.org, May 13 2017

Labels: merge-merged-merge-m60
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/7ea90739d8e8477ea1dc0889f019be86a4740cc1

commit 7ea90739d8e8477ea1dc0889f019be86a4740cc1
Author: John Rummell <jrummell@chromium.org>
Date: Sat May 13 00:49:46 2017

Remove unnecessary additional code added to libopus_decode_init()

The code to protect against OOB access of ff_vorbis_channel_layouts[]
with index < 0 is no longer needed now that ffmpeg has a similar change.

BUG= 718142 

Change-Id: Ifd13a4ec067cdb83c74e5edb9570702d02af5ce3
Reviewed-on: https://chromium-review.googlesource.com/505412
Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org>

[modify] https://crrev.com/7ea90739d8e8477ea1dc0889f019be86a4740cc1/libavcodec/libopusdec.c
[modify] https://crrev.com/7ea90739d8e8477ea1dc0889f019be86a4740cc1/chromium/patches/README

Project Member

Comment 2 by bugdroid1@chromium.org, May 23 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3287cb2391a584ab3b10c4a1099290fb419cd797

commit 3287cb2391a584ab3b10c4a1099290fb419cd797
Author: jrummell <jrummell@chromium.org>
Date: Tue May 23 22:11:25 2017

Have FFmpeg Decoders handle 0 byte buffers instead of FFmpeg

Starting in M60 avcodec_decode_video2() fails if an empty buffer is
passed in. So don't have FFmpegAudioDecoder or FFmpegVideoDecoder call
FFmpeg routines if there is no data to process.

BUG= 718142 ,663438
TEST=affected test still passes

Review-Url: https://codereview.chromium.org/2885643002
Cr-Commit-Position: refs/heads/master@{#474080}

[modify] https://crrev.com/3287cb2391a584ab3b10c4a1099290fb419cd797/media/filters/ffmpeg_audio_decoder.cc
[modify] https://crrev.com/3287cb2391a584ab3b10c4a1099290fb419cd797/media/filters/ffmpeg_video_decoder.cc
[modify] https://crrev.com/3287cb2391a584ab3b10c4a1099290fb419cd797/media/filters/ffmpeg_video_decoder_unittest.cc

Project Member

Comment 3 by bugdroid1@chromium.org, May 25 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/c6832596afabe7208f4fc8b4232be8e65ebb85b0

commit c6832596afabe7208f4fc8b4232be8e65ebb85b0
Author: John Rummell <jrummell@chromium.org>
Date: Thu May 25 01:17:34 2017

Update libavformat/mov.c to closer match FFmpeg source

This takes the latest version of libavformat/mov.c from the FFmpeg source
and only removes the call to mov_seek_fragment(). It leaves the extra
fields and the rest of the 'sidx' commit to make merging simpler in the future.
Also updates the comment to indicate what has been removed, and why.

BUG= 718142 , 568336 

Change-Id: Ib6092ddc6e266ee0c2c2b67a538bf5d28e6f7bfa
Reviewed-on: https://chromium-review.googlesource.com/506431
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>

[modify] https://crrev.com/c6832596afabe7208f4fc8b4232be8e65ebb85b0/libavformat/isom.h
[modify] https://crrev.com/c6832596afabe7208f4fc8b4232be8e65ebb85b0/libavformat/mov.c
[modify] https://crrev.com/c6832596afabe7208f4fc8b4232be8e65ebb85b0/chromium/patches/README

Project Member

Comment 4 by bugdroid1@chromium.org, May 27 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/1a10f05c2f1c47744daae2fb5280f92f0603a58f

commit 1a10f05c2f1c47744daae2fb5280f92f0603a58f
Author: John Rummell <jrummell@chromium.org>
Date: Sat May 27 00:07:23 2017

Updating build configs for M60

Includes changes to BUILD.gn and build_ffmpeg.py that are on the main
branch but submitted after I started this roll.

BUG= 718142 

Change-Id: Icb35f86ef58af9bd7e6f031467b8b696ef5d23eb
Reviewed-on: https://chromium-review.googlesource.com/517602
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>

[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/mipsel/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/mac/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm-neon/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/mips64el/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/arm64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/ia32/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/mipsel/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/ia32/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/mipsel/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/ia32/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/mipsel/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/arm-neon/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/mac/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux-noasm/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/scripts/build_ffmpeg.py
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/mipsel/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/ia32/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux-noasm/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm-neon/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/mipsel/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/mac/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/ia32/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/ia32/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/mips64el/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/ia32/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm-neon/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux-noasm/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/mipsel/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/arm64/libavcodec/bsf_list.c
[add] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/libavcodec/aarch64/autorename_libavcodec_aarch64_simple_idct_neon.S
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/mipsel/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/ia32/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/arm-neon/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/ia32/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/BUILD.gn
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/ia32/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/ia32/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux-noasm/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/ia32/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/arm64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/arm-neon/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/ia32/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/ia32/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/arm64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/ia32/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux-noasm/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/arm64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm-neon/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/mipsel/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/CREDITS.chromium
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/mipsel/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/mac/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm-neon/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/mips64el/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/ia32/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux-noasm/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/ffmpeg_generated.gni
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/arm-neon/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/ia32/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/ia32/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/mac/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux-noasm/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/mips64el/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/mac/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/ia32/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/mips64el/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/ia32/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/mips64el/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/ia32/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/mipsel/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/win/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/mipsel/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux-noasm/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/mipsel/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/mac/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm-neon/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/arm64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/win/ia32/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/ia32/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/arm-neon/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/x64/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/ia32/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/mac/x64/config.asm
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/arm-neon/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/mipsel/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/mipsel/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/linux/ia32/config.h
[add] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/libavutil/autorename_libavutil_imgutils.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chrome/android/x64/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/ChromeOS/linux/arm/config.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm-neon/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/arm-neon/libavutil/ffversion.h
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/linux/ia32/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/x64/libavcodec/bsf_list.c
[modify] https://crrev.com/1a10f05c2f1c47744daae2fb5280f92f0603a58f/chromium/config/Chromium/android/arm-neon/config.h

Project Member

Comment 6 by bugdroid1@chromium.org, Jun 2 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/befd35e71bf99b012d60a9fbc8183441c2b35a93

commit befd35e71bf99b012d60a9fbc8183441c2b35a93
Author: John Rummell <jrummell@chromium.org>
Date: Fri Jun 02 23:25:22 2017

Check expanded side data properly.

If the side data is merged, then the unmerged data ends up in |tmp| and
not |pkt|. So checking for side data should be done on |tmp|.

I've opened https://trac.ffmpeg.org/ticket/6439 as it appears to be a bug
in FFmpeg.

BUG= 718142 

Change-Id: Ib508aa76bedac198841d25a2f830124c0599779e
Reviewed-on: https://chromium-review.googlesource.com/523362
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>

[modify] https://crrev.com/befd35e71bf99b012d60a9fbc8183441c2b35a93/libavcodec/decode.c
[modify] https://crrev.com/befd35e71bf99b012d60a9fbc8183441c2b35a93/chromium/patches/README

Project Member

Comment 7 by bugdroid1@chromium.org, Jun 6 2017

Project Member

Comment 8 by bugdroid1@chromium.org, Jun 6 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/4d33d23bcf13926319c974b9fa80381349786202

commit 4d33d23bcf13926319c974b9fa80381349786202
Author: John Rummell <jrummell@chromium.org>
Date: Tue Jun 06 00:46:40 2017

Check expanded side data properly.

If the side data is merged, then the unmerged data ends up in |tmp| and
not |pkt|. So checking for side data should be done on |tmp|.

I've opened https://trac.ffmpeg.org/ticket/6439 as it appears to be a bug
in FFmpeg.

BUG= 718142 

Change-Id: If61c6329caaf285f1c69d35b290f188c0e460d7f
Reviewed-on: https://chromium-review.googlesource.com/525014
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>

[modify] https://crrev.com/4d33d23bcf13926319c974b9fa80381349786202/libavcodec/decode.c
[modify] https://crrev.com/4d33d23bcf13926319c974b9fa80381349786202/chromium/patches/README

Project Member

Comment 9 by bugdroid1@chromium.org, Jun 6 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/f524d388d561d55ab302dc6d693312ce0290ba8d

commit f524d388d561d55ab302dc6d693312ce0290ba8d
Author: John Rummell <jrummell@chromium.org>
Date: Tue Jun 06 20:11:30 2017

Remove unused configs for linux-noasm/arm64

These configs were created in January 2016 and haven't been updated since.
So removing them to avoid confusion.

BUG= 718142 

Change-Id: I9aece29f9a8fec3476d7f8e4ec02ffc9c59e7cfd
Reviewed-on: https://chromium-review.googlesource.com/525915
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>

[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/ChromeOS/linux-noasm/arm64/config.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/Chromium/linux-noasm/arm64/libavutil/avconfig.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/Chrome/linux-noasm/arm64/libavutil/avconfig.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/Chrome/linux-noasm/arm64/config.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/ChromeOS/linux-noasm/arm64/libavutil/avconfig.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/Chromium/linux-noasm/arm64/libavutil/ffversion.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/Chromium/linux-noasm/arm64/config.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/Chrome/linux-noasm/arm64/libavutil/ffversion.h
[delete] https://crrev.com/06ac9ea361fa8d48916b83783bb7f36872388cc2/chromium/config/ChromeOS/linux-noasm/arm64/libavutil/ffversion.h

Project Member

Comment 10 by bugdroid1@chromium.org, Jun 6 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/207129c971182d599e3b09280857d1c70750564b

commit 207129c971182d599e3b09280857d1c70750564b
Author: jrummell <jrummell@chromium.org>
Date: Tue Jun 06 20:37:22 2017

Roll src/third_party/ffmpeg/ cb7f9fc2a..06ac9ea36 (1561 commits)

https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/cb7f9fc2adbe..06ac9ea361fa

$ git log cb7f9fc2a..06ac9ea36 --date=short --no-merges --format='%ad %ae %s'
2017-06-06 jrummell Remove support for GSM container
2017-06-05 jrummell Check expanded side data properly.
2017-06-05 jrummell Fix up FFmpeg scripts for Windows
2017-05-31 jrummell Always use av_realloc() for |extradata|
2017-05-31 jrummell Remove extra ^M character from compiler version
2017-05-26 jrummell Updating build configs for M60
2017-05-01 industrium Enable native builds on Linux on ARM
2017-05-24 jrummell Update libavformat/mov.c to closer match FFmpeg source
2017-05-12 jrummell Remove unnecessary additional code added to libopus_decode_init()
2017-05-12 jrummell Don't deprecate av_packet_split_side_data()
2017-05-12 jrummell Update Chromium README to match changes
2017-05-06 michael doc/build_system: Document how to build decoder fuzzer
2017-05-06 michael avcodec/srtdec: Check ff_htmlmarkup_to_ass() return code
2017-05-06 michael avcodec/samidec: Check ff_htmlmarkup_to_ass() return code
2017-05-06 michael avcodec/htmlsubtitles: Check for string truncation and return error
2017-05-04 michael avcodec/wavpack: Fix signed integer overflow: 1285114081 * 2 cannot be represented in type 'int'
2017-05-08 jamrial avcodec/mjpegenc: move ff_mjpeg_encode_picture_frame to mjpegenc_common
2017-05-08 jamrial configure: add missing lpc dependency to mlp and truehd encoders
2017-05-08 michael avcodec/bmvvideo: Fix runtime error: left shift of 137 by 24 places cannot be represented in type 'int'
2017-05-08 michael avcodec/dss_sp: Fix multiple runtime error: signed integer overflow: -15699 * -164039 cannot be represented in type 'int'
2017-05-08 michael avcodec/dvbsubdec: check region dimensions
2017-05-08 michael avcodec/vp8dsp: Fixes: runtime error: signed integer overflow: 1330143360 - -1023040530 cannot be represented in type 'int'
2017-05-08 michael avcodec/hqxdsp: Fix multiple runtime error: signed integer overflow: 248220 * 21407 cannot be represented in type 'int' in idct_col()
2017-05-08 michael avcodec/cavsdec: Check sym_factor
2017-05-08 michael avcodec/cdxl: Check format for BGR24
2017-05-04 t.rapp tests/fate/fifo-muxer: update fifo-muxer dependencies
2017-02-20 dan.cherednik avcodec/dcaenc: Initial implementation of ADPCM encoding for DCA encoder
2017-05-08 michael avcodec/rangecoder: Test for invalid corner case
2017-05-08 michael avcodec/ffv1dec: Fix copying planes of paletted formats
2017-05-07 michael avcodec/wmv2dsp: Fix runtime error: signed integer overflow: 181 * -12156865 cannot be represented in type 'int'
2017-05-07 michael doc: fix bistream typo
2017-05-07 michael ffprobe: make function replacement macros behave correctly
2017-05-06 cus lavfi/avfiltergraph: only return EOF in avfilter_graph_request_oldest if all sinks EOFed
2017-05-07 michael avcodec/xwddec: Check bpp more completely
2017-04-10 michael avcodec/aacdec_template: Do not decode 2nd PCE if it will lead to failure
2017-05-07 michael avcodec/s302m: Fix left shift of 8 by 28 places cannot be represented in type 'int'
2017-05-07 michael avcodec/eamad: Fix runtime error: signed integer overflow: 49674 * 49858 cannot be represented in type 'int'
2017-05-07 michael avcodec/g726: Fix runtime error: left shift of negative value -2
2017-01-31 diego build: Ignore generated .version files
2017-05-07 michael avcodec/magicyuv: Check len to be supported
2017-05-07 michael avcodec/ra144: Fix runtime error: left shift of negative value -798
2017-05-07 michael avcodec/mss34dsp: Fix multiple signed integer overflow
2017-05-07 timo avcodec/nvenc: use frames hwctx when registering a frame
2017-05-07 timo avcodec/nvenc: support external context in sw mode
2017-05-07 lq avformat/matroskadec: fix resource leak
2017-05-06 jamrial configure: add missing avcodec dependencies to filters
2017-05-07 michael avcodec/targa_y216dec: Fix width type
2017-05-07 michael avcodec/texturedsp: Fix multiple runtime error: left shift of 255 by 24 places cannot be represented in type 'int'
2017-05-07 michael avcodec/ivi_dsp: Fix multiple left shift of negative value -2
2017-05-07 michael avcodec/svq3: Fix multiple runtime error: signed integer overflow: 44161 * 61694 cannot be represented in type 'int'
2017-05-07 michael avcodec/msmpeg4dec: Correct table depth
2017-05-06 jamrial avcodec/hevc_sei: actually propagate error codes
2017-03-20 wiiaboo rtmpproto: send swfverify value as swfurl if latter is unused
2017-05-06 jjsuwa.sys3175 avdevice/alsa: wait until playback buffers are drained before closing
2017-05-06 michael avcodec/dds: Fix runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
2017-05-06 michael avcodec/cdxl: Check format parameter
2017-05-06 michael avutil/softfloat: Fix overflow in av_div_sf()
2017-04-20 alevinsn avformat/utils: free AVStream.codec properly in free_stream()
2017-05-06 michael avcodec/shorten: Check residual size
2017-05-06 michael avcodec/hq_hqa: Fix runtime error: left shift of negative value -207
2017-05-06 michael avcodec/mss3: Change types in rac_get_model_sym() to match the types they are initialized from
2017-05-06 michael avcodec/shorten: Check k in get_uint()
2017-05-06 michael avcodec/golomb: Assert that k is valid in get_ur_golomb_jpegls()
2017-05-06 michael avcodec/webp: Fix null pointer dereference
2017-05-06 michael avcodec/dfa: Fix signed integer overflow: -2147483648 - 1 cannot be represented in type 'int'
2017-05-06 michael avcodec/g723_1: Fix multiple runtime error: left shift of negative value
2017-05-06 michael avcodec/mimic: Fix runtime error: left shift of negative value -1
2017-05-06 michael tools/target_dec_fuzzer: Do not attempt to fuzz VDPAU, its not supported
2017-05-06 michael tools/target_dec_fuzzer: Do not use codec_id to look up decoder, but use selected decoder directly
2017-05-06 michael avcodec/opus_silk: Fix integer overflow and out of array read
2017-05-06 michael avcodec/clearvideo: Fix multiple runtime error: left shift of negative value -1024
2017-05-06 michael avcodec/fic: Fix multiple left shift of negative value -15
2017-05-06 michael avcodec/mlpdec: Fix runtime error: left shift of negative value -22
2017-05-04 michael avcodec: Avoid splitting side data repeatedly
2017-05-06 michael avcodec/snowdec: Check qbias
2017-05-05 jamrial avcodec/hevc_parser: cosmetics
2017-05-05 jamrial avcodec/hevc_parser: move hevc_find_frame_end() down in the file
2017-05-06 michael avutil/softfloat: Fix multiple runtime error: left shift of negative value -8
2017-05-06 michael avcodec/ivi: Free custom blk_vlc
2017-05-05 michael avcodec/aacsbr_template: Do not leave bs_num_env invalid
2017-05-05 michael avcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be represented in type 'int'
2017-04-30 jamrial doc/libav_merge: remove line about ADVANCED_PARSER
2017-04-30 jamrial avcodec/hevc_parse: decode SEI message NALUs in extradata
2017-05-01 jamrial avcodec/hevc_parser: move slice header parsing to its own function
2017-04-30 jamrial avcodec/hevc_parser: remove HEVCContext usage
2017-04-30 jamrial avcodec/hevc_parser: use ff_h2645_packet_split() to parse NAL units
2017-04-30 jamrial avcodec/hevcdec: move SliceHeader struct definition to hevc_ps
2017-04-30 jamrial avcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()
2017-04-30 jamrial avcodec/hevcdec: move SEI message parsing into a separate header
2017-04-29 jamrial avcodec/hevcdec: remove HEVCContext usage from hevc_sei
2017-05-05 michael avcodec/dfa: Fix off by 1 error
2017-05-05 michael avcodec/nellymoser: Fix multiple left shift of negative value -8591
2017-05-05 michael avcodec/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be represented in type 'int'
2017-05-05 michael avcodec/g722: Fix multiple runtime error: left shift of negative value -1
2017-05-05 michael avcodec/dss_sp: Fix multiple left shift of negative value -466
2017-05-05 michael avcodec/wnv1: Fix runtime error: left shift of negative value -1
2017-05-05 michael avcodec/aacps: Fix undefined behavior
2017-05-05 michael avcodec/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'
2017-05-05 michael avcodec/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer doing so
2017-05-05 cboesch lavu/sha512: update length argument following sha+md5 changes
(...)

Created with:
  roll-dep src/third_party/ffmpeg

BUG= 718142 

Review-Url: https://codereview.chromium.org/2925723003
Cr-Commit-Position: refs/heads/master@{#477394}

[modify] https://crrev.com/207129c971182d599e3b09280857d1c70750564b/DEPS

John, FYI we had loads of memory regression alerts come in this morning. The roll falls within the range of the alerts, so lets wait and see on the bisect results. For example,  Issue 731841 
A few of the bisects have come back without blaming ffmpeg. About 9 issues still have bisect in-progress.


Link here to issues I'm tracking (only the ones from last few days are relevant)
https://bugs.chromium.org/p/chromium/issues/list?can=2&q=cc%3Ame+summary%3Aregression&sort=-modified&colspec=ID+Pri+M+Stars+ReleaseBlock+Component+Status+Owner+Summary+OS+Modified&x=m&y=releaseblock&cells=ids
All of the bisects blamed non-ffmpeg changes. I'm still triaging another round of alerts came in over the weekend. Will post if any of those have ffmpeg in their revision range...
All alerts now triaged. Only 2 have regression ranges that include the roll ( Issue 732478 , and  Issue 732469 ). Will let you know on these bisects. 

I expect future alerts should be beyond your rolls revision.
No ffmpeg CLs were blamed for issues mentioned in Comment 14. You're out of the woods from a telemetry POV.
Labels: Merge-Request-60
Requesting permission to merge this into M60 as it missed the branch cut. It's been in the dev/canary branch for a few days and no issues reported.
Project Member

Comment 17 by sheriffbot@chromium.org, Jun 13 2017

Labels: -Merge-Request-60 Hotlist-Merge-Review Merge-Review-60
This bug requires manual review: DEPS changes referenced in bugdroid comments.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), josafat@(ChromeOS), bustamante@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Please tag with appropriate OSs.  Thanks.
Labels: OS-All
We're pretty late into M60 and cracking down on merges for this milestone, I'd prefer to wait until M61.  If this is a critical bug that can't wait until M61, feel free to add back the Merge-Request-60 label and we'll re-review.
Labels: -Merge-Review-60 Merge-Rejected-60
Status: Fixed (was: Assigned)
Done (but missed M60 :().
Cc: jrumm...@chromium.org
Labels: -Merge-Rejected-60 Merge-Request-60
Owner: chcunningham@chromium.org
Status: Assigned (was: Fixed)
abdulsyed@ - I'm adding back the Merge-Request-60 label to cherry-pick a single change from the larger Roll from Comment 10.

The specific commit I desire is this one-line change:
https://github.com/FFmpeg/FFmpeg/commit/2c8a3aa985acc906ecab37357f2798da7cb9822d#diff-55f0fc939d23e70c34b7edfbe0a2e754

This would fix a very loud popping sound in some ESPN AAC streams. I sadly do not have a bug for that specific issue (reported via email), but can provide more info in private.
Project Member

Comment 24 by sheriffbot@chromium.org, Jun 19 2017

Labels: -Merge-Request-60 Merge-Review-60
This bug requires manual review: DEPS changes referenced in bugdroid comments.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), josafat@(ChromeOS), bustamante@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Labels: -Merge-Review-60 Merge-Approved-60
Since it's a quick one line change, based on comment 23, approving merge to m60. 
Project Member

Comment 26 by bugdroid1@chromium.org, Jun 23 2017

Labels: merge-merged-m60-cherry-picks
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/third_party/ffmpeg/+/c8d5b73d643f7f6977075dcd6cbbfc734a5f90b0

commit c8d5b73d643f7f6977075dcd6cbbfc734a5f90b0
Author: Chris Cunningham <chcunningham@chromium.org>
Date: Fri Jun 23 21:10:07 2017

aacsbr: Turnoff in the event of over read.

Aliased compressed AAC bytes are almost certainly not meaningful SBR
data. In the wild this causes harsh artifacts switching HE-AAC streams
that don't have SBR headers aligned with segment boundaries.

Turning off SBR falls back to a default set of upsampling parameters
that can function as a sort of error concealment. This is consistent
with how the decoder handles other sorts of errors.

(cherry picked from commit 2c8a3aa985acc906ecab37357f2798da7cb9822d)

TBR=jrummell@chromium.org
Bug:  718142 
Change-Id: Ic9989413265d73ba14ffecaa265b815988e16eb2
Reviewed-on: https://chromium-review.googlesource.com/546995
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>

[modify] https://crrev.com/c8d5b73d643f7f6977075dcd6cbbfc734a5f90b0/libavcodec/aacsbr_template.c

Project Member

Comment 27 by bugdroid1@chromium.org, Jun 23 2017

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chrome/tools/buildspec/+/c25e370edd01771ad2815381231c1a3ae564ecc2

commit c25e370edd01771ad2815381231c1a3ae564ecc2
Author: Chris Cunningham <chcunningham@chromium.org>
Date: Fri Jun 23 22:18:38 2017

Status: Fixed (was: Assigned)
Merge to m60 complete.
Clarification: Merge of the one-line cherrypick is complete.
Project Member

Comment 30 by sheriffbot@chromium.org, Jun 27 2017

Cc: abdulsyed@chromium.org
This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Labels: -Merge-Approved-60
Labels: FFmpeg-Roll

Sign in to add a comment