From b3677b90fb679433ed05605cd40b646504382fac Mon Sep 17 00:00:00 2001 From: Jaska Uimonen Date: Mon, 8 Apr 2013 12:09:18 +0300 Subject: [PATCH] Additional tagging for audio streams. This is needed because 2.0 webkit uses libmm audio policy. This was not in 2.0 alpha. --- Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp | 4 ++-- .../platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp | 2 +- Source/WebCore/platform/mediastream/tizen/MediaStreamPlayer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp index 95db688..908e52b 100755 --- a/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp +++ b/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp @@ -165,7 +165,7 @@ AudioDestinationGStreamer::~AudioDestinationGStreamer() void AudioDestinationGStreamer::finishBuildingPipelineAfterWavParserPadReady(GstPad* pad) { - GstStructure *props; + GstStructure *props; ASSERT(m_wavParserAvailable); @@ -177,7 +177,7 @@ void AudioDestinationGStreamer::finishBuildingPipelineAfterWavParserPadReady(Gst return; } - props = gst_structure_from_string("props,media.role=music", NULL); + props = gst_structure_from_string("props,resource.set.id=pid,media.role=music", NULL); g_object_set(audioSink.get(), "stream-properties", props, NULL); gst_structure_free(props); diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp index 642c3b3..ccf63be 100755 --- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp +++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp @@ -1923,7 +1923,7 @@ void MediaPlayerPrivateGStreamer::createGSTPlayBin() GstElement *sink = gst_element_factory_make("pulsesink", "audio-sink"); if (sink != NULL) { GstStructure *props; - gchar prop_str[256] = "props,media.role="; + gchar prop_str[256] = "props,resource.set.id=pid,media.role="; strncat(prop_str, media_class, sizeof(prop_str)); prop_str[sizeof(prop_str)-1] = 0; diff --git a/Source/WebCore/platform/mediastream/tizen/MediaStreamPlayer.cpp b/Source/WebCore/platform/mediastream/tizen/MediaStreamPlayer.cpp index 7a1f9cc..d567216 100644 --- a/Source/WebCore/platform/mediastream/tizen/MediaStreamPlayer.cpp +++ b/Source/WebCore/platform/mediastream/tizen/MediaStreamPlayer.cpp @@ -249,7 +249,7 @@ void MediaStreamPlayer::createPipeline() m_asink = gst_element_factory_make("pulsesink", 0); if (m_asink != NULL) { - props = gst_structure_from_string("props,media.role=camera", NULL); + props = gst_structure_from_string("props,resource.set.id=pid,media.role=camera", NULL); g_object_set(G_OBJECT(m_asink), "stream-properties", props, NULL); gst_structure_free(props); } -- 2.7.4