Attachment 73174 Details for Bug 56206 – Add new property "thread-types" for decoding method.

[patch] Add new property "thread-types" for decoding method.

0002-Add-thread-types-property.patch (text/plain), 3.96 KB, created by Mario Kleiner on 2013-01-17 00:39:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Kleiner

Created: 2013-01-17 00:39:23 UTC

Size: 3.96 KB

patch

obsolete

>From 51cee3b3396509cf36247c32c308af75e1075b07 Mon Sep 17 00:00:00 2001
>From: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
>Date: Wed, 16 Jan 2013 05:11:53 +0100
>Subject: [PATCH 2/2] Add "thread-types" property.
>
>Allows selection of threaded decode method (slice / frame threading),
>defaults to slice threading only, as in the past.
>---
> ext/ffmpeg/gstffmpegdec.c |   41 ++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 40 insertions(+), 1 deletions(-)
>
>diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
>index 159c8f0..bc46cc3 100644
>--- a/ext/ffmpeg/gstffmpegdec.c
>+++ b/ext/ffmpeg/gstffmpegdec.c
>@@ -122,6 +122,7 @@ struct _GstFFMpegDec
>   gboolean debug_mv;
>   gboolean crop;
>   int max_threads;
>+  int thread_types;
> 
>   /* QoS stuff *//* with LOCK */
>   gdouble proportion;
>@@ -198,6 +199,7 @@ gst_ts_info_get (GstFFMpegDec * dec, gint idx)
> #define DEFAULT_DEBUG_MV		FALSE
> #define DEFAULT_CROP			TRUE
> #define DEFAULT_MAX_THREADS		1
>+#define DEFAULT_THREAD_TYPES		FF_THREAD_SLICE
> 
> enum
> {
>@@ -209,6 +211,7 @@ enum
>   PROP_DEBUG_MV,
>   PROP_CROP,
>   PROP_MAX_THREADS,
>+  PROP_THREAD_TYPES,
>   PROP_LAST
> };
> 
>@@ -291,6 +294,28 @@ gst_ffmpegdec_skipframe_get_type (void)
>   return ffmpegdec_skipframe_type;
> }
> 
>+#define GST_FFMPEGDEC_TYPE_THREAD_TYPES (gst_ffmpegdec_thread_types_get_type())
>+static GType
>+gst_ffmpegdec_thread_types_get_type (void)
>+{
>+  static GType ffmpegdec_thread_types_type = 0;
>+
>+  if (!ffmpegdec_thread_types_type) {
>+    static const GEnumValue ffmpegdec_thread_types[] = {
>+      {FF_THREAD_FRAME, "1", "Frame"},
>+      {FF_THREAD_SLICE, "2", "Slice"},
>+      {FF_THREAD_FRAME | FF_THREAD_SLICE, "3", "Frame + Slice"},
>+      {0, NULL, NULL},
>+    };
>+
>+    ffmpegdec_thread_types_type =
>+        g_enum_register_static ("GstFFMpegDecThreadTypes",
>+        ffmpegdec_thread_types);
>+  }
>+
>+  return ffmpegdec_thread_types_type;
>+}
>+
> static void
> gst_ffmpegdec_base_init (GstFFMpegDecClass * klass)
> {
>@@ -400,6 +425,13 @@ gst_ffmpegdec_class_init (GstFFMpegDecClass * klass)
>               "Maximum number of worker threads to spawn. (0 = auto)",
>               0, G_MAXINT, DEFAULT_MAX_THREADS,
>               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
>+      g_object_class_install_property (G_OBJECT_CLASS (klass),
>+          PROP_THREAD_TYPES,
>+          g_param_spec_enum ("thread-types",
>+              "Thread Types",
>+              "Which threaded decoding methods are allowed",
>+              GST_FFMPEGDEC_TYPE_THREAD_TYPES, DEFAULT_THREAD_TYPES,
>+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
>     }
>   }
> 
>@@ -445,6 +477,7 @@ gst_ffmpegdec_init (GstFFMpegDec * ffmpegdec)
>   ffmpegdec->debug_mv = DEFAULT_DEBUG_MV;
>   ffmpegdec->crop = DEFAULT_CROP;
>   ffmpegdec->max_threads = DEFAULT_MAX_THREADS;
>+  ffmpegdec->thread_types = DEFAULT_THREAD_TYPES;
> 
>   ffmpegdec->format.video.par_n = -1;
>   ffmpegdec->format.video.fps_n = -1;
>@@ -892,7 +925,7 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
>   } else
>     ffmpegdec->context->thread_count = ffmpegdec->max_threads;
> 
>-  ffmpegdec->context->thread_type = FF_THREAD_SLICE;
>+  ffmpegdec->context->thread_type = ffmpegdec->thread_types;
> 
>   /* open codec - we don't select an output pix_fmt yet,
>    * simply because we don't know! We only get it
>@@ -2887,6 +2920,9 @@ gst_ffmpegdec_set_property (GObject * object,
>     case PROP_MAX_THREADS:
>       ffmpegdec->max_threads = g_value_get_int (value);
>       break;
>+    case PROP_THREAD_TYPES:
>+      ffmpegdec->thread_types = g_value_get_enum (value);
>+      break;
>     default:
>       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
>       break;
>@@ -2921,6 +2957,9 @@ gst_ffmpegdec_get_property (GObject * object,
>     case PROP_MAX_THREADS:
>       g_value_set_int (value, ffmpegdec->max_threads);
>       break;
>+    case PROP_THREAD_TYPES:
>+      g_value_set_enum (value, ffmpegdec->thread_types);
>+      break;
>     default:
>       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
>       break;
>-- 
>1.7.7.5 (Apple Git-26)
>

Actions: View | Splinter Review

Attachments on bug 56206: 73172 | 73174 | 73197

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.