mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

decoder: vc1: Fail only on actual interlaced frames

Browse source 
In the earlier patch:

 f31d9f3 decoder: vc1: Print error on interlaced content

Decoding would error out if the interlace flag was set in the
sequence bdu. This isn't quite right because a video can have this
flag set and yet not have any interlaced pictures.

Here instead we error out when either parsing a field bdu or
decoding a frame bdu which has fcm set to anything other than
progressive.

Signed-off-by: Scott D Phillips <scott.d.phillips@intel.com>

https://bugzilla.gnome.org/show_bug.cgi?id=769250
This commit is contained in:
Scott D Phillips 2016-08-26 14:55:17 -07:00 committed by Víctor Manuel Jáquez Leal
parent 58d5d60681
commit 2eb439416d
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/vaapi/gstvaapidecoder_vc1.c
View file

@ -276,11 +276,6 @@ decode_sequence (GstVaapiDecoderVC1 * decoder, GstVC1BDU * rbdu,
priv->has_entrypoint = FALSE; priv->has_entrypoint = FALSE;
if (adv_hdr->interlace != 0) {
GST_ERROR ("interlaced sequence unsupported");
return GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
}
/* Reset POC */ /* Reset POC */
if (priv->last_non_b_picture) { if (priv->last_non_b_picture) {
if (priv->last_non_b_picture->poc == priv->next_poc) if (priv->last_non_b_picture->poc == priv->next_poc)
@ -962,6 +957,11 @@ decode_frame (GstVaapiDecoderVC1 * decoder, GstVC1BDU * rbdu, GstVC1BDU * ebdu)
return get_status (result); return get_status (result);
} }
if (frame_hdr->pic.advanced.fcm != GST_VC1_FRAME_PROGRESSIVE) {
GST_ERROR ("interlaced video not supported");
return GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
}
switch (frame_hdr->ptype) { switch (frame_hdr->ptype) {
case GST_VC1_PICTURE_TYPE_I: case GST_VC1_PICTURE_TYPE_I:
picture->type = GST_VAAPI_PICTURE_TYPE_I; picture->type = GST_VAAPI_PICTURE_TYPE_I;
@ -1303,6 +1303,9 @@ gst_vaapi_decoder_vc1_parse (GstVaapiDecoder * base_decoder,
case GST_VC1_SLICE: case GST_VC1_SLICE:
flags |= GST_VAAPI_DECODER_UNIT_FLAG_SLICE; flags |= GST_VAAPI_DECODER_UNIT_FLAG_SLICE;
break; break;
case GST_VC1_FIELD:
GST_ERROR ("interlaced video not supported");
return GST_VAAPI_DECODER_STATUS_ERROR_UNSUPPORTED_PROFILE;
} }
GST_VAAPI_DECODER_UNIT_FLAG_SET (unit, flags); GST_VAAPI_DECODER_UNIT_FLAG_SET (unit, flags);
return GST_VAAPI_DECODER_STATUS_SUCCESS; return GST_VAAPI_DECODER_STATUS_SUCCESS;