ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Tue Dec 23 00:42:49 2014 +0100| [1ffcf6ac9045c647ce27581a836f325118e40b03] | committer: Michael Niedermayer
frame_thread_encoder: use ref-counting to avoid memcpy of all input frames Apparently uneeded lock/unlock removed by commiter Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ffcf6ac9045c647ce27581a836f325118e40b03 --- libavcodec/frame_thread_encoder.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 6eae8b5..9a49fea 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -254,25 +254,17 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVF av_assert1(!*got_packet_ptr); if(frame){ - if(!(avctx->flags & CODEC_FLAG_INPUT_PRESERVED)){ - AVFrame *new = av_frame_alloc(); - if(!new) - return AVERROR(ENOMEM); - pthread_mutex_lock(&c->buffer_mutex); - ret = ff_get_buffer(c->parent_avctx, new, 0); - pthread_mutex_unlock(&c->buffer_mutex); - if(ret<0) - return ret; - new->pts = frame->pts; - new->quality = frame->quality; - new->pict_type = frame->pict_type; - av_image_copy(new->data, new->linesize, (const uint8_t **)frame->data, frame->linesize, - avctx->pix_fmt, avctx->width, avctx->height); - frame = new; + AVFrame *new = av_frame_alloc(); + if(!new) + return AVERROR(ENOMEM); + ret = av_frame_ref(new, frame); + if(ret < 0) { + av_frame_free(&new); + return ret; } task.index = c->task_index; - task.indata = (void*)frame; + task.indata = (void*)new; pthread_mutex_lock(&c->task_fifo_mutex); av_fifo_generic_write(c->task_fifo, &task, sizeof(task), NULL); pthread_cond_signal(&c->task_fifo_cond); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
