virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc/pthread: copy packet side data.

Browse Source
This commit is contained in:
Nicolas George
2014-02-20 20:52:06 +01:00
parent 742d860103
commit ea6825fd09
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread_frame.c
View File

@@ -317,6 +317,7 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
FrameThreadContext *fctx = p->parent; FrameThreadContext *fctx = p->parent;
PerThreadContext *prev_thread = fctx->prev_thread; PerThreadContext *prev_thread = fctx->prev_thread;
const AVCodec *codec = p->avctx->codec; const AVCodec *codec = p->avctx->codec;
int ret;
if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0; if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0;
@@ -340,6 +341,7 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
} }
} }
av_packet_free_side_data(&p->avpkt);
av_buffer_unref(&p->avpkt.buf); av_buffer_unref(&p->avpkt.buf);
p->avpkt = *avpkt; p->avpkt = *avpkt;
if (avpkt->buf) if (avpkt->buf)
@@ -354,6 +356,8 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
memcpy(p->buf, avpkt->data, avpkt->size); memcpy(p->buf, avpkt->data, avpkt->size);
memset(p->buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(p->buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
} }
if ((ret = av_copy_packet_side_data(&p->avpkt, avpkt)) < 0)
return ret;
p->state = STATE_SETTING_UP; p->state = STATE_SETTING_UP;
pthread_cond_signal(&p->input_cond); pthread_cond_signal(&p->input_cond);
@@ -592,6 +596,7 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
pthread_cond_destroy(&p->input_cond); pthread_cond_destroy(&p->input_cond);
pthread_cond_destroy(&p->progress_cond); pthread_cond_destroy(&p->progress_cond);
pthread_cond_destroy(&p->output_cond); pthread_cond_destroy(&p->output_cond);
av_packet_free_side_data(&p->avpkt);
av_buffer_unref(&p->avpkt.buf); av_buffer_unref(&p->avpkt.buf);
av_freep(&p->buf); av_freep(&p->buf);
av_freep(&p->released_buffers); av_freep(&p->released_buffers);