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

Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'

Browse Source 
* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
  pthread: avoid copying input packets when possible.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-08 19:17:31 +01:00
parent 2653e12520 1a5e913016
commit d9d97f9b33
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/pthread.c
View File

@@ -107,7 +107,8 @@ typedef struct PerThreadContext {
AVCodecContext *avctx; ///< Context used to decode packets passed to this thread. AVCodecContext *avctx; ///< Context used to decode packets passed to this thread.
AVPacket avpkt; ///< Input packet (for decoding) or output (for encoding). 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). 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. int got_frame; ///< The output of got_picture_ptr from the last avcodec_decode_video() call.
@@ -541,7 +542,6 @@ 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;
uint8_t *buf = p->avpkt.data;
if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0; if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0;
@@ -565,11 +565,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 = *avpkt;
p->avpkt.data = buf; if (avpkt->buf)
memcpy(buf, avpkt->data, avpkt->size); p->avpkt.buf = av_buffer_ref(avpkt->buf);
memset(buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); 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; p->state = STATE_SETTING_UP;
pthread_cond_signal(&p->input_cond); pthread_cond_signal(&p->input_cond);
@@ -791,7 +796,8 @@ static void 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_freep(&p->avpkt.data); av_buffer_unref(&p->avpkt.buf);
av_freep(&p->buf);
if (i) { if (i) {
av_freep(&p->avctx->priv_data); av_freep(&p->avctx->priv_data);