mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 13:02:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

sidplay: fix negotiation

Browse source
This commit is contained in:
Wim Taymans 2012-02-09 16:14:55 +01:00
parent f731208bcd
commit bfb8a04d4f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/sidplay/gstsiddec.cc
View file

@ -77,13 +77,14 @@ static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("audio/x-sid") GST_STATIC_CAPS ("audio/x-sid")
); );
#define FORMATS "{ S8, U8, "GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)" }" #define FORMATS "{ "GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)", S8, U8 }"
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, " GST_STATIC_CAPS ("audio/x-raw, "
"format = (string) " FORMATS ", " "format = (string) " FORMATS ", "
"layout = (string) interleaved, "
"rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]") "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]")
); );
@ -278,7 +279,7 @@ update_tags (GstSidDec * siddec)
static gboolean static gboolean
siddec_negotiate (GstSidDec * siddec) siddec_negotiate (GstSidDec * siddec)
{ {
GstCaps *allowed; GstCaps *allowed, *tmp;
GstStructure *structure; GstStructure *structure;
int rate = 44100; int rate = 44100;
int channels = 1; int channels = 1;
@ -292,6 +293,10 @@ siddec_negotiate (GstSidDec * siddec)
GST_DEBUG_OBJECT (siddec, "allowed caps: %" GST_PTR_FORMAT, allowed); GST_DEBUG_OBJECT (siddec, "allowed caps: %" GST_PTR_FORMAT, allowed);
tmp = gst_caps_normalize (allowed);
gst_caps_unref (allowed);
allowed = tmp;
structure = gst_caps_get_structure (allowed, 0); structure = gst_caps_get_structure (allowed, 0);
str = gst_structure_get_string (structure, "format"); str = gst_structure_get_string (structure, "format");
@ -327,6 +332,7 @@ siddec_negotiate (GstSidDec * siddec)
caps = gst_caps_new_simple ("audio/x-raw", caps = gst_caps_new_simple ("audio/x-raw",
"format", G_TYPE_STRING, gst_audio_format_to_string (format), "format", G_TYPE_STRING, gst_audio_format_to_string (format),
"layout", G_TYPE_STRING, "interleaved",
"rate", G_TYPE_INT, siddec->config->frequency, "rate", G_TYPE_INT, siddec->config->frequency,
"channels", G_TYPE_INT, siddec->config->channels, NULL); "channels", G_TYPE_INT, siddec->config->channels, NULL);
gst_pad_set_caps (siddec->srcpad, caps); gst_pad_set_caps (siddec->srcpad, caps);
@ -483,10 +489,10 @@ gst_siddec_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
res = start_play_tune (siddec); res = start_play_tune (siddec);
break; break;
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:
res = FALSE; res = TRUE;
break; break;
default: default:
res = FALSE; res = TRUE;
break; break;
} }
gst_event_unref (event); gst_event_unref (event);