chromium/trunk/REVERT-roll-src-third_party-ffmpeg-m106.patch

   1 From ded379824f5de39357b6b1894578101aba5cdf05 Mon Sep 17 00:00:00 2001
   2 From: Eugene Zemtsov <eugene@chromium.org>
   3 Date: Fri, 29 Jul 2022 04:41:04 +0000
   4 Subject: [PATCH] Roll src/third_party/ffmpeg/ 880df5ede..b71ecd02b (279
   5  commits)
   6
   7 https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/880df5ede50a..b71ecd02b479
   8
   9 $ git log 880df5ede..b71ecd02b --date=short --no-merges --format='%ad %ae %s'
  10 2022-07-27 eugene Roll for M106
  11 2022-07-25 andreas.rheinhardt avcodec/x86/pngdsp: Remove obsolete ff_add_bytes_l2_mmx()
  12 2022-07-22 andreas.rheinhardt avcodec/hevcdec: Output MD5-message in one piece
  13 2022-07-24 epirat07 configure: properly require libx264 if enabled
  14 2022-07-24 zane avformat/argo_cvg: expose loop/reverb/checksum via metadata
  15 (...)
  16 2022-05-03 leo.izen avcodec/libjxldec: properly tag output colorspace
  17 2022-06-25 ffmpeg avfilter/Makefile: always make colorspace.o
  18 2022-03-02 brad avutil/ppc/cpu: Use proper header for OpenBSD PPC CPU detection
  19 2022-06-24 jamrial avformat/http: include version.h
  20 2022-05-16 mbonda-at-nvidia.com AV1 VDPAU hwaccel Decode support
  21
  22 Created with:
  23   roll-dep src/third_party/ffmpeg
  24
  25 ffmpeg usage fix:
  26  Switch from AVFrame::pkt_duration to AVFrame::duration,
  27  AVFrame::pkt_duration is deprecated
  28
  29 Bug: 1344646
  30 Change-Id: Iaa3abf48ef81dae6d282bca8f0fa2a8dffeeba25
  31 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3788638
  32 Reviewed-by: Will Cassella <cassew@chromium.org>
  33 Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
  34 Cr-Commit-Position: refs/heads/main@{#1029623}
  35 ---
  36  media/filters/audio_file_reader.cc | 4 ++--
  37  1 file changed, 2 insertions(+), 2 deletions(-)
  38
  39 diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
  40 index e1be5aa9a5b..951c003956f 100644
  41 --- a/media/filters/audio_file_reader.cc
  42 +++ b/media/filters/audio_file_reader.cc
  43 @@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
  44    // silence from being output. In the case where we are also discarding some
  45    // portion of the packet (as indicated by a negative pts), we further want to
  46    // adjust the duration downward by however much exists before zero.
  47 -  if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
  48 +  if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
  49      const base::TimeDelta pkt_duration = ConvertFromTimeBase(
  50          glue_->format_context()->streams[stream_index_]->time_base,
  51 -        frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
  52 +        frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
  53      const base::TimeDelta frame_duration =
  54          base::Seconds(frames_read / static_cast<double>(sample_rate_));
  55