mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

openh264dec: minor clean-ups

Browse source 
Remove unused property getters, setters; outdated comment.
This commit is contained in:
Tim-Philipp Müller 2016-04-11 20:23:45 +01:00
parent 9617a371ca
commit cc2b604b3b
1 changed files with 4 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ext/openh264/gstopenh264dec.cpp
View file

@ -37,11 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_openh264dec_debug_category);
#define GST_CAT_DEFAULT gst_openh264dec_debug_category #define GST_CAT_DEFAULT gst_openh264dec_debug_category
/* prototypes */ /* prototypes */
static void gst_openh264dec_set_property (GObject * object,
guint property_id, const GValue * value, GParamSpec * pspec);
static void gst_openh264dec_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec);
static gboolean gst_openh264dec_start (GstVideoDecoder * decoder); static gboolean gst_openh264dec_start (GstVideoDecoder * decoder);
static gboolean gst_openh264dec_stop (GstVideoDecoder * decoder); static gboolean gst_openh264dec_stop (GstVideoDecoder * decoder);
@ -55,12 +50,6 @@ static GstFlowReturn gst_openh264dec_handle_frame (GstVideoDecoder * decoder,
static gboolean gst_openh264dec_decide_allocation (GstVideoDecoder * decoder, static gboolean gst_openh264dec_decide_allocation (GstVideoDecoder * decoder,
GstQuery * query); GstQuery * query);
enum
{
PROP_0,
N_PROPERTIES
};
/* pad templates */ /* pad templates */
static GstStaticPadTemplate gst_openh264dec_sink_template = static GstStaticPadTemplate gst_openh264dec_sink_template =
@ -68,7 +57,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS GST_STATIC_CAPS
("video/x-h264, stream-format=(string)byte-stream, alignment=(string)au,profile=(string){constrained-baseline,baseline}")); ("video/x-h264, stream-format=(string)byte-stream, alignment=(string)au, "
"profile=(string){ constrained-baseline, baseline}"));
static GstStaticPadTemplate gst_openh264dec_src_template = static GstStaticPadTemplate gst_openh264dec_src_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
@ -86,11 +76,8 @@ G_DEFINE_TYPE_WITH_CODE (GstOpenh264Dec, gst_openh264dec,
static void static void
gst_openh264dec_class_init (GstOpenh264DecClass * klass) gst_openh264dec_class_init (GstOpenh264DecClass * klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstVideoDecoderClass *video_decoder_class = GST_VIDEO_DECODER_CLASS (klass); GstVideoDecoderClass *video_decoder_class = GST_VIDEO_DECODER_CLASS (klass);
/* Setting up pads and setting metadata should be moved to
base_class_init if you intend to subclass this class. */
gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass), gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
&gst_openh264dec_sink_template); &gst_openh264dec_sink_template);
gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass), gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
@ -99,8 +86,6 @@ gst_openh264dec_class_init (GstOpenh264DecClass * klass)
gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass), gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass),
"OpenH264 video decoder", "Decoder/Video", "OpenH264 video decoder", "OpenH264 video decoder", "Decoder/Video", "OpenH264 video decoder",
"Ericsson AB, http://www.ericsson.com"); "Ericsson AB, http://www.ericsson.com");
gobject_class->set_property = gst_openh264dec_set_property;
gobject_class->get_property = gst_openh264dec_get_property;
video_decoder_class->start = GST_DEBUG_FUNCPTR (gst_openh264dec_start); video_decoder_class->start = GST_DEBUG_FUNCPTR (gst_openh264dec_start);
video_decoder_class->stop = GST_DEBUG_FUNCPTR (gst_openh264dec_stop); video_decoder_class->stop = GST_DEBUG_FUNCPTR (gst_openh264dec_stop);
@ -124,36 +109,6 @@ gst_openh264dec_init (GstOpenh264Dec * openh264dec)
gst_video_decoder_set_needs_format (GST_VIDEO_DECODER (openh264dec), TRUE); gst_video_decoder_set_needs_format (GST_VIDEO_DECODER (openh264dec), TRUE);
} }
void
gst_openh264dec_set_property (GObject * object, guint property_id,
const GValue * value, GParamSpec * pspec)
{
GstOpenh264Dec *openh264dec = GST_OPENH264DEC (object);
GST_DEBUG_OBJECT (openh264dec, "set_property");
switch (property_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
void
gst_openh264dec_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec)
{
GstOpenh264Dec *openh264dec = GST_OPENH264DEC (object);
GST_DEBUG_OBJECT (openh264dec, "get_property");
switch (property_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static gboolean static gboolean
gst_openh264dec_start (GstVideoDecoder * decoder) gst_openh264dec_start (GstVideoDecoder * decoder)
{ {
@ -208,8 +163,7 @@ gst_openh264dec_set_format (GstVideoDecoder * decoder,
{ {
GstOpenh264Dec *openh264dec = GST_OPENH264DEC (decoder); GstOpenh264Dec *openh264dec = GST_OPENH264DEC (decoder);
GST_DEBUG_OBJECT (openh264dec, GST_DEBUG_OBJECT (openh264dec, "input caps: %" GST_PTR_FORMAT, state->caps);
"openh264_dec_set_format called, caps: %" GST_PTR_FORMAT, state->caps);
if (openh264dec->input_state) { if (openh264dec->input_state) {
gst_video_codec_state_unref (openh264dec->input_state); gst_video_codec_state_unref (openh264dec->input_state);
@ -282,9 +236,7 @@ gst_openh264dec_handle_frame (GstVideoDecoder * decoder,
frame = NULL; frame = NULL;
} else { } else {
memset (&dst_buf_info, 0, sizeof (SBufferInfo)); memset (&dst_buf_info, 0, sizeof (SBufferInfo));
ret = ret = openh264dec->decoder->DecodeFrame2 (NULL, 0, yuvdata, &dst_buf_info);
openh264dec->decoder->DecodeFrame2 (NULL, 0, yuvdata,
&dst_buf_info);
if (ret != dsErrorFree) { if (ret != dsErrorFree) {
gst_video_codec_frame_unref (frame); gst_video_codec_frame_unref (frame);
return GST_FLOW_EOS; return GST_FLOW_EOS;