Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[media] Fix mp3 audio playback and add debug graph generation. Fixes …
…JB#49532
- Loading branch information
Showing
3 changed files
with
52 additions
and
22 deletions.
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
rpm/0022-Enable-gstreamer-pipeline-debug-graph-generati.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 0679595a70ff9f5f96c6f68f990b32fd17a905ff Tue, 7 Apr 2020 15:08:48 +0200 | ||
From: Andrew Branson <andrew.branson@jolla.com> | ||
Date: Tue, 7 Apr 2020 00:02:45 +0200 | ||
Subject: [PATCH] [debug] Enable gstreamer pipeline debug graph generation. JB#49532 | ||
|
||
diff --git a/dom/media/gstreamer/GStreamerFunctionList.h b/dom/media/gstreamer/GStreamerFunctionList.h | ||
index 75f352e..80d7819 100644 | ||
--- a/dom/media/gstreamer/GStreamerFunctionList.h | ||
+++ b/dom/media/gstreamer/GStreamerFunctionList.h | ||
@@ -35,6 +35,7 @@ | ||
GST_FUNC(LIBGSTREAMER, gst_caps_new_full) | ||
GST_FUNC(LIBGSTREAMER, gst_caps_new_simple) | ||
GST_FUNC(LIBGSTREAMER, gst_caps_set_simple) | ||
+GST_FUNC(LIBGSTREAMER, gst_debug_bin_to_dot_file_with_ts) | ||
GST_FUNC(LIBGSTREAMER, gst_element_factory_get_static_pad_templates) | ||
GST_FUNC(LIBGSTREAMER, gst_element_factory_get_type) | ||
GST_FUNC(LIBGSTREAMER, gst_element_factory_make) | ||
diff --git a/dom/media/gstreamer/GStreamerReader.cpp b/dom/media/gstreamer/GStreamerReader.cpp | ||
index 202f5a4..4183389 100644 | ||
--- a/dom/media/gstreamer/GStreamerReader.cpp | ||
+++ b/dom/media/gstreamer/GStreamerReader.cpp | ||
@@ -554,6 +554,9 @@ | ||
* the appsinks */ | ||
if (UpdateCurrentAsActiveIfNotBusy(this)) { | ||
gst_element_set_state(mPlayBin, GST_STATE_PLAYING); | ||
+ GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(GST_BIN(mPlayBin), | ||
+ GstDebugGraphDetails(GST_DEBUG_GRAPH_SHOW_ALL /* GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE | GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS | GST_DEBUG_GRAPH_SHOW_STATES*/), | ||
+ "ReadMetadata"); | ||
} | ||
|
||
return NS_OK; |
18 changes: 18 additions & 0 deletions
18
rpm/0023-media-Require-interleaved-audio-layout-Fixes-JB49532.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
From 4dc86eb20668f92f810388e07253b16bed1a152d Tue, 7 Apr 2020 15:08:37 +0200 | ||
From: Andrew Branson <andrew.branson@jolla.com> | ||
Date: Tue, 7 Apr 2020 11:12:19 +0200 | ||
Subject: [PATCH] [media] Require interleaved audio layout. Fixes JB#49532 | ||
|
||
diff --git a/dom/media/gstreamer/GStreamerReader.cpp b/dom/media/gstreamer/GStreamerReader.cpp | ||
index 4183389..b5cc71e 100644 | ||
--- a/dom/media/gstreamer/GStreamerReader.cpp | ||
+++ b/dom/media/gstreamer/GStreamerReader.cpp | ||
@@ -1340,7 +1340,7 @@ | ||
#if GST_VERSION_MAJOR >= 1 | ||
GstCaps* GStreamerReader::BuildAudioSinkCaps() | ||
{ | ||
- GstCaps* caps = gst_caps_from_string("audio/x-raw, channels={1,2}"); | ||
+ GstCaps* caps = gst_caps_from_string("audio/x-raw, channels={1,2}, layout=interleaved"); | ||
const char* format; | ||
#ifdef MOZ_SAMPLE_TYPE_FLOAT32 | ||
#if MOZ_LITTLE_ENDIAN |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters