qtmux: deprecate dts-method property

This commit is contained in:
David Schleef 2013-03-22 13:24:33 -07:00
parent ee56a7cb99
commit 6571e388be
2 changed files with 17 additions and 2 deletions

View file

@ -143,6 +143,7 @@
GST_DEBUG_CATEGORY_STATIC (gst_qt_mux_debug); GST_DEBUG_CATEGORY_STATIC (gst_qt_mux_debug);
#define GST_CAT_DEFAULT gst_qt_mux_debug #define GST_CAT_DEFAULT gst_qt_mux_debug
#ifndef GST_REMOVE_DEPRECATED
enum enum
{ {
DTS_METHOD_DD, DTS_METHOD_DD,
@ -172,6 +173,7 @@ gst_qt_mux_dts_method_get_type (void)
#define GST_TYPE_QT_MUX_DTS_METHOD \ #define GST_TYPE_QT_MUX_DTS_METHOD \
(gst_qt_mux_dts_method_get_type ()) (gst_qt_mux_dts_method_get_type ())
#endif
/* QTMux signals and args */ /* QTMux signals and args */
enum enum
@ -190,7 +192,9 @@ enum
PROP_MOOV_RECOV_FILE, PROP_MOOV_RECOV_FILE,
PROP_FRAGMENT_DURATION, PROP_FRAGMENT_DURATION,
PROP_STREAMABLE, PROP_STREAMABLE,
#ifndef GST_REMOVE_DEPRECATED
PROP_DTS_METHOD, PROP_DTS_METHOD,
#endif
PROP_DO_CTTS, PROP_DO_CTTS,
}; };
@ -206,7 +210,9 @@ enum
#define DEFAULT_MOOV_RECOV_FILE NULL #define DEFAULT_MOOV_RECOV_FILE NULL
#define DEFAULT_FRAGMENT_DURATION 0 #define DEFAULT_FRAGMENT_DURATION 0
#define DEFAULT_STREAMABLE FALSE #define DEFAULT_STREAMABLE FALSE
#ifndef GST_REMOVE_DEPRECATED
#define DEFAULT_DTS_METHOD DTS_METHOD_REORDER #define DEFAULT_DTS_METHOD DTS_METHOD_REORDER
#endif
static void gst_qt_mux_finalize (GObject * object); static void gst_qt_mux_finalize (GObject * object);
@ -311,11 +317,14 @@ gst_qt_mux_class_init (GstQTMuxClass * klass)
"Calculate and include presentation/composition time " "Calculate and include presentation/composition time "
"(in addition to decoding time)", DEFAULT_DO_CTTS, "(in addition to decoding time)", DEFAULT_DO_CTTS,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
#ifndef GST_REMOVE_DEPRECATED
g_object_class_install_property (gobject_class, PROP_DTS_METHOD, g_object_class_install_property (gobject_class, PROP_DTS_METHOD,
g_param_spec_enum ("dts-method", "dts-method", g_param_spec_enum ("dts-method", "dts-method",
"Method to determine DTS time", "(DEPRECATED) Method to determine DTS time",
GST_TYPE_QT_MUX_DTS_METHOD, DEFAULT_DTS_METHOD, GST_TYPE_QT_MUX_DTS_METHOD, DEFAULT_DTS_METHOD,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); G_PARAM_DEPRECATED | G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS));
#endif
g_object_class_install_property (gobject_class, PROP_FAST_START, g_object_class_install_property (gobject_class, PROP_FAST_START,
g_param_spec_boolean ("faststart", "Format file to faststart", g_param_spec_boolean ("faststart", "Format file to faststart",
"If the file should be formatted for faststart (headers first)", "If the file should be formatted for faststart (headers first)",
@ -3276,9 +3285,11 @@ gst_qt_mux_get_property (GObject * object,
case PROP_DO_CTTS: case PROP_DO_CTTS:
g_value_set_boolean (value, qtmux->guess_pts); g_value_set_boolean (value, qtmux->guess_pts);
break; break;
#ifndef GST_REMOVE_DEPRECATED
case PROP_DTS_METHOD: case PROP_DTS_METHOD:
g_value_set_enum (value, qtmux->dts_method); g_value_set_enum (value, qtmux->dts_method);
break; break;
#endif
case PROP_FAST_START: case PROP_FAST_START:
g_value_set_boolean (value, qtmux->fast_start); g_value_set_boolean (value, qtmux->fast_start);
break; break;
@ -3331,9 +3342,11 @@ gst_qt_mux_set_property (GObject * object,
case PROP_DO_CTTS: case PROP_DO_CTTS:
qtmux->guess_pts = g_value_get_boolean (value); qtmux->guess_pts = g_value_get_boolean (value);
break; break;
#ifndef GST_REMOVE_DEPRECATED
case PROP_DTS_METHOD: case PROP_DTS_METHOD:
qtmux->dts_method = g_value_get_enum (value); qtmux->dts_method = g_value_get_enum (value);
break; break;
#endif
case PROP_FAST_START: case PROP_FAST_START:
qtmux->fast_start = g_value_get_boolean (value); qtmux->fast_start = g_value_get_boolean (value);
break; break;

View file

@ -183,7 +183,9 @@ struct _GstQTMux
AtomsTreeFlavor flavor; AtomsTreeFlavor flavor;
gboolean fast_start; gboolean fast_start;
gboolean guess_pts; gboolean guess_pts;
#ifndef GST_REMOVE_DEPRECATED
gint dts_method; gint dts_method;
#endif
gchar *fast_start_file_path; gchar *fast_start_file_path;
gchar *moov_recov_file_path; gchar *moov_recov_file_path;
guint32 fragment_duration; guint32 fragment_duration;