mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

aacparse, amrparse: gst_fooparse_xyz -> gst_foo_parse_xyz to match GstFooParse

Browse source 
See moving-plugins checklist.
This commit is contained in:
Tim-Philipp Müller 2011-04-07 15:07:15 +01:00
parent e44456b481
commit e067c554c2
5 changed files with 132 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
gst/audioparsers/gstaacparse.c
View file

@ -60,8 +60,8 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("audio/mpeg, " GST_STATIC_CAPS ("audio/mpeg, "
"framed = (boolean) false, " "mpegversion = (int) { 2, 4 };")); "framed = (boolean) false, " "mpegversion = (int) { 2, 4 };"));
GST_DEBUG_CATEGORY_STATIC (gst_aacparse_debug); GST_DEBUG_CATEGORY_STATIC (aacparse_debug);
#define GST_CAT_DEFAULT gst_aacparse_debug #define GST_CAT_DEFAULT aacparse_debug
#define ADIF_MAX_SIZE 40 /* Should be enough */ #define ADIF_MAX_SIZE 40 /* Should be enough */
@ -70,35 +70,36 @@ GST_DEBUG_CATEGORY_STATIC (gst_aacparse_debug);
#define AAC_FRAME_DURATION(parse) (GST_SECOND/parse->frames_per_sec) #define AAC_FRAME_DURATION(parse) (GST_SECOND/parse->frames_per_sec)
gboolean gst_aacparse_start (GstBaseParse * parse); gboolean gst_aac_parse_start (GstBaseParse * parse);
gboolean gst_aacparse_stop (GstBaseParse * parse); gboolean gst_aac_parse_stop (GstBaseParse * parse);
static gboolean gst_aacparse_sink_setcaps (GstBaseParse * parse, static gboolean gst_aac_parse_sink_setcaps (GstBaseParse * parse,
GstCaps * caps); GstCaps * caps);
gboolean gst_aacparse_check_valid_frame (GstBaseParse * parse, gboolean gst_aac_parse_check_valid_frame (GstBaseParse * parse,
GstBaseParseFrame * frame, guint * size, gint * skipsize); GstBaseParseFrame * frame, guint * size, gint * skipsize);
GstFlowReturn gst_aacparse_parse_frame (GstBaseParse * parse, GstFlowReturn gst_aac_parse_parse_frame (GstBaseParse * parse,
GstBaseParseFrame * frame); GstBaseParseFrame * frame);
gboolean gst_aacparse_convert (GstBaseParse * parse, gboolean gst_aac_parse_convert (GstBaseParse * parse,
GstFormat src_format, GstFormat src_format,
gint64 src_value, GstFormat dest_format, gint64 * dest_value); gint64 src_value, GstFormat dest_format, gint64 * dest_value);
gint gst_aacparse_get_frame_overhead (GstBaseParse * parse, GstBuffer * buffer); gint gst_aac_parse_get_frame_overhead (GstBaseParse * parse,
GstBuffer * buffer);
gboolean gst_aacparse_event (GstBaseParse * parse, GstEvent * event); gboolean gst_aac_parse_event (GstBaseParse * parse, GstEvent * event);
#define _do_init(bla) \ #define _do_init(bla) \
GST_DEBUG_CATEGORY_INIT (gst_aacparse_debug, "aacparse", 0, \ GST_DEBUG_CATEGORY_INIT (aacparse_debug, "aacparse", 0, \
"AAC audio stream parser"); "AAC audio stream parser");
GST_BOILERPLATE_FULL (GstAacParse, gst_aacparse, GstBaseParse, GST_BOILERPLATE_FULL (GstAacParse, gst_aac_parse, GstBaseParse,
GST_TYPE_BASE_PARSE, _do_init); GST_TYPE_BASE_PARSE, _do_init);
static inline gint static inline gint
gst_aacparse_get_sample_rate_from_index (guint sr_idx) gst_aac_parse_get_sample_rate_from_index (guint sr_idx)
{ {
static const guint aac_sample_rates[] = { 96000, 88200, 64000, 48000, 44100, static const guint aac_sample_rates[] = { 96000, 88200, 64000, 48000, 44100,
32000, 24000, 22050, 16000, 12000, 11025, 8000 32000, 24000, 22050, 16000, 12000, 11025, 8000
@ -111,12 +112,12 @@ gst_aacparse_get_sample_rate_from_index (guint sr_idx)
} }
/** /**
* gst_aacparse_base_init: * gst_aac_parse_base_init:
* @klass: #GstElementClass. * @klass: #GstElementClass.
* *
*/ */
static void static void
gst_aacparse_base_init (gpointer klass) gst_aac_parse_base_init (gpointer klass)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
@ -132,39 +133,39 @@ gst_aacparse_base_init (gpointer klass)
/** /**
* gst_aacparse_class_init: * gst_aac_parse_class_init:
* @klass: #GstAacParseClass. * @klass: #GstAacParseClass.
* *
*/ */
static void static void
gst_aacparse_class_init (GstAacParseClass * klass) gst_aac_parse_class_init (GstAacParseClass * klass)
{ {
GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass); GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
parse_class->start = GST_DEBUG_FUNCPTR (gst_aacparse_start); parse_class->start = GST_DEBUG_FUNCPTR (gst_aac_parse_start);
parse_class->stop = GST_DEBUG_FUNCPTR (gst_aacparse_stop); parse_class->stop = GST_DEBUG_FUNCPTR (gst_aac_parse_stop);
parse_class->set_sink_caps = GST_DEBUG_FUNCPTR (gst_aacparse_sink_setcaps); parse_class->set_sink_caps = GST_DEBUG_FUNCPTR (gst_aac_parse_sink_setcaps);
parse_class->parse_frame = GST_DEBUG_FUNCPTR (gst_aacparse_parse_frame); parse_class->parse_frame = GST_DEBUG_FUNCPTR (gst_aac_parse_parse_frame);
parse_class->check_valid_frame = parse_class->check_valid_frame =
GST_DEBUG_FUNCPTR (gst_aacparse_check_valid_frame); GST_DEBUG_FUNCPTR (gst_aac_parse_check_valid_frame);
} }
/** /**
* gst_aacparse_init: * gst_aac_parse_init:
* @aacparse: #GstAacParse. * @aacparse: #GstAacParse.
* @klass: #GstAacParseClass. * @klass: #GstAacParseClass.
* *
*/ */
static void static void
gst_aacparse_init (GstAacParse * aacparse, GstAacParseClass * klass) gst_aac_parse_init (GstAacParse * aacparse, GstAacParseClass * klass)
{ {
GST_DEBUG ("initialized"); GST_DEBUG ("initialized");
} }
/** /**
* gst_aacparse_set_src_caps: * gst_aac_parse_set_src_caps:
* @aacparse: #GstAacParse. * @aacparse: #GstAacParse.
* @sink_caps: (proposed) caps of sink pad * @sink_caps: (proposed) caps of sink pad
* *
@ -174,7 +175,7 @@ gst_aacparse_init (GstAacParse * aacparse, GstAacParseClass * klass)
* Returns: TRUE if caps were successfully set. * Returns: TRUE if caps were successfully set.
*/ */
static gboolean static gboolean
gst_aacparse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps) gst_aac_parse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps)
{ {
GstStructure *s; GstStructure *s;
GstCaps *src_caps = NULL; GstCaps *src_caps = NULL;
@ -221,7 +222,7 @@ gst_aacparse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps)
/** /**
* gst_aacparse_sink_setcaps: * gst_aac_parse_sink_setcaps:
* @sinkpad: GstPad * @sinkpad: GstPad
* @caps: GstCaps * @caps: GstCaps
* *
@ -230,14 +231,14 @@ gst_aacparse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps)
* Returns: TRUE on success. * Returns: TRUE on success.
*/ */
static gboolean static gboolean
gst_aacparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps) gst_aac_parse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
{ {
GstAacParse *aacparse; GstAacParse *aacparse;
GstStructure *structure; GstStructure *structure;
gchar *caps_str; gchar *caps_str;
const GValue *value; const GValue *value;
aacparse = GST_AACPARSE (parse); aacparse = GST_AAC_PARSE (parse);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
caps_str = gst_caps_to_string (caps); caps_str = gst_caps_to_string (caps);
@ -257,7 +258,7 @@ gst_aacparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
sr_idx = ((buffer[0] & 0x07) << 1) | ((buffer[1] & 0x80) >> 7); sr_idx = ((buffer[0] & 0x07) << 1) | ((buffer[1] & 0x80) >> 7);
aacparse->object_type = (buffer[0] & 0xf8) >> 3; aacparse->object_type = (buffer[0] & 0xf8) >> 3;
aacparse->sample_rate = gst_aacparse_get_sample_rate_from_index (sr_idx); aacparse->sample_rate = gst_aac_parse_get_sample_rate_from_index (sr_idx);
aacparse->channels = (buffer[1] & 0x78) >> 3; aacparse->channels = (buffer[1] & 0x78) >> 3;
aacparse->header_type = DSPAAC_HEADER_NONE; aacparse->header_type = DSPAAC_HEADER_NONE;
aacparse->mpegversion = 4; aacparse->mpegversion = 4;
@ -266,7 +267,7 @@ gst_aacparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
aacparse->object_type, aacparse->sample_rate, aacparse->channels); aacparse->object_type, aacparse->sample_rate, aacparse->channels);
/* arrange for metadata and get out of the way */ /* arrange for metadata and get out of the way */
gst_aacparse_set_src_caps (aacparse, caps); gst_aac_parse_set_src_caps (aacparse, caps);
gst_base_parse_set_passthrough (parse, TRUE); gst_base_parse_set_passthrough (parse, TRUE);
} else } else
return FALSE; return FALSE;
@ -283,7 +284,7 @@ gst_aacparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
/** /**
* gst_aacparse_adts_get_frame_len: * gst_aac_parse_adts_get_frame_len:
* @data: block of data containing an ADTS header. * @data: block of data containing an ADTS header.
* *
* This function calculates ADTS frame length from the given header. * This function calculates ADTS frame length from the given header.
@ -291,14 +292,14 @@ gst_aacparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
* Returns: size of the ADTS frame. * Returns: size of the ADTS frame.
*/ */
static inline guint static inline guint
gst_aacparse_adts_get_frame_len (const guint8 * data) gst_aac_parse_adts_get_frame_len (const guint8 * data)
{ {
return ((data[3] & 0x03) << 11) | (data[4] << 3) | ((data[5] & 0xe0) >> 5); return ((data[3] & 0x03) << 11) | (data[4] << 3) | ((data[5] & 0xe0) >> 5);
} }
/** /**
* gst_aacparse_check_adts_frame: * gst_aac_parse_check_adts_frame:
* @aacparse: #GstAacParse. * @aacparse: #GstAacParse.
* @data: Data to be checked. * @data: Data to be checked.
* @avail: Amount of data passed. * @avail: Amount of data passed.
@ -329,7 +330,7 @@ gst_aacparse_adts_get_frame_len (const guint8 * data)
* Returns: TRUE if the given data contains a valid ADTS header. * Returns: TRUE if the given data contains a valid ADTS header.
*/ */
static gboolean static gboolean
gst_aacparse_check_adts_frame (GstAacParse * aacparse, gst_aac_parse_check_adts_frame (GstAacParse * aacparse,
const guint8 * data, const guint avail, gboolean drain, const guint8 * data, const guint avail, gboolean drain,
guint * framesize, guint * needed_data) guint * framesize, guint * needed_data)
{ {
@ -337,7 +338,7 @@ gst_aacparse_check_adts_frame (GstAacParse * aacparse,
return FALSE; return FALSE;
if ((data[0] == 0xff) && ((data[1] & 0xf6) == 0xf0)) { if ((data[0] == 0xff) && ((data[1] & 0xf6) == 0xf0)) {
*framesize = gst_aacparse_adts_get_frame_len (data); *framesize = gst_aac_parse_adts_get_frame_len (data);
/* In EOS mode this is enough. No need to examine the data further */ /* In EOS mode this is enough. No need to examine the data further */
if (drain) { if (drain) {
@ -356,7 +357,7 @@ gst_aacparse_check_adts_frame (GstAacParse * aacparse,
} }
if ((data[*framesize] == 0xff) && ((data[*framesize + 1] & 0xf6) == 0xf0)) { if ((data[*framesize] == 0xff) && ((data[*framesize + 1] & 0xf6) == 0xf0)) {
guint nextlen = gst_aacparse_adts_get_frame_len (data + (*framesize)); guint nextlen = gst_aac_parse_adts_get_frame_len (data + (*framesize));
GST_LOG ("ADTS frame found, len: %d bytes", *framesize); GST_LOG ("ADTS frame found, len: %d bytes", *framesize);
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse),
@ -369,14 +370,14 @@ gst_aacparse_check_adts_frame (GstAacParse * aacparse,
/* caller ensure sufficient data */ /* caller ensure sufficient data */
static inline void static inline void
gst_aacparse_parse_adts_header (GstAacParse * aacparse, const guint8 * data, gst_aac_parse_parse_adts_header (GstAacParse * aacparse, const guint8 * data,
gint * rate, gint * channels, gint * object, gint * version) gint * rate, gint * channels, gint * object, gint * version)
{ {
if (rate) { if (rate) {
gint sr_idx = (data[2] & 0x3c) >> 2; gint sr_idx = (data[2] & 0x3c) >> 2;
*rate = gst_aacparse_get_sample_rate_from_index (sr_idx); *rate = gst_aac_parse_get_sample_rate_from_index (sr_idx);
} }
if (channels) if (channels)
*channels = ((data[2] & 0x01) << 2) | ((data[3] & 0xc0) >> 6); *channels = ((data[2] & 0x01) << 2) | ((data[3] & 0xc0) >> 6);
@ -388,7 +389,7 @@ gst_aacparse_parse_adts_header (GstAacParse * aacparse, const guint8 * data,
} }
/** /**
* gst_aacparse_detect_stream: * gst_aac_parse_detect_stream:
* @aacparse: #GstAacParse. * @aacparse: #GstAacParse.
* @data: A block of data that needs to be examined for stream characteristics. * @data: A block of data that needs to be examined for stream characteristics.
* @avail: Size of the given datablock. * @avail: Size of the given datablock.
@ -407,7 +408,7 @@ gst_aacparse_parse_adts_header (GstAacParse * aacparse, const guint8 * data,
* Returns: TRUE on success. * Returns: TRUE on success.
*/ */
static gboolean static gboolean
gst_aacparse_detect_stream (GstAacParse * aacparse, gst_aac_parse_detect_stream (GstAacParse * aacparse,
const guint8 * data, const guint avail, gboolean drain, const guint8 * data, const guint avail, gboolean drain,
guint * framesize, gint * skipsize) guint * framesize, gint * skipsize)
{ {
@ -445,14 +446,14 @@ gst_aacparse_detect_stream (GstAacParse * aacparse,
return FALSE; return FALSE;
} }
if (gst_aacparse_check_adts_frame (aacparse, data, avail, drain, if (gst_aac_parse_check_adts_frame (aacparse, data, avail, drain,
framesize, &need_data)) { framesize, &need_data)) {
gint rate, channels; gint rate, channels;
GST_INFO ("ADTS ID: %d, framesize: %d", (data[1] & 0x08) >> 3, *framesize); GST_INFO ("ADTS ID: %d, framesize: %d", (data[1] & 0x08) >> 3, *framesize);
aacparse->header_type = DSPAAC_HEADER_ADTS; aacparse->header_type = DSPAAC_HEADER_ADTS;
gst_aacparse_parse_adts_header (aacparse, data, &rate, &channels, gst_aac_parse_parse_adts_header (aacparse, data, &rate, &channels,
&aacparse->object_type, &aacparse->mpegversion); &aacparse->object_type, &aacparse->mpegversion);
gst_base_parse_set_frame_props (GST_BASE_PARSE (aacparse), gst_base_parse_set_frame_props (GST_BASE_PARSE (aacparse),
@ -526,7 +527,7 @@ gst_aacparse_detect_stream (GstAacParse * aacparse,
/* FIXME: This gives totally wrong results. Duration calculation cannot /* FIXME: This gives totally wrong results. Duration calculation cannot
be based on this */ be based on this */
aacparse->sample_rate = gst_aacparse_get_sample_rate_from_index (sr_idx); aacparse->sample_rate = gst_aac_parse_get_sample_rate_from_index (sr_idx);
/* baseparse is not given any fps, /* baseparse is not given any fps,
* so it will give up on timestamps, seeking, etc */ * so it will give up on timestamps, seeking, etc */
@ -540,7 +541,7 @@ gst_aacparse_detect_stream (GstAacParse * aacparse,
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 512); gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 512);
/* arrange for metadata and get out of the way */ /* arrange for metadata and get out of the way */
gst_aacparse_set_src_caps (aacparse, gst_aac_parse_set_src_caps (aacparse,
GST_PAD_CAPS (GST_BASE_PARSE_SINK_PAD (aacparse))); GST_PAD_CAPS (GST_BASE_PARSE_SINK_PAD (aacparse)));
/* not syncable, not easily seekable (unless we push data from start */ /* not syncable, not easily seekable (unless we push data from start */
@ -558,7 +559,7 @@ gst_aacparse_detect_stream (GstAacParse * aacparse,
/** /**
* gst_aacparse_check_valid_frame: * gst_aac_parse_check_valid_frame:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* @buffer: #GstBuffer. * @buffer: #GstBuffer.
* @framesize: If the buffer contains a valid frame, its size will be put here * @framesize: If the buffer contains a valid frame, its size will be put here
@ -570,7 +571,7 @@ gst_aacparse_detect_stream (GstAacParse * aacparse,
* Returns: TRUE if buffer contains a valid frame. * Returns: TRUE if buffer contains a valid frame.
*/ */
gboolean gboolean
gst_aacparse_check_valid_frame (GstBaseParse * parse, gst_aac_parse_check_valid_frame (GstBaseParse * parse,
GstBaseParseFrame * frame, guint * framesize, gint * skipsize) GstBaseParseFrame * frame, guint * framesize, gint * skipsize)
{ {
const guint8 *data; const guint8 *data;
@ -579,7 +580,7 @@ gst_aacparse_check_valid_frame (GstBaseParse * parse,
gboolean lost_sync; gboolean lost_sync;
GstBuffer *buffer; GstBuffer *buffer;
aacparse = GST_AACPARSE (parse); aacparse = GST_AAC_PARSE (parse);
buffer = frame->buffer; buffer = frame->buffer;
data = GST_BUFFER_DATA (buffer); data = GST_BUFFER_DATA (buffer);
@ -593,13 +594,13 @@ gst_aacparse_check_valid_frame (GstBaseParse * parse,
} else if (aacparse->header_type == DSPAAC_HEADER_NOT_PARSED || lost_sync) { } else if (aacparse->header_type == DSPAAC_HEADER_NOT_PARSED || lost_sync) {
ret = gst_aacparse_detect_stream (aacparse, data, GST_BUFFER_SIZE (buffer), ret = gst_aac_parse_detect_stream (aacparse, data, GST_BUFFER_SIZE (buffer),
GST_BASE_PARSE_DRAINING (parse), framesize, skipsize); GST_BASE_PARSE_DRAINING (parse), framesize, skipsize);
} else if (aacparse->header_type == DSPAAC_HEADER_ADTS) { } else if (aacparse->header_type == DSPAAC_HEADER_ADTS) {
guint needed_data = 1024; guint needed_data = 1024;
ret = gst_aacparse_check_adts_frame (aacparse, data, ret = gst_aac_parse_check_adts_frame (aacparse, data,
GST_BUFFER_SIZE (buffer), GST_BASE_PARSE_DRAINING (parse), GST_BUFFER_SIZE (buffer), GST_BASE_PARSE_DRAINING (parse),
framesize, &needed_data); framesize, &needed_data);
@ -619,7 +620,7 @@ gst_aacparse_check_valid_frame (GstBaseParse * parse,
/** /**
* gst_aacparse_parse_frame: * gst_aac_parse_parse_frame:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* @buffer: #GstBuffer. * @buffer: #GstBuffer.
* *
@ -642,14 +643,14 @@ gst_aacparse_check_valid_frame (GstBaseParse * parse,
* forward. Otherwise appropriate error is returned. * forward. Otherwise appropriate error is returned.
*/ */
GstFlowReturn GstFlowReturn
gst_aacparse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame) gst_aac_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
{ {
GstAacParse *aacparse; GstAacParse *aacparse;
GstBuffer *buffer; GstBuffer *buffer;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
gint rate, channels; gint rate, channels;
aacparse = GST_AACPARSE (parse); aacparse = GST_AAC_PARSE (parse);
buffer = frame->buffer; buffer = frame->buffer;
if (G_UNLIKELY (aacparse->header_type != DSPAAC_HEADER_ADTS)) if (G_UNLIKELY (aacparse->header_type != DSPAAC_HEADER_ADTS))
@ -658,7 +659,7 @@ gst_aacparse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
/* see above */ /* see above */
frame->overhead = 7; frame->overhead = 7;
gst_aacparse_parse_adts_header (aacparse, GST_BUFFER_DATA (buffer), gst_aac_parse_parse_adts_header (aacparse, GST_BUFFER_DATA (buffer),
&rate, &channels, NULL, NULL); &rate, &channels, NULL, NULL);
GST_LOG_OBJECT (aacparse, "rate: %d, chans: %d", rate, channels); GST_LOG_OBJECT (aacparse, "rate: %d, chans: %d", rate, channels);
@ -667,7 +668,7 @@ gst_aacparse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
aacparse->sample_rate = rate; aacparse->sample_rate = rate;
aacparse->channels = channels; aacparse->channels = channels;
if (!gst_aacparse_set_src_caps (aacparse, if (!gst_aac_parse_set_src_caps (aacparse,
GST_PAD_CAPS (GST_BASE_PARSE (aacparse)->sinkpad))) { GST_PAD_CAPS (GST_BASE_PARSE (aacparse)->sinkpad))) {
/* If linking fails, we need to return appropriate error */ /* If linking fails, we need to return appropriate error */
ret = GST_FLOW_NOT_LINKED; ret = GST_FLOW_NOT_LINKED;
@ -682,7 +683,7 @@ gst_aacparse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
/** /**
* gst_aacparse_start: * gst_aac_parse_start:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* *
* Implementation of "start" vmethod in #GstBaseParse class. * Implementation of "start" vmethod in #GstBaseParse class.
@ -690,11 +691,11 @@ gst_aacparse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
* Returns: TRUE if startup succeeded. * Returns: TRUE if startup succeeded.
*/ */
gboolean gboolean
gst_aacparse_start (GstBaseParse * parse) gst_aac_parse_start (GstBaseParse * parse)
{ {
GstAacParse *aacparse; GstAacParse *aacparse;
aacparse = GST_AACPARSE (parse); aacparse = GST_AAC_PARSE (parse);
GST_DEBUG ("start"); GST_DEBUG ("start");
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 1024); gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 1024);
return TRUE; return TRUE;
@ -702,7 +703,7 @@ gst_aacparse_start (GstBaseParse * parse)
/** /**
* gst_aacparse_stop: * gst_aac_parse_stop:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* *
* Implementation of "stop" vmethod in #GstBaseParse class. * Implementation of "stop" vmethod in #GstBaseParse class.
@ -710,7 +711,7 @@ gst_aacparse_start (GstBaseParse * parse)
* Returns: TRUE is stopping succeeded. * Returns: TRUE is stopping succeeded.
*/ */
gboolean gboolean
gst_aacparse_stop (GstBaseParse * parse) gst_aac_parse_stop (GstBaseParse * parse)
{ {
GST_DEBUG ("stop"); GST_DEBUG ("stop");
return TRUE; return TRUE;

28
gst/audioparsers/gstaacparse.h
View file

@ -19,24 +19,24 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GST_AACPARSE_H__ #ifndef __GST_AAC_PARSE_H__
#define __GST_AACPARSE_H__ #define __GST_AAC_PARSE_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbaseparse.h> #include <gst/base/gstbaseparse.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_AACPARSE \ #define GST_TYPE_AAC_PARSE \
(gst_aacparse_get_type()) (gst_aac_parse_get_type())
#define GST_AACPARSE(obj) \ #define GST_AAC_PARSE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AACPARSE, GstAacParse)) (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AAC_PARSE, GstAacParse))
#define GST_AACPARSE_CLASS(klass) \ #define GST_AAC_PARSE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AACPARSE, GstAacParseClass)) (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AAC_PARSE, GstAacParseClass))
#define GST_IS_AACPARSE(obj) \ #define GST_IS_AAC_PARSE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AACPARSE)) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AAC_PARSE))
#define GST_IS_AACPARSE_CLASS(klass) \ #define GST_IS_AAC_PARSE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AACPARSE)) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AAC_PARSE))
/** /**
@ -102,8 +102,8 @@ struct _GstAacParseClass {
GstBaseParseClass parent_class; GstBaseParseClass parent_class;
}; };
GType gst_aacparse_get_type (void); GType gst_aac_parse_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_AACPARSE_H__ */ #endif /* __GST_AAC_PARSE_H__ */

82
gst/audioparsers/gstamrparse.c
View file

@ -57,8 +57,8 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-amr-nb-sh; audio/x-amr-wb-sh")); GST_STATIC_CAPS ("audio/x-amr-nb-sh; audio/x-amr-wb-sh"));
GST_DEBUG_CATEGORY_STATIC (gst_amrparse_debug); GST_DEBUG_CATEGORY_STATIC (amrparse_debug);
#define GST_CAT_DEFAULT gst_amrparse_debug #define GST_CAT_DEFAULT amrparse_debug
static const gint block_size_nb[16] = static const gint block_size_nb[16] =
{ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 }; { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
@ -71,33 +71,33 @@ static const gint block_size_wb[16] =
#define AMR_FRAME_DURATION (GST_SECOND/AMR_FRAMES_PER_SECOND) #define AMR_FRAME_DURATION (GST_SECOND/AMR_FRAMES_PER_SECOND)
#define AMR_MIME_HEADER_SIZE 9 #define AMR_MIME_HEADER_SIZE 9
gboolean gst_amrparse_start (GstBaseParse * parse); gboolean gst_amr_parse_start (GstBaseParse * parse);
gboolean gst_amrparse_stop (GstBaseParse * parse); gboolean gst_amr_parse_stop (GstBaseParse * parse);
static gboolean gst_amrparse_sink_setcaps (GstBaseParse * parse, static gboolean gst_amr_parse_sink_setcaps (GstBaseParse * parse,
GstCaps * caps); GstCaps * caps);
gboolean gst_amrparse_check_valid_frame (GstBaseParse * parse, gboolean gst_amr_parse_check_valid_frame (GstBaseParse * parse,
GstBaseParseFrame * frame, guint * framesize, gint * skipsize); GstBaseParseFrame * frame, guint * framesize, gint * skipsize);
GstFlowReturn gst_amrparse_parse_frame (GstBaseParse * parse, GstFlowReturn gst_amr_parse_parse_frame (GstBaseParse * parse,
GstBaseParseFrame * frame); GstBaseParseFrame * frame);
#define _do_init(bla) \ #define _do_init(bla) \
GST_DEBUG_CATEGORY_INIT (gst_amrparse_debug, "amrparse", 0, \ GST_DEBUG_CATEGORY_INIT (amrparse_debug, "amrparse", 0, \
"AMR-NB audio stream parser"); "AMR-NB audio stream parser");
GST_BOILERPLATE_FULL (GstAmrParse, gst_amrparse, GstBaseParse, GST_BOILERPLATE_FULL (GstAmrParse, gst_amr_parse, GstBaseParse,
GST_TYPE_BASE_PARSE, _do_init); GST_TYPE_BASE_PARSE, _do_init);
/** /**
* gst_amrparse_base_init: * gst_amr_parse_base_init:
* @klass: #GstElementClass. * @klass: #GstElementClass.
* *
*/ */
static void static void
gst_amrparse_base_init (gpointer klass) gst_amr_parse_base_init (gpointer klass)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
@ -114,32 +114,32 @@ gst_amrparse_base_init (gpointer klass)
/** /**
* gst_amrparse_class_init: * gst_amr_parse_class_init:
* @klass: GstAmrParseClass. * @klass: GstAmrParseClass.
* *
*/ */
static void static void
gst_amrparse_class_init (GstAmrParseClass * klass) gst_amr_parse_class_init (GstAmrParseClass * klass)
{ {
GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass); GstBaseParseClass *parse_class = GST_BASE_PARSE_CLASS (klass);
parse_class->start = GST_DEBUG_FUNCPTR (gst_amrparse_start); parse_class->start = GST_DEBUG_FUNCPTR (gst_amr_parse_start);
parse_class->stop = GST_DEBUG_FUNCPTR (gst_amrparse_stop); parse_class->stop = GST_DEBUG_FUNCPTR (gst_amr_parse_stop);
parse_class->set_sink_caps = GST_DEBUG_FUNCPTR (gst_amrparse_sink_setcaps); parse_class->set_sink_caps = GST_DEBUG_FUNCPTR (gst_amr_parse_sink_setcaps);
parse_class->parse_frame = GST_DEBUG_FUNCPTR (gst_amrparse_parse_frame); parse_class->parse_frame = GST_DEBUG_FUNCPTR (gst_amr_parse_parse_frame);
parse_class->check_valid_frame = parse_class->check_valid_frame =
GST_DEBUG_FUNCPTR (gst_amrparse_check_valid_frame); GST_DEBUG_FUNCPTR (gst_amr_parse_check_valid_frame);
} }
/** /**
* gst_amrparse_init: * gst_amr_parse_init:
* @amrparse: #GstAmrParse * @amrparse: #GstAmrParse
* @klass: #GstAmrParseClass. * @klass: #GstAmrParseClass.
* *
*/ */
static void static void
gst_amrparse_init (GstAmrParse * amrparse, GstAmrParseClass * klass) gst_amr_parse_init (GstAmrParse * amrparse, GstAmrParseClass * klass)
{ {
/* init rest */ /* init rest */
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (amrparse), 62); gst_base_parse_set_min_frame_size (GST_BASE_PARSE (amrparse), 62);
@ -149,7 +149,7 @@ gst_amrparse_init (GstAmrParse * amrparse, GstAmrParseClass * klass)
/** /**
* gst_amrparse_set_src_caps: * gst_amr_parse_set_src_caps:
* @amrparse: #GstAmrParse. * @amrparse: #GstAmrParse.
* *
* Set source pad caps according to current knowledge about the * Set source pad caps according to current knowledge about the
@ -158,7 +158,7 @@ gst_amrparse_init (GstAmrParse * amrparse, GstAmrParseClass * klass)
* Returns: TRUE if caps were successfully set. * Returns: TRUE if caps were successfully set.
*/ */
static gboolean static gboolean
gst_amrparse_set_src_caps (GstAmrParse * amrparse) gst_amr_parse_set_src_caps (GstAmrParse * amrparse)
{ {
GstCaps *src_caps = NULL; GstCaps *src_caps = NULL;
gboolean res = FALSE; gboolean res = FALSE;
@ -183,20 +183,20 @@ gst_amrparse_set_src_caps (GstAmrParse * amrparse)
/** /**
* gst_amrparse_sink_setcaps: * gst_amr_parse_sink_setcaps:
* @sinkpad: GstPad * @sinkpad: GstPad
* @caps: GstCaps * @caps: GstCaps
* *
* Returns: TRUE on success. * Returns: TRUE on success.
*/ */
static gboolean static gboolean
gst_amrparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps) gst_amr_parse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
{ {
GstAmrParse *amrparse; GstAmrParse *amrparse;
GstStructure *structure; GstStructure *structure;
const gchar *name; const gchar *name;
amrparse = GST_AMRPARSE (parse); amrparse = GST_AMR_PARSE (parse);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
name = gst_structure_get_name (structure); name = gst_structure_get_name (structure);
@ -215,12 +215,12 @@ gst_amrparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
amrparse->need_header = FALSE; amrparse->need_header = FALSE;
gst_base_parse_set_frame_props (GST_BASE_PARSE (amrparse), 50, 1, 2, 2); gst_base_parse_set_frame_props (GST_BASE_PARSE (amrparse), 50, 1, 2, 2);
gst_amrparse_set_src_caps (amrparse); gst_amr_parse_set_src_caps (amrparse);
return TRUE; return TRUE;
} }
/** /**
* gst_amrparse_parse_header: * gst_amr_parse_parse_header:
* @amrparse: #GstAmrParse * @amrparse: #GstAmrParse
* @data: Header data to be parsed. * @data: Header data to be parsed.
* @skipsize: Output argument where the frame size will be stored. * @skipsize: Output argument where the frame size will be stored.
@ -230,7 +230,7 @@ gst_amrparse_sink_setcaps (GstBaseParse * parse, GstCaps * caps)
* Returns: TRUE on success. * Returns: TRUE on success.
*/ */
static gboolean static gboolean
gst_amrparse_parse_header (GstAmrParse * amrparse, gst_amr_parse_parse_header (GstAmrParse * amrparse,
const guint8 * data, gint * skipsize) const guint8 * data, gint * skipsize)
{ {
GST_DEBUG_OBJECT (amrparse, "Parsing header data"); GST_DEBUG_OBJECT (amrparse, "Parsing header data");
@ -248,13 +248,13 @@ gst_amrparse_parse_header (GstAmrParse * amrparse,
} else } else
return FALSE; return FALSE;
gst_amrparse_set_src_caps (amrparse); gst_amr_parse_set_src_caps (amrparse);
return TRUE; return TRUE;
} }
/** /**
* gst_amrparse_check_valid_frame: * gst_amr_parse_check_valid_frame:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* @buffer: #GstBuffer. * @buffer: #GstBuffer.
* @framesize: Output variable where the found frame size is put. * @framesize: Output variable where the found frame size is put.
@ -266,7 +266,7 @@ gst_amrparse_parse_header (GstAmrParse * amrparse,
* Returns: TRUE if the given data contains valid frame. * Returns: TRUE if the given data contains valid frame.
*/ */
gboolean gboolean
gst_amrparse_check_valid_frame (GstBaseParse * parse, gst_amr_parse_check_valid_frame (GstBaseParse * parse,
GstBaseParseFrame * frame, guint * framesize, gint * skipsize) GstBaseParseFrame * frame, guint * framesize, gint * skipsize)
{ {
GstBuffer *buffer; GstBuffer *buffer;
@ -274,7 +274,7 @@ gst_amrparse_check_valid_frame (GstBaseParse * parse,
gint fsize, mode, dsize; gint fsize, mode, dsize;
GstAmrParse *amrparse; GstAmrParse *amrparse;
amrparse = GST_AMRPARSE (parse); amrparse = GST_AMR_PARSE (parse);
buffer = frame->buffer; buffer = frame->buffer;
data = GST_BUFFER_DATA (buffer); data = GST_BUFFER_DATA (buffer);
dsize = GST_BUFFER_SIZE (buffer); dsize = GST_BUFFER_SIZE (buffer);
@ -283,7 +283,7 @@ gst_amrparse_check_valid_frame (GstBaseParse * parse,
if (amrparse->need_header) { if (amrparse->need_header) {
if (dsize >= AMR_MIME_HEADER_SIZE && if (dsize >= AMR_MIME_HEADER_SIZE &&
gst_amrparse_parse_header (amrparse, data, skipsize)) { gst_amr_parse_parse_header (amrparse, data, skipsize)) {
amrparse->need_header = FALSE; amrparse->need_header = FALSE;
gst_base_parse_set_frame_props (GST_BASE_PARSE (amrparse), 50, 1, 2, 2); gst_base_parse_set_frame_props (GST_BASE_PARSE (amrparse), 50, 1, 2, 2);
} else { } else {
@ -321,7 +321,7 @@ gst_amrparse_check_valid_frame (GstBaseParse * parse,
/** /**
* gst_amrparse_parse_frame: * gst_amr_parse_parse_frame:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* @buffer: #GstBuffer. * @buffer: #GstBuffer.
* *
@ -330,14 +330,14 @@ gst_amrparse_check_valid_frame (GstBaseParse * parse,
* Returns: #GstFlowReturn defining the parsing status. * Returns: #GstFlowReturn defining the parsing status.
*/ */
GstFlowReturn GstFlowReturn
gst_amrparse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame) gst_amr_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
{ {
return GST_FLOW_OK; return GST_FLOW_OK;
} }
/** /**
* gst_amrparse_start: * gst_amr_parse_start:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* *
* Implementation of "start" vmethod in #GstBaseParse class. * Implementation of "start" vmethod in #GstBaseParse class.
@ -345,11 +345,11 @@ gst_amrparse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
* Returns: TRUE on success. * Returns: TRUE on success.
*/ */
gboolean gboolean
gst_amrparse_start (GstBaseParse * parse) gst_amr_parse_start (GstBaseParse * parse)
{ {
GstAmrParse *amrparse; GstAmrParse *amrparse;
amrparse = GST_AMRPARSE (parse); amrparse = GST_AMR_PARSE (parse);
GST_DEBUG ("start"); GST_DEBUG ("start");
amrparse->need_header = TRUE; amrparse->need_header = TRUE;
amrparse->header = 0; amrparse->header = 0;
@ -358,7 +358,7 @@ gst_amrparse_start (GstBaseParse * parse)
/** /**
* gst_amrparse_stop: * gst_amr_parse_stop:
* @parse: #GstBaseParse. * @parse: #GstBaseParse.
* *
* Implementation of "stop" vmethod in #GstBaseParse class. * Implementation of "stop" vmethod in #GstBaseParse class.
@ -366,11 +366,11 @@ gst_amrparse_start (GstBaseParse * parse)
* Returns: TRUE on success. * Returns: TRUE on success.
*/ */
gboolean gboolean
gst_amrparse_stop (GstBaseParse * parse) gst_amr_parse_stop (GstBaseParse * parse)
{ {
GstAmrParse *amrparse; GstAmrParse *amrparse;
amrparse = GST_AMRPARSE (parse); amrparse = GST_AMR_PARSE (parse);
GST_DEBUG ("stop"); GST_DEBUG ("stop");
amrparse->need_header = TRUE; amrparse->need_header = TRUE;
amrparse->header = 0; amrparse->header = 0;

28
gst/audioparsers/gstamrparse.h
View file

@ -20,24 +20,24 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GST_AMRPARSE_H__ #ifndef __GST_AMR_PARSE_H__
#define __GST_AMRPARSE_H__ #define __GST_AMR_PARSE_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbaseparse.h> #include <gst/base/gstbaseparse.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_AMRPARSE \ #define GST_TYPE_AMR_PARSE \
(gst_amrparse_get_type()) (gst_amr_parse_get_type())
#define GST_AMRPARSE(obj) \ #define GST_AMR_PARSE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRPARSE, GstAmrParse)) (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMR_PARSE, GstAmrParse))
#define GST_AMRPARSE_CLASS(klass) \ #define GST_AMR_PARSE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRPARSE, GstAmrParseClass)) (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMR_PARSE, GstAmrParseClass))
#define GST_IS_AMRPARSE(obj) \ #define GST_IS_AMR_PARSE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRPARSE)) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMR_PARSE))
#define GST_IS_AMRPARSE_CLASS(klass) \ #define GST_IS_AMR_PARSE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRPARSE)) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMR_PARSE))
typedef struct _GstAmrParse GstAmrParse; typedef struct _GstAmrParse GstAmrParse;
@ -75,8 +75,8 @@ struct _GstAmrParseClass {
GstBaseParseClass parent_class; GstBaseParseClass parent_class;
}; };
GType gst_amrparse_get_type (void); GType gst_amr_parse_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_AMRPARSE_H__ */ #endif /* __GST_AMR_PARSE_H__ */

4
gst/audioparsers/plugin.c
View file

@ -34,9 +34,9 @@ plugin_init (GstPlugin * plugin)
gboolean ret; gboolean ret;
ret = gst_element_register (plugin, "aacparse", ret = gst_element_register (plugin, "aacparse",
GST_RANK_PRIMARY + 1, GST_TYPE_AACPARSE); GST_RANK_PRIMARY + 1, GST_TYPE_AAC_PARSE);
ret &= gst_element_register (plugin, "amrparse", ret &= gst_element_register (plugin, "amrparse",
GST_RANK_PRIMARY + 1, GST_TYPE_AMRPARSE); GST_RANK_PRIMARY + 1, GST_TYPE_AMR_PARSE);
ret &= gst_element_register (plugin, "ac3parse", ret &= gst_element_register (plugin, "ac3parse",
GST_RANK_PRIMARY + 1, GST_TYPE_AC3_PARSE); GST_RANK_PRIMARY + 1, GST_TYPE_AC3_PARSE);
ret &= gst_element_register (plugin, "dcaparse", ret &= gst_element_register (plugin, "dcaparse",