From 35c60c80e15dfc8778102ca94031058ae4e9fc1b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 28 Dec 2022 19:05:33 +0100 Subject: [PATCH] added missing patches --- chromium-107-ffmpeg-duration.patch | 16 ++++++++++++++++ chromium-107-proprietary-codecs.patch | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 chromium-107-ffmpeg-duration.patch create mode 100644 chromium-107-proprietary-codecs.patch diff --git a/chromium-107-ffmpeg-duration.patch b/chromium-107-ffmpeg-duration.patch new file mode 100644 index 0000000..ee01cd9 --- /dev/null +++ b/chromium-107-ffmpeg-duration.patch @@ -0,0 +1,16 @@ +diff -up chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me chromium-107.0.5304.121/media/filters/audio_file_reader.cc +--- chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me 2022-12-17 08:27:12.204753071 +0100 ++++ chromium-107.0.5304.121/media/filters/audio_file_reader.cc 2022-12-17 08:28:40.908211808 +0100 +@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame( + // silence from being output. In the case where we are also discarding some + // portion of the packet (as indicated by a negative pts), we further want to + // adjust the duration downward by however much exists before zero. +- if (audio_codec_ == AudioCodec::kAAC && frame->duration) { ++ if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) { + const base::TimeDelta pkt_duration = ConvertFromTimeBase( + glue_->format_context()->streams[stream_index_]->time_base, +- frame->duration + std::min(static_cast(0), frame->pts)); ++ frame->pkt_duration + std::min(static_cast(0), frame->pts)); + const base::TimeDelta frame_duration = + base::Seconds(frames_read / static_cast(sample_rate_)); + diff --git a/chromium-107-proprietary-codecs.patch b/chromium-107-proprietary-codecs.patch new file mode 100644 index 0000000..94b95b6 --- /dev/null +++ b/chromium-107-proprietary-codecs.patch @@ -0,0 +1,16 @@ +diff -up chromium-107.0.5304.121/media/BUILD.gn.me chromium-107.0.5304.121/media/BUILD.gn +--- chromium-107.0.5304.121/media/BUILD.gn.me 2022-12-17 12:35:44.546779129 +0100 ++++ chromium-107.0.5304.121/media/BUILD.gn 2022-12-17 12:35:59.296047028 +0100 +@@ -64,12 +64,6 @@ buildflag_header("media_buildflags") { + } + } + +-if (proprietary_codecs && media_use_ffmpeg) { +- assert( +- ffmpeg_branding != "Chromium", +- "proprietary codecs and ffmpeg_branding set to Chromium are incompatible") +-} +- + # Common configuration for targets in the media directory; these must not be + # exported since things like USE_NEON and USE_CRAS have different meanings + # elsewhere in the code base.