mpegtsmux: use gst debug for tsmux library

This commit is contained in:
David Schleef 2011-04-24 19:11:36 -07:00
parent 38681bf1e0
commit 02daafb9ae
5 changed files with 7 additions and 9 deletions

View File

@ -87,7 +87,6 @@
#include "mpegtsmux_aac.h" #include "mpegtsmux_aac.h"
#include <string.h> #include <string.h>
GST_DEBUG_CATEGORY_EXTERN (mpegtsmux_debug);
#define GST_CAT_DEFAULT mpegtsmux_debug #define GST_CAT_DEFAULT mpegtsmux_debug
GstBuffer * GstBuffer *

View File

@ -87,7 +87,6 @@
#include "mpegtsmux_h264.h" #include "mpegtsmux_h264.h"
#include <string.h> #include <string.h>
GST_DEBUG_CATEGORY_EXTERN (mpegtsmux_debug);
#define GST_CAT_DEFAULT mpegtsmux_debug #define GST_CAT_DEFAULT mpegtsmux_debug
#define SPS_PPS_PERIOD GST_SECOND #define SPS_PPS_PERIOD GST_SECOND

View File

@ -87,6 +87,8 @@
#include "tsmuxstream.h" #include "tsmuxstream.h"
#include "crc.h" #include "crc.h"
#define GST_CAT_DEFAULT mpegtsmux_debug
/* Maximum total data length for a PAT section is 1024 bytes, minus an /* Maximum total data length for a PAT section is 1024 bytes, minus an
* 8 byte header, then the length of each program entry is 32 bits, * 8 byte header, then the length of each program entry is 32 bits,
* then finally a 32 bit CRC. Thus the maximum number of programs in this mux * then finally a 32 bit CRC. Thus the maximum number of programs in this mux

View File

@ -81,8 +81,7 @@
#define __TSMUX_COMMON_H__ #define __TSMUX_COMMON_H__
#include <glib.h> #include <glib.h>
#include <gst/gst.h>
#undef TS_DEBUG_ON
G_BEGIN_DECLS G_BEGIN_DECLS
@ -169,11 +168,8 @@ tsmux_put_ts (guint8 **pos, guint8 id, gint64 ts)
tsmux_put16 (pos, ((ts << 1) & 0xfffe) | 0x01); tsmux_put16 (pos, ((ts << 1) & 0xfffe) | 0x01);
} }
#ifdef TS_DEBUG_ON GST_DEBUG_CATEGORY_EXTERN (mpegtsmux_debug);
#define TS_DEBUG(...) g_print(__VA_ARGS__); g_print ("\n") #define TS_DEBUG GST_DEBUG
#else
#define TS_DEBUG(...)
#endif
G_END_DECLS G_END_DECLS

View File

@ -86,6 +86,8 @@
#include "tsmuxcommon.h" #include "tsmuxcommon.h"
#include "tsmuxstream.h" #include "tsmuxstream.h"
#define GST_CAT_DEFAULT mpegtsmux_debug
static guint8 tsmux_stream_pes_header_length (TsMuxStream * stream); static guint8 tsmux_stream_pes_header_length (TsMuxStream * stream);
static void tsmux_stream_write_pes_header (TsMuxStream * stream, guint8 * data); static void tsmux_stream_write_pes_header (TsMuxStream * stream, guint8 * data);
static void tsmux_stream_find_pts_dts_within (TsMuxStream * stream, guint bound, static void tsmux_stream_find_pts_dts_within (TsMuxStream * stream, guint bound,