mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 04:52:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

basevideodecoder: remove (almost) unused fields

Browse source 
... and also some more unused code.
This commit is contained in:
Mark Nauwelaerts 2011-03-29 12:57:21 +02:00
parent f591361d2f
commit cfc65b14b1
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst-libs/gst/video/gstbasevideodecoder.c
View file

@ -300,7 +300,7 @@ gst_base_video_decoder_sink_event (GstPad * pad, GstEvent * event)
GST_CLOCK_TIME_NONE; GST_CLOCK_TIME_NONE;
GST_BASE_VIDEO_CODEC (base_video_decoder)->proportion = 0.5; GST_BASE_VIDEO_CODEC (base_video_decoder)->proportion = 0.5;
gst_segment_init (&GST_BASE_VIDEO_CODEC (base_video_decoder)->segment, gst_segment_init (&GST_BASE_VIDEO_CODEC (base_video_decoder)->segment,
GST_FORMAT_TIME); GST_FORMAT_UNDEFINED);
GST_OBJECT_UNLOCK (base_video_decoder); GST_OBJECT_UNLOCK (base_video_decoder);
} }
default: default:
@ -734,7 +734,6 @@ gst_base_video_decoder_reset (GstBaseVideoDecoder * base_video_decoder)
base_video_decoder->timestamp_offset = GST_CLOCK_TIME_NONE; base_video_decoder->timestamp_offset = GST_CLOCK_TIME_NONE;
GST_BASE_VIDEO_CODEC (base_video_decoder)->system_frame_number = 0; GST_BASE_VIDEO_CODEC (base_video_decoder)->system_frame_number = 0;
base_video_decoder->presentation_frame_number = 0;
base_video_decoder->base_picture_number = 0; base_video_decoder->base_picture_number = 0;
base_video_decoder->last_timestamp = GST_CLOCK_TIME_NONE; base_video_decoder->last_timestamp = GST_CLOCK_TIME_NONE;
@ -784,7 +783,8 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
* requiring the pad to be negotiated makes it impossible to use * requiring the pad to be negotiated makes it impossible to use
* oggdemux or filesrc ! decoder */ * oggdemux or filesrc ! decoder */
if (!base_video_decoder->have_segment) { if (GST_BASE_VIDEO_CODEC (base_video_decoder)->segment.format ==
GST_FORMAT_UNDEFINED) {
GstEvent *event; GstEvent *event;
GstFlowReturn ret; GstFlowReturn ret;
@ -795,7 +795,6 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
gst_segment_set_newsegment_full (&GST_BASE_VIDEO_CODEC gst_segment_set_newsegment_full (&GST_BASE_VIDEO_CODEC
(base_video_decoder)->segment, FALSE, 1.0, 1.0, GST_FORMAT_TIME, 0, (base_video_decoder)->segment, FALSE, 1.0, 1.0, GST_FORMAT_TIME, 0,
GST_CLOCK_TIME_NONE, 0); GST_CLOCK_TIME_NONE, 0);
base_video_decoder->have_segment = TRUE;
event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0, event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0,
GST_CLOCK_TIME_NONE, 0); GST_CLOCK_TIME_NONE, 0);
@ -827,15 +826,6 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
} }
base_video_decoder->input_offset += GST_BUFFER_SIZE (buf); base_video_decoder->input_offset += GST_BUFFER_SIZE (buf);
#if 0
if (base_video_decoder->timestamp_offset == GST_CLOCK_TIME_NONE &&
GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
GST_DEBUG ("got new offset %" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
base_video_decoder->timestamp_offset = GST_BUFFER_TIMESTAMP (buf);
}
#endif
if (base_video_decoder->packetized) { if (base_video_decoder->packetized) {
base_video_decoder->current_frame->sink_buffer = buf; base_video_decoder->current_frame->sink_buffer = buf;
@ -927,7 +917,7 @@ gst_base_video_decoder_change_state (GstElement * element,
base_video_decoder_class->stop (base_video_decoder); base_video_decoder_class->stop (base_video_decoder);
} }
gst_segment_init (&GST_BASE_VIDEO_CODEC (base_video_decoder)->segment, gst_segment_init (&GST_BASE_VIDEO_CODEC (base_video_decoder)->segment,
GST_FORMAT_TIME); GST_FORMAT_UNDEFINED);
g_list_foreach (base_video_decoder->timestamps, (GFunc) g_free, NULL); g_list_foreach (base_video_decoder->timestamps, (GFunc) g_free, NULL);
g_list_free (base_video_decoder->timestamps); g_list_free (base_video_decoder->timestamps);
base_video_decoder->timestamps = NULL; base_video_decoder->timestamps = NULL;

8
gst-libs/gst/video/gstbasevideodecoder.h
View file

@ -79,8 +79,6 @@ struct _GstBaseVideoDecoder
gboolean sink_clipping; gboolean sink_clipping;
gboolean do_byte_time; gboolean do_byte_time;
guint64 presentation_frame_number;
gboolean have_src_caps; gboolean have_src_caps;
GstVideoFrame *current_frame; GstVideoFrame *current_frame;
@ -88,12 +86,8 @@ struct _GstBaseVideoDecoder
int distance_from_sync; int distance_from_sync;
int reorder_depth; int reorder_depth;
GstClockTime buffer_timestamp;
GstClockTime timestamp_offset; GstClockTime timestamp_offset;
//GstBuffer *codec_data;
guint64 input_offset; guint64 input_offset;
guint64 frame_offset; guint64 frame_offset;
GstClockTime last_timestamp; GstClockTime last_timestamp;
@ -102,11 +96,9 @@ struct _GstBaseVideoDecoder
int field_index; int field_index;
gboolean is_delta_unit;
gboolean packetized; gboolean packetized;
GList *timestamps; GList *timestamps;
gboolean have_segment;
/* FIXME before moving to base */ /* FIXME before moving to base */
void *padding[GST_PADDING_LARGE]; void *padding[GST_PADDING_LARGE];