mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: use GST_MEMDUMP

Browse source
This commit is contained in:
Tim-Philipp Müller 2009-06-20 15:41:44 +01:00
parent 0a8f254460
commit ace09d40bd
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/qtdemux/qtdemux.c
View file

@ -64,12 +64,6 @@
GST_DEBUG_CATEGORY (qtdemux_debug); GST_DEBUG_CATEGORY (qtdemux_debug);
#if 0
#define qtdemux_dump_mem(a,b) gst_util_dump_mem(a,b)
#else
#define qtdemux_dump_mem(a,b) /* */
#endif
typedef struct _QtNode QtNode; typedef struct _QtNode QtNode;
typedef struct _QtDemuxSegment QtDemuxSegment; typedef struct _QtDemuxSegment QtDemuxSegment;
typedef struct _QtDemuxSample QtDemuxSample; typedef struct _QtDemuxSample QtDemuxSample;
@ -3098,7 +3092,7 @@ qtdemux_parse_node (GstQTDemux * qtdemux, GNode * node, guint8 * buffer,
buf += 31; buf += 31;
buf += 4; /* and 4 bytes reserved */ buf += 4; /* and 4 bytes reserved */
qtdemux_dump_mem (buf, end - buf); GST_MEMDUMP_OBJECT (qtdemux, "mp4v", buf, end - buf);
qtdemux_parse_container (qtdemux, node, buf, end); qtdemux_parse_container (qtdemux, node, buf, end);
} }
@ -5345,7 +5339,7 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream,
char *codec_name = NULL; char *codec_name = NULL;
GstCaps *caps = NULL; GstCaps *caps = NULL;
qtdemux_dump_mem (ptr, len); GST_MEMDUMP_OBJECT (qtdemux, "esds", ptr, len);
ptr += 8; ptr += 8;
GST_DEBUG_OBJECT (qtdemux, "version/flags = %08x", QT_UINT32 (ptr)); GST_DEBUG_OBJECT (qtdemux, "version/flags = %08x", QT_UINT32 (ptr));
ptr += 4; ptr += 4;
@ -5372,8 +5366,7 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream,
ptr += 13; ptr += 13;
break; break;
case 0x05: case 0x05:
GST_DEBUG_OBJECT (qtdemux, "data:"); GST_MEMDUMP_OBJECT (qtdemux, "data", ptr, len);
qtdemux_dump_mem (ptr, len);
data_ptr = ptr; data_ptr = ptr;
data_len = len; data_len = len;
ptr += len; ptr += len;
@ -5384,6 +5377,7 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream,
break; break;
default: default:
GST_ERROR_OBJECT (qtdemux, "parse error"); GST_ERROR_OBJECT (qtdemux, "parse error");
break;
} }
} }
@ -5494,9 +5488,9 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream,
buffer = gst_buffer_new_and_alloc (data_len); buffer = gst_buffer_new_and_alloc (data_len);
memcpy (GST_BUFFER_DATA (buffer), data_ptr, data_len); memcpy (GST_BUFFER_DATA (buffer), data_ptr, data_len);
qtdemux_dump_mem (GST_BUFFER_DATA (buffer), data_len);
GST_DEBUG_OBJECT (qtdemux, "setting codec_data from esds"); GST_DEBUG_OBJECT (qtdemux, "setting codec_data from esds");
GST_MEMDUMP_OBJECT (qtdemux, "codec_data from esds", data_ptr, data_len);
gst_caps_set_simple (stream->caps, "codec_data", GST_TYPE_BUFFER, gst_caps_set_simple (stream->caps, "codec_data", GST_TYPE_BUFFER,
buffer, NULL); buffer, NULL);

9
gst/qtdemux/qtdemux_dump.c
View file

@ -20,12 +20,6 @@
#include "qtdemux_types.h" #include "qtdemux_types.h"
#include "qtdemux_dump.h" #include "qtdemux_dump.h"
#if 0
#define qtdemux_dump_mem(a,b) gst_util_dump_mem(a,b)
#else
#define qtdemux_dump_mem(a,b) /* */
#endif
void void
qtdemux_dump_mvhd (GstQTDemux * qtdemux, guint8 * buffer, int depth) qtdemux_dump_mvhd (GstQTDemux * qtdemux, guint8 * buffer, int depth)
{ {
@ -400,8 +394,7 @@ qtdemux_dump_unknown (GstQTDemux * qtdemux, guint8 * buffer, int depth)
GST_LOG ("%*s length: %d", depth, "", QT_UINT32 (buffer + 0)); GST_LOG ("%*s length: %d", depth, "", QT_UINT32 (buffer + 0));
len = QT_UINT32 (buffer + 0); len = QT_UINT32 (buffer + 0);
qtdemux_dump_mem (buffer, len); GST_MEMDUMP_OBJECT (qtdemux, "unknown atom data", buffer, len);
} }
static gboolean static gboolean