Attachment 357222 Details for Bug 192643 – Patch

[patch] Patch

bug-192643-20181213085326.patch (text/plain), 6.25 KB, created by Carlos Bentzen on 2018-12-13 03:53:27 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Bentzen

Created: 2018-12-13 03:53:27 PST

Size: 6.25 KB

patch

obsolete

>Subversion Revision: 239130
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 27adc59959aabad9846199aa7f77a90c4581d624..6fff0130fc84ca61e2e781946d10b7748b6717f5 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-12-12  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>+        [GStreamer][JHBuild] update-webkit{gtk,wpe}-libs fails with libfdk-2.0.0
>+        https://bugs.webkit.org/show_bug.cgi?id=192643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This problem happens with Arch Linux users which have libfdk-2.0.0
>+        installed (which is anybody with gst-plugins-bad 1.14.4 installed).
>+
>+        The problem has already been solved upstream at
>+        https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/77.
>+
>+        Adding patches while this problem is not in a release yet.
>+
>+        * gstreamer/jhbuild.modules: Add patches to fix build of gst-plugins-bad with libfdk-2.0.0.
>+        * gstreamer/patches/gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch: Added.
>+        * gstreamer/patches/gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch: Added.
>+
> 2018-12-12  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Unreviewed manual rollout of r239100-r239102 and r239116
>diff --git a/Tools/gstreamer/jhbuild.modules b/Tools/gstreamer/jhbuild.modules
>index c7cd4d97b4c77065d6096460f03ba21e41f6d655..577c91305842ec5d46def932ba7a77e74357b7d7 100644
>--- a/Tools/gstreamer/jhbuild.modules
>+++ b/Tools/gstreamer/jhbuild.modules
>@@ -104,6 +104,8 @@
>     <branch hash="sha256:910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.14.4">
>       <patch file="gst-plugins-bad-0001-aomenc-Add-support-for-10-12bit-decoding.patch" strip="1" /> 
>       <patch file="gst-plugins-bad-0002-aomenc-Handle-8-bit_depth-images-with-AOM_IMG_FMT_HI.patch" strip="1" /> 
>+      <patch file="gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch" strip="1" /> 
>+      <patch file="gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch" strip="1" /> 
>     </branch>
>   </autotools>
> 
>diff --git a/Tools/gstreamer/patches/gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch b/Tools/gstreamer/patches/gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch
>new file mode 100644
>index 0000000000000000000000000000000000000000..1ea08f9abba2bc8ec204798498e3bd34ed5eac67
>--- /dev/null
>+++ b/Tools/gstreamer/patches/gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch
>@@ -0,0 +1,30 @@
>+From f4fdb9770c76113f38515245fecc5f11b3ace20d Mon Sep 17 00:00:00 2001
>+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
>+Date: Tue, 4 Dec 2018 17:54:42 +0100
>+Subject: [PATCH] fdkaacenc: Remove MODE_2_1
>+
>+This is not a standard mode and no longer supported by fdk-aac 2.0.0.
>+
>+For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825
>+---
>+ ext/fdkaac/gstfdkaacenc.c | 4 ----
>+ 1 file changed, 4 deletions(-)
>+
>+diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c
>+index ad2bcb492..8410e684c 100644
>+--- a/ext/fdkaac/gstfdkaacenc.c
>++++ b/ext/fdkaac/gstfdkaacenc.c
>+@@ -71,10 +71,6 @@ static const struct
>+   GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
>+           GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
>+           GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, {
>+-    3, MODE_2_1, {
>+-  GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
>+-          GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
>+-          GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
>+     4, MODE_1_2_1, {
>+   GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
>+           GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
>+-- 
>+2.18.1
>+
>diff --git a/Tools/gstreamer/patches/gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch b/Tools/gstreamer/patches/gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch
>new file mode 100644
>index 0000000000000000000000000000000000000000..1d820af3b9064c9e01722acd245a0171018d43f0
>--- /dev/null
>+++ b/Tools/gstreamer/patches/gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch
>@@ -0,0 +1,47 @@
>+From 19d34f6b5e1633d5ec4bb2832c58470f0c829cab Mon Sep 17 00:00:00 2001
>+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
>+Date: Wed, 5 Dec 2018 10:10:39 +0100
>+Subject: [PATCH] fdkaacdec: Use WAV channel mapping instead of interleave
>+ setting
>+
>+The latter is going away in libfdk-aac 2.0.0. Instead, MPEG-style output
>+is always non-interleaved and WAV-style output is always interleaved.
>+Earlier libfdk-aac also defaults interleaving accordingly.
>+
>+Since our reordering looks at the associated PCE indices instead of the
>+actual channel order, we're agnostic to the mapping.
>+
>+For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825
>+---
>+ ext/fdkaac/gstfdkaacdec.c | 12 ++++--------
>+ 1 file changed, 4 insertions(+), 8 deletions(-)
>+
>+diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c
>+index c27183752..f5136b334 100644
>+--- a/ext/fdkaac/gstfdkaacdec.c
>++++ b/ext/fdkaac/gstfdkaacdec.c
>+@@ -151,17 +151,13 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps)
>+     gst_buffer_unref (codec_data);
>+   }
>+ 
>++  /* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0
>++   * The pChannelIndices retain the indices from the standard MPEG mapping so
>++   * we're agnostic to the actual order. */
>+   if ((err =
>+           aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING,
>+-              0)) != AAC_DEC_OK) {
>+-    GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
>+-    return FALSE;
>+-  }
>+-
>+-  if ((err =
>+-          aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED,
>+               1)) != AAC_DEC_OK) {
>+-    GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err);
>++    GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
>+     return FALSE;
>+   }
>+ 
>+-- 
>+2.18.1
>+

Actions: View | Formatted Diff | Diff

Attachments on bug 192643: 357193 | 357222