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

jpegenc: pass flowreturn upstream

Browse source
This commit is contained in:
Wim Taymans 2012-12-20 15:55:02 +01:00
parent e12457f138
commit 30f5125fca
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/jpeg/gstjpegenc.c
View file

@ -250,7 +250,7 @@ gst_jpegenc_term_destination (j_compress_ptr cinfo)
GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (jpegenc->current_frame); GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (jpegenc->current_frame);
gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (jpegenc), jpegenc->res = gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (jpegenc),
jpegenc->current_frame); jpegenc->current_frame);
jpegenc->current_frame = NULL; jpegenc->current_frame = NULL;
} }
@ -463,6 +463,7 @@ gst_jpegenc_handle_frame (GstVideoEncoder * encoder, GstVideoCodecFrame * frame)
i) * stride[i]; i) * stride[i];
} }
jpegenc->res = GST_FLOW_OK;
jpegenc->output_mem = gst_allocator_alloc (NULL, jpegenc->bufsize, &params); jpegenc->output_mem = gst_allocator_alloc (NULL, jpegenc->bufsize, &params);
gst_memory_map (jpegenc->output_mem, &jpegenc->output_map, GST_MAP_READWRITE); gst_memory_map (jpegenc->output_mem, &jpegenc->output_map, GST_MAP_READWRITE);
@ -520,7 +521,7 @@ gst_jpegenc_handle_frame (GstVideoEncoder * encoder, GstVideoCodecFrame * frame)
jpeg_finish_compress (&jpegenc->cinfo); jpeg_finish_compress (&jpegenc->cinfo);
GST_LOG_OBJECT (jpegenc, "compressing done"); GST_LOG_OBJECT (jpegenc, "compressing done");
return GST_FLOW_OK; return jpegenc->res;
invalid_frame: invalid_frame:
{ {

1
ext/jpeg/gstjpegenc.h
View file

@ -56,6 +56,7 @@ struct _GstJpegEnc
GstVideoCodecState *input_state; GstVideoCodecState *input_state;
GstVideoFrame current_vframe; GstVideoFrame current_vframe;
GstVideoCodecFrame *current_frame; GstVideoCodecFrame *current_frame;
GstFlowReturn res;
guint channels; guint channels;