mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ac3parse: use proper EAC-3 caps

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-12-01 15:28:53 +01:00 committed by Tim-Philipp Müller
parent b8af812987
commit f7de334d61
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/audioparsers/gstac3parse.c
View file

@ -148,13 +148,14 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-ac3, framed = (boolean) true, " GST_STATIC_CAPS ("audio/x-ac3, framed = (boolean) true, "
" channels = (int) [ 1, 6 ], rate = (int) [ 32000, 48000 ]; " " channels = (int) [ 1, 6 ], rate = (int) [ 32000, 48000 ]; "
"audio/ac3, framed = (boolean) true, " "audio/x-eac3, framed = (boolean) true, "
" channels = (int) [ 1, 6 ], rate = (int) [ 32000, 48000 ] ")); " channels = (int) [ 1, 6 ], rate = (int) [ 32000, 48000 ] "));
static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-ac3, framed = (boolean) false; " GST_STATIC_CAPS ("audio/x-ac3, framed = (boolean) false; "
"audio/x-eac3, framed = (boolean) false; "
"audio/ac3, framed = (boolean) false ")); "audio/ac3, framed = (boolean) false "));
static void gst_ac3_parse_finalize (GObject * object); static void gst_ac3_parse_finalize (GObject * object);
@ -206,6 +207,7 @@ gst_ac3_parse_reset (GstAc3Parse * ac3parse)
{ {
ac3parse->channels = -1; ac3parse->channels = -1;
ac3parse->sample_rate = -1; ac3parse->sample_rate = -1;
ac3parse->eac = FALSE;
} }
static void static void
@ -347,7 +349,8 @@ gst_ac3_parse_frame_header_eac3 (GstAc3Parse * ac3parse, GstBuffer * buf,
static gboolean static gboolean
gst_ac3_parse_frame_header (GstAc3Parse * parse, GstBuffer * buf, gst_ac3_parse_frame_header (GstAc3Parse * parse, GstBuffer * buf,
guint * framesize, guint * rate, guint * chans, guint * blocks, guint * sid) guint * framesize, guint * rate, guint * chans, guint * blocks,
guint * sid, gboolean * eac)
{ {
GstBitReader bits = GST_BIT_READER_INIT_FROM_BUFFER (buf); GstBitReader bits = GST_BIT_READER_INIT_FROM_BUFFER (buf);
guint16 sync; guint16 sync;
@ -365,9 +368,13 @@ gst_ac3_parse_frame_header (GstAc3Parse * parse, GstBuffer * buf,
GST_LOG_OBJECT (parse, "bsid = %d", bsid); GST_LOG_OBJECT (parse, "bsid = %d", bsid);
if (bsid <= 10) { if (bsid <= 10) {
if (eac)
*eac = FALSE;
return gst_ac3_parse_frame_header_ac3 (parse, buf, framesize, rate, chans, return gst_ac3_parse_frame_header_ac3 (parse, buf, framesize, rate, chans,
blocks, sid); blocks, sid);
} else if (bsid <= 16) { } else if (bsid <= 16) {
if (eac)
*eac = TRUE;
return gst_ac3_parse_frame_header_eac3 (parse, buf, framesize, rate, chans, return gst_ac3_parse_frame_header_eac3 (parse, buf, framesize, rate, chans,
blocks, sid); blocks, sid);
} else { } else {
@ -407,7 +414,7 @@ gst_ac3_parse_check_valid_frame (GstBaseParse * parse, GstBuffer * buf,
/* make sure the values in the frame header look sane */ /* make sure the values in the frame header look sane */
if (!gst_ac3_parse_frame_header (ac3parse, buf, framesize, NULL, NULL, if (!gst_ac3_parse_frame_header (ac3parse, buf, framesize, NULL, NULL,
NULL, NULL)) { NULL, NULL, NULL)) {
*skipsize = off + 2; *skipsize = off + 2;
return FALSE; return FALSE;
} }
@ -448,9 +455,10 @@ gst_ac3_parse_parse_frame (GstBaseParse * parse, GstBuffer * buf)
{ {
GstAc3Parse *ac3parse = GST_AC3_PARSE (parse); GstAc3Parse *ac3parse = GST_AC3_PARSE (parse);
guint fsize, rate, chans, blocks, sid; guint fsize, rate, chans, blocks, sid;
gboolean eac;
if (!gst_ac3_parse_frame_header (ac3parse, buf, &fsize, &rate, &chans, if (!gst_ac3_parse_frame_header (ac3parse, buf, &fsize, &rate, &chans,
&blocks, &sid)) &blocks, &sid, &eac))
goto broken_header; goto broken_header;
GST_LOG_OBJECT (parse, "size: %u, rate: %u, chans: %u", fsize, rate, chans); GST_LOG_OBJECT (parse, "size: %u, rate: %u, chans: %u", fsize, rate, chans);
@ -460,8 +468,9 @@ gst_ac3_parse_parse_frame (GstBaseParse * parse, GstBuffer * buf)
GST_BUFFER_FLAG_SET (buf, GST_BASE_PARSE_BUFFER_FLAG_NO_FRAME); GST_BUFFER_FLAG_SET (buf, GST_BASE_PARSE_BUFFER_FLAG_NO_FRAME);
} }
if (G_UNLIKELY (ac3parse->sample_rate != rate || ac3parse->channels != chans)) { if (G_UNLIKELY (ac3parse->sample_rate != rate || ac3parse->channels != chans
GstCaps *caps = gst_caps_new_simple ("audio/x-ac3", || ac3parse->eac != ac3parse->eac)) {
GstCaps *caps = gst_caps_new_simple (eac ? "audio/x-eac3" : "audio/x-ac3",
"framed", G_TYPE_BOOLEAN, TRUE, "rate", G_TYPE_INT, rate, "framed", G_TYPE_BOOLEAN, TRUE, "rate", G_TYPE_INT, rate,
"channels", G_TYPE_INT, chans, NULL); "channels", G_TYPE_INT, chans, NULL);
gst_buffer_set_caps (buf, caps); gst_buffer_set_caps (buf, caps);
@ -470,6 +479,7 @@ gst_ac3_parse_parse_frame (GstBaseParse * parse, GstBuffer * buf)
ac3parse->sample_rate = rate; ac3parse->sample_rate = rate;
ac3parse->channels = chans; ac3parse->channels = chans;
ac3parse->eac = eac;
gst_base_parse_set_frame_props (parse, rate, 256 * blocks, 2, 2); gst_base_parse_set_frame_props (parse, rate, 256 * blocks, 2, 2);
} }

1
gst/audioparsers/gstac3parse.h
View file

@ -53,6 +53,7 @@ struct _GstAc3Parse {
/*< private >*/ /*< private >*/
gint sample_rate; gint sample_rate;
gint channels; gint channels;
gboolean eac;
}; };
/** /**