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

mpeg2dec: Propagate GstFlowReturn where needed

Browse source 
It was just ignoring the return values...
This commit is contained in:
Edward Hervey 2012-07-19 09:58:50 +02:00
parent e0a5d6de60
commit 89ff56321f
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ext/mpeg2dec/gstmpeg2dec.c
View file

@ -331,17 +331,12 @@ gst_mpeg2dec_crop_buffer (GstMpeg2dec * dec, GstVideoCodecFrame * in_frame,
ret = ret =
gst_video_decoder_alloc_output_frame (GST_VIDEO_DECODER (dec), in_frame); gst_video_decoder_alloc_output_frame (GST_VIDEO_DECODER (dec), in_frame);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK)
gst_video_codec_state_unref (state); goto beach;
return ret;
}
if (!gst_video_frame_map (&output_frame, info, in_frame->output_buffer, if (!gst_video_frame_map (&output_frame, info, in_frame->output_buffer,
GST_MAP_WRITE)) { GST_MAP_WRITE))
GST_ERROR_OBJECT (dec, "Failed to map output frame"); goto map_fail;
gst_video_codec_state_unref (state);
return GST_FLOW_ERROR;
}
n_planes = GST_VIDEO_FRAME_N_PLANES (&output_frame); n_planes = GST_VIDEO_FRAME_N_PLANES (&output_frame);
for (c = 0; c < n_planes; c++) { for (c = 0; c < n_planes; c++) {
@ -369,9 +364,17 @@ gst_mpeg2dec_crop_buffer (GstMpeg2dec * dec, GstVideoCodecFrame * in_frame,
gst_video_frame_unmap (&output_frame); gst_video_frame_unmap (&output_frame);
beach:
gst_video_codec_state_unref (state); gst_video_codec_state_unref (state);
return GST_FLOW_OK; return ret;
map_fail:
{
GST_ERROR_OBJECT (dec, "Failed to map output frame");
gst_video_codec_state_unref (state);
return GST_FLOW_ERROR;
}
} }
static void static void
@ -799,7 +802,7 @@ handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info,
break; break;
default: default:
gst_video_codec_frame_ref (frame); gst_video_codec_frame_ref (frame);
gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame); ret = gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame);
GST_VIDEO_DECODER_ERROR (mpeg2dec, 1, STREAM, DECODE, GST_VIDEO_DECODER_ERROR (mpeg2dec, 1, STREAM, DECODE,
("decoding error"), ("Invalid picture type"), ret); ("decoding error"), ("Invalid picture type"), ret);
return ret; return ret;
@ -875,16 +878,16 @@ handle_slice (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
if (picture->flags & PIC_FLAG_SKIP) { if (picture->flags & PIC_FLAG_SKIP) {
GST_DEBUG_OBJECT (mpeg2dec, "dropping buffer because of skip flag"); GST_DEBUG_OBJECT (mpeg2dec, "dropping buffer because of skip flag");
gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame); ret = gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame);
mpeg2_skip (mpeg2dec->decoder, 1); mpeg2_skip (mpeg2dec->decoder, 1);
return GST_FLOW_OK; return ret;
} }
if (mpeg2dec->discont_state != MPEG2DEC_DISC_NONE) { if (mpeg2dec->discont_state != MPEG2DEC_DISC_NONE) {
GST_DEBUG_OBJECT (mpeg2dec, "dropping buffer, discont state %d", GST_DEBUG_OBJECT (mpeg2dec, "dropping buffer, discont state %d",
mpeg2dec->discont_state); mpeg2dec->discont_state);
gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame); ret = gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame);
return GST_FLOW_OK; return ret;
} }
state = gst_video_decoder_get_output_state (GST_VIDEO_DECODER (mpeg2dec)); state = gst_video_decoder_get_output_state (GST_VIDEO_DECODER (mpeg2dec));
@ -896,9 +899,8 @@ handle_slice (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
if (gst_video_decoder_get_max_decode_time (GST_VIDEO_DECODER (mpeg2dec), if (gst_video_decoder_get_max_decode_time (GST_VIDEO_DECODER (mpeg2dec),
frame) < 0) { frame) < 0) {
GST_DEBUG_OBJECT (mpeg2dec, "dropping buffer crop, too late"); GST_DEBUG_OBJECT (mpeg2dec, "dropping buffer crop, too late");
gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame); ret = gst_video_decoder_drop_frame (GST_VIDEO_DECODER (mpeg2dec), frame);
gst_video_codec_state_unref (state); goto beach;
return GST_FLOW_OK;
} }
GST_DEBUG_OBJECT (mpeg2dec, "cropping buffer"); GST_DEBUG_OBJECT (mpeg2dec, "cropping buffer");
@ -907,9 +909,10 @@ handle_slice (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
ret = gst_mpeg2dec_crop_buffer (mpeg2dec, frame, vframe); ret = gst_mpeg2dec_crop_buffer (mpeg2dec, frame, vframe);
} }
gst_video_codec_state_unref (state); ret = gst_video_decoder_finish_frame (GST_VIDEO_DECODER (mpeg2dec), frame);
gst_video_decoder_finish_frame (GST_VIDEO_DECODER (mpeg2dec), frame);
beach:
gst_video_codec_state_unref (state);
return ret; return ret;
} }