mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

basevideodecoder: Don't blow away field information

Browse source 
Also, set field flags correctly.
This commit is contained in:
David Schleef 2010-09-18 19:14:36 -07:00
parent 7cd2e0dd3e
commit dbbf1182dc
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -998,7 +998,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
GST_TIME_ARGS (frame->presentation_timestamp - GST_TIME_ARGS (frame->presentation_timestamp -
base_video_decoder->segment.start)); base_video_decoder->segment.start));
base_video_decoder->timestamp_offset = frame->presentation_timestamp; base_video_decoder->timestamp_offset = frame->presentation_timestamp;
base_video_decoder->field_index = 0; base_video_decoder->field_index &= 1;
} else { } else {
/* This case is for one initial timestamp and no others, e.g., /* This case is for one initial timestamp and no others, e.g.,
* filesrc ! decoder ! xvimagesink */ * filesrc ! decoder ! xvimagesink */
@ -1013,7 +1013,7 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
("No base timestamp. Assuming frames start at segment start"); ("No base timestamp. Assuming frames start at segment start");
base_video_decoder->timestamp_offset = base_video_decoder->timestamp_offset =
base_video_decoder->segment.start; base_video_decoder->segment.start;
base_video_decoder->field_index = 0; base_video_decoder->field_index &= 1;
} }
} }
} }
@ -1046,15 +1046,6 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
GST_BUFFER_FLAG_UNSET (frame->src_buffer, GST_BUFFER_FLAG_DELTA_UNIT); GST_BUFFER_FLAG_UNSET (frame->src_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
if (base_video_decoder->state.interlaced) { if (base_video_decoder->state.interlaced) {
#ifndef GST_VIDEO_BUFFER_TFF
#define GST_VIDEO_BUFFER_TFF (GST_MINI_OBJECT_FLAG_LAST << 5)
#endif
#ifndef GST_VIDEO_BUFFER_RFF
#define GST_VIDEO_BUFFER_RFF (GST_MINI_OBJECT_FLAG_LAST << 6)
#endif
#ifndef GST_VIDEO_BUFFER_ONEFIELD
#define GST_VIDEO_BUFFER_ONEFIELD (GST_MINI_OBJECT_FLAG_LAST << 7)
#endif
int tff = base_video_decoder->state.top_field_first; int tff = base_video_decoder->state.top_field_first;
if (frame->field_index & 1) { if (frame->field_index & 1) {
@ -1070,11 +1061,11 @@ gst_base_video_decoder_finish_frame (GstBaseVideoDecoder * base_video_decoder,
if (frame->n_fields == 3) { if (frame->n_fields == 3) {
GST_BUFFER_FLAG_SET (frame->src_buffer, GST_VIDEO_BUFFER_RFF); GST_BUFFER_FLAG_SET (frame->src_buffer, GST_VIDEO_BUFFER_RFF);
} else if (frame->n_fields == 1) { } else if (frame->n_fields == 1) {
GST_BUFFER_FLAG_UNSET (frame->src_buffer, GST_VIDEO_BUFFER_ONEFIELD); GST_BUFFER_FLAG_SET (frame->src_buffer, GST_VIDEO_BUFFER_ONEFIELD);
} }
} }
if (base_video_decoder->discont) { if (base_video_decoder->discont) {
GST_BUFFER_FLAG_UNSET (frame->src_buffer, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_SET (frame->src_buffer, GST_BUFFER_FLAG_DISCONT);
base_video_decoder->discont = FALSE; base_video_decoder->discont = FALSE;
} }