qtdemux: Apply qtdemux debug category to gstisoff

.. instead of the use of default debug category.
And, make new header to declare the debug category

https://bugzilla.gnome.org/show_bug.cgi?id=791483
This commit is contained in:
Seungha Yang 2017-12-12 00:11:24 +09:00 committed by Tim-Philipp Müller
parent ddd4fe680f
commit 1551759cec
8 changed files with 26 additions and 4 deletions

View file

@ -24,6 +24,7 @@ noinst_HEADERS = \
qtatomparser.h \ qtatomparser.h \
qtdemux.h \ qtdemux.h \
qtdemux_types.h \ qtdemux_types.h \
qtdemux_debug.h \
qtdemux_dump.h \ qtdemux_dump.h \
qtdemux_lang.h \ qtdemux_lang.h \
qtpalette.h \ qtpalette.h \

View file

@ -22,9 +22,12 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "qtdemux_debug.h"
#include "gstisoff.h" #include "gstisoff.h"
#include <gst/base/gstbytereader.h> #include <gst/base/gstbytereader.h>
#define GST_CAT_DEFAULT qtdemux_debug
void void
gst_isoff_qt_sidx_parser_init (GstSidxParser * parser) gst_isoff_qt_sidx_parser_init (GstSidxParser * parser)
{ {

View file

@ -101,6 +101,7 @@
#define ABSDIFF(x, y) ( (x) > (y) ? ((x) - (y)) : ((y) - (x)) ) #define ABSDIFF(x, y) ( (x) > (y) ? ((x) - (y)) : ((y) - (x)) )
GST_DEBUG_CATEGORY (qtdemux_debug); GST_DEBUG_CATEGORY (qtdemux_debug);
#define GST_CAT_DEFAULT qtdemux_debug
typedef struct _QtDemuxSegment QtDemuxSegment; typedef struct _QtDemuxSegment QtDemuxSegment;
typedef struct _QtDemuxSample QtDemuxSample; typedef struct _QtDemuxSample QtDemuxSample;

View file

@ -28,9 +28,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (qtdemux_debug);
#define GST_CAT_DEFAULT qtdemux_debug
#define GST_TYPE_QTDEMUX \ #define GST_TYPE_QTDEMUX \
(gst_qtdemux_get_type()) (gst_qtdemux_get_type())
#define GST_QTDEMUX(obj) \ #define GST_QTDEMUX(obj) \

View file

@ -0,0 +1,12 @@
#ifndef __GST_QTDEMUX_DEBUG_H__
#define __GST_QTDEMUX_DEBUG_H__
#include <gst/gst.h>
G_BEGIN_DECLS
GST_DEBUG_CATEGORY_EXTERN (qtdemux_debug);
G_END_DECLS
#endif /* __GST_QTDEMUX_DEBUG_H__ */

View file

@ -19,6 +19,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "qtdemux_debug.h"
#include "qtdemux_types.h" #include "qtdemux_types.h"
#include "qtdemux_dump.h" #include "qtdemux_dump.h"
#include "fourcc.h" #include "fourcc.h"
@ -27,6 +28,8 @@
#include <string.h> #include <string.h>
#define GST_CAT_DEFAULT qtdemux_debug
#define GET_UINT8(data) gst_byte_reader_get_uint8_unchecked(data) #define GET_UINT8(data) gst_byte_reader_get_uint8_unchecked(data)
#define GET_UINT16(data) gst_byte_reader_get_uint16_be_unchecked(data) #define GET_UINT16(data) gst_byte_reader_get_uint16_be_unchecked(data)
#define GET_UINT32(data) gst_byte_reader_get_uint32_be_unchecked(data) #define GET_UINT32(data) gst_byte_reader_get_uint32_be_unchecked(data)

View file

@ -17,11 +17,13 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "qtdemux.h" #include "qtdemux_debug.h"
#include "qtdemux_lang.h" #include "qtdemux_lang.h"
#include <string.h> #include <string.h>
#define GST_CAT_DEFAULT qtdemux_debug
/* http://developer.apple.com/mac/library/documentation/QuickTime/QTFF/QTFFChap4/qtff4.html */ /* http://developer.apple.com/mac/library/documentation/QuickTime/QTFF/QTFFChap4/qtff4.html */
static const gchar qt_lang_map[][4] = { static const gchar qt_lang_map[][4] = {

View file

@ -17,10 +17,13 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "qtdemux_debug.h"
#include "qtdemux_types.h" #include "qtdemux_types.h"
#include "qtdemux_dump.h" #include "qtdemux_dump.h"
#include "fourcc.h" #include "fourcc.h"
#define GST_CAT_DEFAULT qtdemux_debug
static const QtNodeType qt_node_types[] = { static const QtNodeType qt_node_types[] = {
{FOURCC_moov, "movie", QT_FLAG_CONTAINER,}, {FOURCC_moov, "movie", QT_FLAG_CONTAINER,},
{FOURCC_mvhd, "movie header", 0, {FOURCC_mvhd, "movie header", 0,