aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-10-31 16:36:07 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-08 07:35:14 +0100
commit1a5e9130162b8adc898e5f6aea82b6372d1e4e6c (patch)
tree3834b6736e60ddb918c9c515bd3aabe9ce965e65 /libavcodec/pthread.c
parent1afddbe59e96af75f1c07605afc95615569f388f (diff)
downloadffmpeg-1a5e9130162b8adc898e5f6aea82b6372d1e4e6c.tar.gz
pthread: avoid copying input packets when possible.
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r--libavcodec/pthread.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index cd44b8c73b..751fca8d6d 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -101,7 +101,8 @@ typedef struct PerThreadContext {
AVCodecContext *avctx; ///< Context used to decode packets passed to this thread.
AVPacket avpkt; ///< Input packet (for decoding) or output (for encoding).
- int allocated_buf_size; ///< Size allocated for avpkt.data
+ uint8_t *buf; ///< backup storage for packet data when the input packet is not refcounted
+ int allocated_buf_size; ///< Size allocated for buf
AVFrame frame; ///< Output frame (for decoding) or input (for encoding).
int got_frame; ///< The output of got_picture_ptr from the last avcodec_decode_video() call.
@@ -522,7 +523,6 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
FrameThreadContext *fctx = p->parent;
PerThreadContext *prev_thread = fctx->prev_thread;
const AVCodec *codec = p->avctx->codec;
- uint8_t *buf = p->avpkt.data;
if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0;
@@ -546,11 +546,16 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
}
}
- av_fast_malloc(&buf, &p->allocated_buf_size, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
+ av_buffer_unref(&p->avpkt.buf);
p->avpkt = *avpkt;
- p->avpkt.data = buf;
- memcpy(buf, avpkt->data, avpkt->size);
- memset(buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ if (avpkt->buf)
+ p->avpkt.buf = av_buffer_ref(avpkt->buf);
+ else {
+ av_fast_malloc(&p->buf, &p->allocated_buf_size, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
+ p->avpkt.data = p->buf;
+ memcpy(p->buf, avpkt->data, avpkt->size);
+ memset(p->buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ }
p->state = STATE_SETTING_UP;
pthread_cond_signal(&p->input_cond);
@@ -762,7 +767,8 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count)
pthread_cond_destroy(&p->input_cond);
pthread_cond_destroy(&p->progress_cond);
pthread_cond_destroy(&p->output_cond);
- av_freep(&p->avpkt.data);
+ av_buffer_unref(&p->avpkt.buf);
+ av_freep(&p->buf);
if (i) {
av_freep(&p->avctx->priv_data);