REVERT-roll-src-third_party-ffmpeg-m106.patch 2.6 KB

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