- Revision
- 239159
- Author
- [email protected]
- Date
- 2018-12-13 04:35:17 -0800 (Thu, 13 Dec 2018)
Log Message
[GStreamer][JHBuild] update-webkit{gtk,wpe}-libs fails with libfdk-2.0.0
https://bugs.webkit.org/show_bug.cgi?id=192643
Patch by Carlos Eduardo Ramalho <[email protected]> on 2018-12-13
Reviewed by Philippe Normand.
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.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (239158 => 239159)
--- trunk/Tools/ChangeLog 2018-12-13 12:26:01 UTC (rev 239158)
+++ trunk/Tools/ChangeLog 2018-12-13 12:35:17 UTC (rev 239159)
@@ -1,3 +1,22 @@
+2018-12-13 Carlos Eduardo Ramalho <[email protected]>
+
+ [GStreamer][JHBuild] update-webkit{gtk,wpe}-libs fails with libfdk-2.0.0
+ https://bugs.webkit.org/show_bug.cgi?id=192643
+
+ Reviewed by Philippe Normand.
+
+ 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 Carlos Garcia Campos <[email protected]>
[FreeType] Add initial implementation of variation fonts
Modified: trunk/Tools/gstreamer/jhbuild.modules (239158 => 239159)
--- trunk/Tools/gstreamer/jhbuild.modules 2018-12-13 12:26:01 UTC (rev 239158)
+++ trunk/Tools/gstreamer/jhbuild.modules 2018-12-13 12:35:17 UTC (rev 239159)
@@ -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" /> <!-- Merged as 1d96d9e842dd71882f54ddffbf6c1ccecdb03fcd (to be shipped in 1.16) -->
<patch file="gst-plugins-bad-0002-aomenc-Handle-8-bit_depth-images-with-AOM_IMG_FMT_HI.patch" strip="1" /> <!-- Merged as 10a37e0c3528a721084441c37af37baef0908ddc (to be shipped in 1.16) -->
+ <patch file="gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch" strip="1" /> <!-- Merged as f4fdb9770c76113f38515245fecc5f11b3ace20d (to be shipped in 1.14.5) -->
+ <patch file="gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch" strip="1" /> <!-- Merged as 19d34f6b5e1633d5ec4bb2832c58470f0c829cab (to be shipped in 1.14.5) -->
</branch>
</autotools>
Added: trunk/Tools/gstreamer/patches/gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch (0 => 239159)
--- trunk/Tools/gstreamer/patches/gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch (rev 0)
+++ trunk/Tools/gstreamer/patches/gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch 2018-12-13 12:35:17 UTC (rev 239159)
@@ -0,0 +1,30 @@
+From f4fdb9770c76113f38515245fecc5f11b3ace20d Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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
+
Added: trunk/Tools/gstreamer/patches/gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch (0 => 239159)
--- trunk/Tools/gstreamer/patches/gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch (rev 0)
+++ trunk/Tools/gstreamer/patches/gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch 2018-12-13 12:35:17 UTC (rev 239159)
@@ -0,0 +1,47 @@
+From 19d34f6b5e1633d5ec4bb2832c58470f0c829cab Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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
+
