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

decoder: cast GST_VAAPI_DECODER_STATUS_DROP_FRAME

Browse source 
Since GST_VAAPI_DECODER_STATUS_DROP_FRAME is not part of the enum
GstVaapiDecoderStatus, we need to cast it to avoid compiler complains.

https://bugzilla.gnome.org/show_bug.cgi?id=747312
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-04-03 20:02:29 +02:00
parent d1cb1959b2
commit c9f0807752
5 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/vaapi/gstvaapidecoder.c
View file

@ -241,7 +241,7 @@ do_decode_1 (GstVaapiDecoder * decoder, GstVaapiParserFrame * frame)
/* Drop frame if there is no slice data unit in there */ /* Drop frame if there is no slice data unit in there */
if (G_UNLIKELY (frame->units->len == 0)) if (G_UNLIKELY (frame->units->len == 0))
return GST_VAAPI_DECODER_STATUS_DROP_FRAME; return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
return GST_VAAPI_DECODER_STATUS_SUCCESS; return GST_VAAPI_DECODER_STATUS_SUCCESS;
} }

6
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
View file

@ -1515,7 +1515,7 @@ error:
drop_frame: drop_frame:
priv->decoder_state = 0; priv->decoder_state = 0;
priv->pic_structure = GST_H264_SEI_PIC_STRUCT_FRAME; priv->pic_structure = GST_H264_SEI_PIC_STRUCT_FRAME;
return GST_VAAPI_DECODER_STATUS_DROP_FRAME; return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
} }
static GstVaapiDecoderStatus static GstVaapiDecoderStatus
@ -3522,10 +3522,6 @@ decode_picture(GstVaapiDecoderH264 *decoder, GstVaapiDecoderUnit *unit)
switch (sps->profile_idc) { switch (sps->profile_idc) {
case GST_H264_PROFILE_MULTIVIEW_HIGH: case GST_H264_PROFILE_MULTIVIEW_HIGH:
case GST_H264_PROFILE_STEREO_HIGH: case GST_H264_PROFILE_STEREO_HIGH:
if (0) {
GST_DEBUG("drop picture from substream");
return GST_VAAPI_DECODER_STATUS_DROP_FRAME;
}
break; break;
} }

2
gst-libs/gst/vaapi/gstvaapidecoder_jpeg.c
View file

@ -241,7 +241,7 @@ error:
drop_frame: drop_frame:
priv->decoder_state = 0; priv->decoder_state = 0;
return GST_VAAPI_DECODER_STATUS_DROP_FRAME; return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
} }
static gboolean static gboolean

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

@ -550,7 +550,7 @@ error:
drop_frame: drop_frame:
priv->state &= GST_MPEG_VIDEO_STATE_VALID_SEQ_HEADERS; priv->state &= GST_MPEG_VIDEO_STATE_VALID_SEQ_HEADERS;
return GST_VAAPI_DECODER_STATUS_DROP_FRAME; return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
} }
static GstVaapiDecoderStatus static GstVaapiDecoderStatus

2
gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
View file

@ -518,7 +518,7 @@ decode_picture(GstVaapiDecoderMpeg4 *decoder, const guint8 *buf, guint buf_size)
parser_result = gst_mpeg4_parse_video_object_plane(vop_hdr, sprite_trajectory, vol_hdr, buf, buf_size); parser_result = gst_mpeg4_parse_video_object_plane(vop_hdr, sprite_trajectory, vol_hdr, buf, buf_size);
/* Need to skip this frame if VOP was not coded */ /* Need to skip this frame if VOP was not coded */
if (GST_MPEG4_PARSER_OK == parser_result && !vop_hdr->coded) if (GST_MPEG4_PARSER_OK == parser_result && !vop_hdr->coded)
return GST_VAAPI_DECODER_STATUS_DROP_FRAME; return (GstVaapiDecoderStatus) GST_VAAPI_DECODER_STATUS_DROP_FRAME;
} }
if (parser_result != GST_MPEG4_PARSER_OK) { if (parser_result != GST_MPEG4_PARSER_OK) {