mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

aiffparse: misc code cleanups

Browse source 
Fix the launch examples for 1.0. Turn more logging into _OBJECT variants.
This commit is contained in:
Stefan Sauer 2014-01-09 08:18:07 +01:00
parent 3d2f3bcf62
commit dc2778734b
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/aiff/aiffparse.c
View file

@ -29,8 +29,8 @@
* Parse a .aiff file into raw or compressed audio. * Parse a .aiff file into raw or compressed audio.
* </para> * </para>
* <para> * <para>
* AIFFparse supports both push and pull mode operations, making it possible to * The aiffparse element supports both push and pull mode operations, making it
* stream from a network source. * possible to stream from a network source.
* </para> * </para>
* <title>Example launch line</title> * <title>Example launch line</title>
* <para> * <para>
@ -42,7 +42,7 @@
* </para> * </para>
* <para> * <para>
* <programlisting> * <programlisting>
* gst-launch gnomevfssrc location=http://www.example.org/sine.aiff ! queue ! aiffparse ! audioconvert ! alsasink * gst-launch souphhtpsrc location=http://www.example.org/sine.aiff ! queue ! aiffparse ! audioconvert ! alsasink
* </programlisting> * </programlisting>
* Stream data from a network url. * Stream data from a network url.
* </para> * </para>
@ -549,7 +549,8 @@ gst_aiff_parse_peek_chunk_info (GstAiffParse * aiff, guint32 * tag,
*size = GST_READ_UINT32_BE (data + 4); *size = GST_READ_UINT32_BE (data + 4);
gst_adapter_unmap (aiff->adapter); gst_adapter_unmap (aiff->adapter);
GST_DEBUG ("Next chunk size is %d bytes, type %" GST_FOURCC_FORMAT, *size, GST_DEBUG_OBJECT (aiff,
"Next chunk size is %d bytes, type %" GST_FOURCC_FORMAT, *size,
GST_FOURCC_ARGS (*tag)); GST_FOURCC_ARGS (*tag));
return TRUE; return TRUE;
@ -574,14 +575,14 @@ gst_aiff_parse_peek_chunk (GstAiffParse * aiff, guint32 * tag, guint32 * size)
if (!gst_aiff_parse_peek_chunk_info (aiff, tag, size)) if (!gst_aiff_parse_peek_chunk_info (aiff, tag, size))
return FALSE; return FALSE;
GST_DEBUG ("Need to peek chunk of %d bytes", *size); GST_DEBUG_OBJECT (aiff, "Need to peek chunk of %d bytes", *size);
peek_size = (*size + 1) & ~1; peek_size = (*size + 1) & ~1;
available = gst_adapter_available (aiff->adapter); available = gst_adapter_available (aiff->adapter);
if (available >= (8 + peek_size)) { if (available >= (8 + peek_size)) {
return TRUE; return TRUE;
} else { } else {
GST_LOG ("but only %u bytes available now", available); GST_LOG_OBJECT (aiff, "but only %u bytes available now", available);
return FALSE; return FALSE;
} }
} }
@ -631,7 +632,7 @@ gst_aiff_parse_ignore_chunk (GstAiffParse * aiff, guint32 tag, guint32 size)
if (!gst_aiff_parse_peek_chunk (aiff, &tag, &size)) if (!gst_aiff_parse_peek_chunk (aiff, &tag, &size))
return; return;
} }
GST_DEBUG_OBJECT (aiff, "Ignoring tag %" GST_FOURCC_FORMAT, GST_WARNING_OBJECT (aiff, "Ignoring tag %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (tag)); GST_FOURCC_ARGS (tag));
flush = 8 + ((size + 1) & ~1); flush = 8 + ((size + 1) & ~1);
aiff->offset += flush; aiff->offset += flush;
@ -1140,7 +1141,7 @@ gst_aiff_parse_parse_stream_init (GstAiffParse * aiff)
/* _take flushes the data */ /* _take flushes the data */
tmp = gst_adapter_take_buffer (aiff->adapter, 12); tmp = gst_adapter_take_buffer (aiff->adapter, 12);
GST_DEBUG ("Parsing aiff header"); GST_DEBUG_OBJECT (aiff, "Parsing aiff header");
if (!gst_aiff_parse_parse_file_header (aiff, tmp)) if (!gst_aiff_parse_parse_file_header (aiff, tmp))
return GST_FLOW_ERROR; return GST_FLOW_ERROR;