mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-04 22:48:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpeg2: fix is_first_field calculation.

Browse source 
Reset is_first_field for frame pictures. Factor out locations where
the flag is updated.
This commit is contained in:
Gwenole Beauchesne 2012-02-28 11:58:21 +01:00
parent 10dfc67cca
commit d6ab5e1210
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
View file

@ -494,7 +494,7 @@ decode_gop(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size)
if (!priv->pts_diff)
priv->pts_diff = priv->seq_pts - priv->gop_pts;
priv->is_first_field = TRUE;
priv->is_first_field = FALSE;
return GST_VAAPI_DECODER_STATUS_SUCCESS;
}
@ -590,6 +590,7 @@ decode_picture_ext(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size)
pic_ext->picture_structure = GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME;
}
priv->is_first_field ^= 1;
switch (pic_ext->picture_structure) {
case GST_MPEG_VIDEO_PICTURE_STRUCTURE_TOP_FIELD:
GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_TOP_FIELD);
@ -597,6 +598,9 @@ decode_picture_ext(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size)
case GST_MPEG_VIDEO_PICTURE_STRUCTURE_BOTTOM_FIELD:
GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_BOTTOM_FIELD);
break;
case GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME:
priv->is_first_field = TRUE;
break;
}
return GST_VAAPI_DECODER_STATUS_SUCCESS;
}
@ -679,13 +683,8 @@ decode_slice(
GST_DEBUG("slice %d @ %p, %u bytes)", slice_no, buf, buf_size);
if (picture->slices->len == 0) {
if (!fill_picture(decoder, picture))
return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
if (!priv->pic_ext.progressive_frame)
priv->is_first_field ^= 1;
}
if (picture->slices->len == 0 && !fill_picture(decoder, picture))
return GST_VAAPI_DECODER_STATUS_ERROR_UNKNOWN;
slice = GST_VAAPI_SLICE_NEW(MPEG2, decoder, buf, buf_size);
if (!slice) {