mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

openh264: fix up for API changes in v1.6.0

Browse source 
Update for API changes in v1.6.0.

https://bugzilla.gnome.org/show_bug.cgi?id=768771
This commit is contained in:
Tim-Philipp Müller 2016-07-18 18:36:42 +01:00
parent c593e0a17f
commit 9f2dfaaa7a
3 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/openh264/gstopenh264dec.cpp
View file

@ -125,7 +125,9 @@ gst_openh264dec_start (GstVideoDecoder * decoder)
dec_param.uiTargetDqLayer = 255; dec_param.uiTargetDqLayer = 255;
dec_param.eEcActiveIdc = ERROR_CON_FRAME_COPY; dec_param.eEcActiveIdc = ERROR_CON_FRAME_COPY;
#if OPENH264_MAJOR == 1 && OPENH264_MINOR < 6
dec_param.eOutputColorFormat = videoFormatI420; dec_param.eOutputColorFormat = videoFormatI420;
#endif
dec_param.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_AVC; dec_param.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_AVC;
ret = openh264dec->decoder->Initialize (&dec_param); ret = openh264dec->decoder->Initialize (&dec_param);

41
ext/openh264/gstopenh264enc.cpp
View file

@ -38,6 +38,8 @@
GST_DEBUG_CATEGORY_STATIC (gst_openh264enc_debug_category); GST_DEBUG_CATEGORY_STATIC (gst_openh264enc_debug_category);
#define GST_CAT_DEFAULT gst_openh264enc_debug_category #define GST_CAT_DEFAULT gst_openh264enc_debug_category
/* FIXME: we should not really directly use the enums from the openh264 API
* here, since it might change or be removed */
#define GST_TYPE_USAGE_TYPE (gst_openh264enc_usage_type_get_type ()) #define GST_TYPE_USAGE_TYPE (gst_openh264enc_usage_type_get_type ())
static GType static GType
gst_openh264enc_usage_type_get_type (void) gst_openh264enc_usage_type_get_type (void)
@ -105,14 +107,14 @@ static GType
gst_openh264enc_slice_mode_get_type (void) gst_openh264enc_slice_mode_get_type (void)
{ {
static const GEnumValue types[] = { static const GEnumValue types[] = {
{SM_FIXEDSLCNUM_SLICE, "Fixed number of slices", "n-slices"}, {GST_OPENH264_SLICE_MODE_N_SLICES, "Fixed number of slices", "n-slices"},
{SM_AUTO_SLICE, "Number of slices equal to number of threads", "auto"}, {GST_OPENH264_SLICE_MODE_AUTO, "Number of slices equal to number of threads", "auto"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };
static gsize id = 0; static gsize id = 0;
if (g_once_init_enter (&id)) { if (g_once_init_enter (&id)) {
GType _id = g_enum_register_static ("GstOpenh264encSliceModes", types); GType _id = g_enum_register_static ("GstOpenh264EncSliceModes", types);
g_once_init_leave (&id, _id); g_once_init_leave (&id, _id);
} }
@ -175,7 +177,7 @@ static void gst_openh264enc_set_rate_control (GstOpenh264Enc * openh264enc,
#define DEFAULT_BACKGROUND_DETECTION TRUE #define DEFAULT_BACKGROUND_DETECTION TRUE
#define DEFAULT_ADAPTIVE_QUANTIZATION TRUE #define DEFAULT_ADAPTIVE_QUANTIZATION TRUE
#define DEFAULT_SCENE_CHANGE_DETECTION TRUE #define DEFAULT_SCENE_CHANGE_DETECTION TRUE
#define DEFAULT_SLICE_MODE SM_FIXEDSLCNUM_SLICE #define DEFAULT_SLICE_MODE GST_OPENH264_SLICE_MODE_N_SLICES
#define DEFAULT_NUM_SLICES 1 #define DEFAULT_NUM_SLICES 1
#define DEFAULT_COMPLEXITY MEDIUM_COMPLEXITY #define DEFAULT_COMPLEXITY MEDIUM_COMPLEXITY
@ -476,7 +478,7 @@ gst_openh264enc_set_property (GObject * object, guint property_id,
break; break;
case PROP_SLICE_MODE: case PROP_SLICE_MODE:
openh264enc->slice_mode = (SliceModeEnum) g_value_get_enum (value); openh264enc->slice_mode = (GstOpenh264EncSliceMode) g_value_get_enum (value);
break; break;
case PROP_NUM_SLICES: case PROP_NUM_SLICES:
@ -631,6 +633,8 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
gchar *debug_caps; gchar *debug_caps;
guint width, height, fps_n, fps_d; guint width, height, fps_n, fps_d;
SEncParamExt enc_params; SEncParamExt enc_params;
SliceModeEnum slice_mode = SM_SINGLE_SLICE;
guint n_slices = 1;
gint ret; gint ret;
GstCaps *outcaps; GstCaps *outcaps;
GstVideoCodecState *output_state; GstVideoCodecState *output_state;
@ -698,16 +702,33 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
enc_params.sSpatialLayers[0].iSpatialBitrate = enc_params.iTargetBitrate; enc_params.sSpatialLayers[0].iSpatialBitrate = enc_params.iTargetBitrate;
enc_params.sSpatialLayers[0].iMaxSpatialBitrate = enc_params.iMaxBitrate; enc_params.sSpatialLayers[0].iMaxSpatialBitrate = enc_params.iMaxBitrate;
if (openh264enc->slice_mode == SM_FIXEDSLCNUM_SLICE) { if (openh264enc->slice_mode == GST_OPENH264_SLICE_MODE_N_SLICES) {
if (openh264enc->num_slices == 1) if (openh264enc->num_slices == 1)
enc_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_SINGLE_SLICE; slice_mode = SM_SINGLE_SLICE;
else else
enc_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_FIXEDSLCNUM_SLICE; slice_mode = SM_FIXEDSLCNUM_SLICE;
enc_params.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceNum = openh264enc->num_slices; n_slices = openh264enc->num_slices;
} else if (openh264enc->slice_mode == GST_OPENH264_SLICE_MODE_AUTO) {
#if OPENH264_MAJOR == 1 && OPENH264_MINOR < 6
slice_mode = SM_AUTO_SLICE;
#else
slice_mode = SM_FIXEDSLCNUM_SLICE;
n_slices = 0;
#endif
} else { } else {
enc_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = openh264enc->slice_mode; GST_ERROR_OBJECT (openh264enc, "unexpected slice mode %d",
openh264enc->slice_mode);
slice_mode = SM_SINGLE_SLICE;
} }
#if OPENH264_MAJOR == 1 && OPENH264_MINOR < 6
enc_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = slice_mode;
enc_params.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceNum = n_slices;
#else
enc_params.sSpatialLayers[0].sSliceArgument.uiSliceMode = slice_mode;
enc_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = n_slices;
#endif
openh264enc->framerate = (1 + fps_n / fps_d); openh264enc->framerate = (1 + fps_n / fps_d);
ret = openh264enc->encoder->InitializeExt (&enc_params); ret = openh264enc->encoder->InitializeExt (&enc_params);

8
ext/openh264/gstopenh264enc.h
View file

@ -47,6 +47,12 @@ typedef enum _GstOpenh264encDeblockingMode
GST_OPENH264_DEBLOCKING_NOT_SLICE_BOUNDARIES = 2 GST_OPENH264_DEBLOCKING_NOT_SLICE_BOUNDARIES = 2
} GstOpenh264encDeblockingMode; } GstOpenh264encDeblockingMode;
typedef enum
{
GST_OPENH264_SLICE_MODE_N_SLICES = 1, /* SM_FIXEDSLCNUM_SLICE */
GST_OPENH264_SLICE_MODE_AUTO = 5 /* former SM_AUTO_SLICE */
} GstOpenh264EncSliceMode;
#define GST_TYPE_OPENH264ENC (gst_openh264enc_get_type()) #define GST_TYPE_OPENH264ENC (gst_openh264enc_get_type())
#define GST_OPENH264ENC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OPENH264ENC,GstOpenh264Enc)) #define GST_OPENH264ENC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OPENH264ENC,GstOpenh264Enc))
#define GST_OPENH264ENC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OPENH264ENC,GstOpenh264EncClass)) #define GST_OPENH264ENC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OPENH264ENC,GstOpenh264EncClass))
@ -80,7 +86,7 @@ struct _GstOpenh264Enc
gboolean background_detection; gboolean background_detection;
gboolean adaptive_quantization; gboolean adaptive_quantization;
gboolean scene_change_detection; gboolean scene_change_detection;
SliceModeEnum slice_mode; GstOpenh264EncSliceMode slice_mode;
guint num_slices; guint num_slices;
ECOMPLEXITY_MODE complexity; ECOMPLEXITY_MODE complexity;
}; };