diff options
| author | David Schleef <ds@schleef.org> | 2011-04-24 19:11:36 -0700 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2011-05-18 12:06:38 -0700 |
| commit | 02daafb9aecd42f3699bd4781de9361fa9f740e7 (patch) | |
| tree | 01a07dd2ca007c64bdabac2a0c9451c8f4382f02 | |
| parent | 38681bf1e0ce3a5b13f999b9cce40534501583e3 (diff) | |
| download | gstreamer-plugins-bad-02daafb9aecd42f3699bd4781de9361fa9f740e7.tar.gz | |
mpegtsmux: use gst debug for tsmux library
| -rw-r--r-- | gst/mpegtsmux/mpegtsmux_aac.c | 1 | ||||
| -rw-r--r-- | gst/mpegtsmux/mpegtsmux_h264.c | 1 | ||||
| -rw-r--r-- | gst/mpegtsmux/tsmux/tsmux.c | 2 | ||||
| -rw-r--r-- | gst/mpegtsmux/tsmux/tsmuxcommon.h | 10 | ||||
| -rw-r--r-- | gst/mpegtsmux/tsmux/tsmuxstream.c | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/gst/mpegtsmux/mpegtsmux_aac.c b/gst/mpegtsmux/mpegtsmux_aac.c index 5afefc834..c4336641d 100644 --- a/gst/mpegtsmux/mpegtsmux_aac.c +++ b/gst/mpegtsmux/mpegtsmux_aac.c @@ -87,7 +87,6 @@ #include "mpegtsmux_aac.h" #include <string.h> -GST_DEBUG_CATEGORY_EXTERN (mpegtsmux_debug); #define GST_CAT_DEFAULT mpegtsmux_debug GstBuffer * diff --git a/gst/mpegtsmux/mpegtsmux_h264.c b/gst/mpegtsmux/mpegtsmux_h264.c index 7188ce7c0..bdf7f2f0b 100644 --- a/gst/mpegtsmux/mpegtsmux_h264.c +++ b/gst/mpegtsmux/mpegtsmux_h264.c @@ -87,7 +87,6 @@ #include "mpegtsmux_h264.h" #include <string.h> -GST_DEBUG_CATEGORY_EXTERN (mpegtsmux_debug); #define GST_CAT_DEFAULT mpegtsmux_debug #define SPS_PPS_PERIOD GST_SECOND diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c index e16019702..72095d0ce 100644 --- a/gst/mpegtsmux/tsmux/tsmux.c +++ b/gst/mpegtsmux/tsmux/tsmux.c @@ -87,6 +87,8 @@ #include "tsmuxstream.h" #include "crc.h" +#define GST_CAT_DEFAULT mpegtsmux_debug + /* 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, * then finally a 32 bit CRC. Thus the maximum number of programs in this mux diff --git a/gst/mpegtsmux/tsmux/tsmuxcommon.h b/gst/mpegtsmux/tsmux/tsmuxcommon.h index 4bc7304cd..9657b30c8 100644 --- a/gst/mpegtsmux/tsmux/tsmuxcommon.h +++ b/gst/mpegtsmux/tsmux/tsmuxcommon.h @@ -81,8 +81,7 @@ #define __TSMUX_COMMON_H__ #include <glib.h> - -#undef TS_DEBUG_ON +#include <gst/gst.h> G_BEGIN_DECLS @@ -169,11 +168,8 @@ tsmux_put_ts (guint8 **pos, guint8 id, gint64 ts) tsmux_put16 (pos, ((ts << 1) & 0xfffe) | 0x01); } -#ifdef TS_DEBUG_ON -#define TS_DEBUG(...) g_print(__VA_ARGS__); g_print ("\n") -#else -#define TS_DEBUG(...) -#endif +GST_DEBUG_CATEGORY_EXTERN (mpegtsmux_debug); +#define TS_DEBUG GST_DEBUG G_END_DECLS diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.c b/gst/mpegtsmux/tsmux/tsmuxstream.c index f147bfcdb..28112e134 100644 --- a/gst/mpegtsmux/tsmux/tsmuxstream.c +++ b/gst/mpegtsmux/tsmux/tsmuxstream.c @@ -86,6 +86,8 @@ #include "tsmuxcommon.h" #include "tsmuxstream.h" +#define GST_CAT_DEFAULT mpegtsmux_debug + static guint8 tsmux_stream_pes_header_length (TsMuxStream * stream); static void tsmux_stream_write_pes_header (TsMuxStream * stream, guint8 * data); static void tsmux_stream_find_pts_dts_within (TsMuxStream * stream, guint bound, |