mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

avviddec: deprecated debug-mv property to match deprecation in FFmpeg

Browse source 
This has been unimplemented and non-functional for years
and was deprecated with FFmpeg 4.4.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/126>
This commit is contained in:
Tim-Philipp Müller 2021-04-13 00:45:41 +01:00 committed by GStreamer Marge Bot
parent 07b43c727c
commit 672f1caf85
3 changed files with 226 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

430
docs/gst_plugins_cache.json
View file

File diff suppressed because it is too large Load diff

22
ext/libav/gstavviddec.c
View file

@ -40,7 +40,6 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
#define DEFAULT_LOWRES 0 #define DEFAULT_LOWRES 0
#define DEFAULT_SKIPFRAME 0 #define DEFAULT_SKIPFRAME 0
#define DEFAULT_DIRECT_RENDERING TRUE #define DEFAULT_DIRECT_RENDERING TRUE
#define DEFAULT_DEBUG_MV FALSE
#define DEFAULT_MAX_THREADS 0 #define DEFAULT_MAX_THREADS 0
#define DEFAULT_OUTPUT_CORRUPT TRUE #define DEFAULT_OUTPUT_CORRUPT TRUE
#define REQUIRED_POOL_MAX_BUFFERS 32 #define REQUIRED_POOL_MAX_BUFFERS 32
@ -266,10 +265,13 @@ gst_ffmpegviddec_class_init (GstFFMpegVidDecClass * klass)
g_param_spec_boolean ("direct-rendering", "Direct Rendering", g_param_spec_boolean ("direct-rendering", "Direct Rendering",
"Enable direct rendering", DEFAULT_DIRECT_RENDERING, "Enable direct rendering", DEFAULT_DIRECT_RENDERING,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#ifndef GST_REMOVE_DEPRECATED
g_object_class_install_property (gobject_class, PROP_DEBUG_MV, g_object_class_install_property (gobject_class, PROP_DEBUG_MV,
g_param_spec_boolean ("debug-mv", "Debug motion vectors", g_param_spec_boolean ("debug-mv", "Debug motion vectors",
"Whether libav should print motion vectors on top of the image", "Whether to print motion vectors on top of the image "
DEFAULT_DEBUG_MV, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); "(deprecated, non-functional)", FALSE,
G_PARAM_DEPRECATED | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#endif
g_object_class_install_property (gobject_class, PROP_OUTPUT_CORRUPT, g_object_class_install_property (gobject_class, PROP_OUTPUT_CORRUPT,
g_param_spec_boolean ("output-corrupt", "Output corrupt buffers", g_param_spec_boolean ("output-corrupt", "Output corrupt buffers",
"Whether libav should output frames even if corrupted", "Whether libav should output frames even if corrupted",
@ -319,7 +321,6 @@ gst_ffmpegviddec_init (GstFFMpegVidDec * ffmpegdec)
ffmpegdec->opened = FALSE; ffmpegdec->opened = FALSE;
ffmpegdec->skip_frame = ffmpegdec->lowres = 0; ffmpegdec->skip_frame = ffmpegdec->lowres = 0;
ffmpegdec->direct_rendering = DEFAULT_DIRECT_RENDERING; ffmpegdec->direct_rendering = DEFAULT_DIRECT_RENDERING;
ffmpegdec->debug_mv = DEFAULT_DEBUG_MV;
ffmpegdec->max_threads = DEFAULT_MAX_THREADS; ffmpegdec->max_threads = DEFAULT_MAX_THREADS;
ffmpegdec->output_corrupt = DEFAULT_OUTPUT_CORRUPT; ffmpegdec->output_corrupt = DEFAULT_OUTPUT_CORRUPT;
ffmpegdec->thread_type = DEFAULT_THREAD_TYPE; ffmpegdec->thread_type = DEFAULT_THREAD_TYPE;
@ -537,10 +538,6 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
ffmpegdec->context->lowres = ffmpegdec->lowres; ffmpegdec->context->lowres = ffmpegdec->lowres;
ffmpegdec->context->skip_frame = ffmpegdec->skip_frame; ffmpegdec->context->skip_frame = ffmpegdec->skip_frame;
/* ffmpeg can draw motion vectors on top of the image (not every decoder
* supports it) */
ffmpegdec->context->debug_mv = ffmpegdec->debug_mv;
if (ffmpegdec->thread_type) { if (ffmpegdec->thread_type) {
GST_DEBUG_OBJECT (ffmpegdec, "Use requested thread type 0x%x", GST_DEBUG_OBJECT (ffmpegdec, "Use requested thread type 0x%x",
ffmpegdec->thread_type); ffmpegdec->thread_type);
@ -2298,10 +2295,11 @@ gst_ffmpegviddec_set_property (GObject * object,
case PROP_DIRECT_RENDERING: case PROP_DIRECT_RENDERING:
ffmpegdec->direct_rendering = g_value_get_boolean (value); ffmpegdec->direct_rendering = g_value_get_boolean (value);
break; break;
#ifndef GST_REMOVE_DEPRECATED
case PROP_DEBUG_MV: case PROP_DEBUG_MV:
ffmpegdec->debug_mv = ffmpegdec->context->debug_mv = /* non-functional */
g_value_get_boolean (value);
break; break;
#endif
case PROP_MAX_THREADS: case PROP_MAX_THREADS:
ffmpegdec->max_threads = g_value_get_int (value); ffmpegdec->max_threads = g_value_get_int (value);
break; break;
@ -2333,9 +2331,11 @@ gst_ffmpegviddec_get_property (GObject * object,
case PROP_DIRECT_RENDERING: case PROP_DIRECT_RENDERING:
g_value_set_boolean (value, ffmpegdec->direct_rendering); g_value_set_boolean (value, ffmpegdec->direct_rendering);
break; break;
#ifndef GST_REMOVE_DEPRECATED
case PROP_DEBUG_MV: case PROP_DEBUG_MV:
g_value_set_boolean (value, ffmpegdec->context->debug_mv); g_value_set_boolean (value, FALSE);
break; break;
#endif
case PROP_MAX_THREADS: case PROP_MAX_THREADS:
g_value_set_int (value, ffmpegdec->max_threads); g_value_set_int (value, ffmpegdec->max_threads);
break; break;

1
ext/libav/gstavviddec.h
View file

@ -66,7 +66,6 @@ struct _GstFFMpegVidDec
enum AVDiscard skip_frame; enum AVDiscard skip_frame;
gint lowres; gint lowres;
gboolean direct_rendering; gboolean direct_rendering;
gboolean debug_mv;
int max_threads; int max_threads;
gboolean output_corrupt; gboolean output_corrupt;
guint thread_type; guint thread_type;