mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Don't use exported but undeclared core debug category symbols

Browse source 
It's not right and won't work on Windows with MSVC.
This commit is contained in:
Tim-Philipp Müller 2016-02-20 12:59:38 +00:00
parent 154a0430fb
commit 9e00a37d0e
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/libav/gstav.c
View file

@ -35,6 +35,7 @@
#include "gstavutils.h" #include "gstavutils.h"
GST_DEBUG_CATEGORY (ffmpeg_debug); GST_DEBUG_CATEGORY (ffmpeg_debug);
GST_DEBUG_CATEGORY (CAT_PERFORMANCE);
static GMutex gst_avcodec_mutex; static GMutex gst_avcodec_mutex;
@ -135,6 +136,7 @@ static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (ffmpeg_debug, "libav", 0, "libav elements"); GST_DEBUG_CATEGORY_INIT (ffmpeg_debug, "libav", 0, "libav elements");
GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE");
/* Bail if not FFmpeg. We can no longer ensure operation with Libav */ /* Bail if not FFmpeg. We can no longer ensure operation with Libav */
if (!gst_ffmpeg_avcodec_is_ffmpeg ()) { if (!gst_ffmpeg_avcodec_is_ffmpeg ()) {

2
ext/libav/gstav.h
View file

@ -34,6 +34,8 @@
GST_DEBUG_CATEGORY_EXTERN (ffmpeg_debug); GST_DEBUG_CATEGORY_EXTERN (ffmpeg_debug);
#define GST_CAT_DEFAULT ffmpeg_debug #define GST_CAT_DEFAULT ffmpeg_debug
GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE);
G_BEGIN_DECLS G_BEGIN_DECLS
extern gboolean gst_ffmpegdemux_register (GstPlugin * plugin); extern gboolean gst_ffmpegdemux_register (GstPlugin * plugin);

6
ext/libav/gstavauddec.c
View file

@ -36,8 +36,6 @@
#include "gstavutils.h" #include "gstavutils.h"
#include "gstavauddec.h" #include "gstavauddec.h"
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
/* A number of function prototypes are given so we can refer to them later. */ /* A number of function prototypes are given so we can refer to them later. */
static void gst_ffmpegauddec_base_init (GstFFMpegAudDecClass * klass); static void gst_ffmpegauddec_base_init (GstFFMpegAudDecClass * klass);
static void gst_ffmpegauddec_class_init (GstFFMpegAudDecClass * klass); static void gst_ffmpegauddec_class_init (GstFFMpegAudDecClass * klass);
@ -750,7 +748,7 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d", GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d",
ffmpegdec->padded_size); ffmpegdec->padded_size);
} }
GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec, GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Copy input to add padding"); "Copy input to add padding");
memcpy (ffmpegdec->padded, bdata, bsize); memcpy (ffmpegdec->padded, bdata, bsize);
memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
@ -769,7 +767,7 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
if (do_padding) { if (do_padding) {
/* add temporary padding */ /* add temporary padding */
GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec, GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Add temporary input padding"); "Add temporary input padding");
memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE); memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE);
memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);

6
ext/libav/gstavviddec.c
View file

@ -37,8 +37,6 @@
#include "gstavutils.h" #include "gstavutils.h"
#include "gstavviddec.h" #include "gstavviddec.h"
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
#define MAX_TS_MASK 0xff #define MAX_TS_MASK 0xff
#define DEFAULT_LOWRES 0 #define DEFAULT_LOWRES 0
@ -1596,7 +1594,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d", GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d",
ffmpegdec->padded_size); ffmpegdec->padded_size);
} }
GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec, GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Copy input to add padding"); "Copy input to add padding");
memcpy (ffmpegdec->padded, bdata, bsize); memcpy (ffmpegdec->padded, bdata, bsize);
memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
@ -1616,7 +1614,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
if (do_padding) { if (do_padding) {
/* add temporary padding */ /* add temporary padding */
GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, ffmpegdec, GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec,
"Add temporary input padding"); "Add temporary input padding");
memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE); memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE);
memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);