virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'

Browse Source 
* commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83':
  pthread_frame: simplify the code by using new AVPacket API

Conflicts:
	libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-19 19:02:36 +02:00
commit af72f62d7b
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/pthread_frame.c
View File

@ -65,8 +65,6 @@ 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).
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.
@ -342,25 +340,8 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
} }
} }
av_packet_free_side_data(&p->avpkt); av_packet_unref(&p->avpkt);
av_buffer_unref(&p->avpkt.buf); av_packet_ref(&p->avpkt, avpkt);
p->avpkt = *avpkt;
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);
if (!p->buf) {
pthread_mutex_unlock(&p->mutex);
return AVERROR(ENOMEM);
}
p->avpkt.data = p->buf;
memcpy(p->buf, avpkt->data, avpkt->size);
memset(p->buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
}
if ((ret = av_copy_packet_side_data(&p->avpkt, avpkt)) < 0) {
pthread_mutex_unlock(&p->mutex);
return ret;
}
p->state = STATE_SETTING_UP; p->state = STATE_SETTING_UP;
pthread_cond_signal(&p->input_cond); pthread_cond_signal(&p->input_cond);
@ -599,9 +580,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_packet_unref(&p->avpkt);
av_buffer_unref(&p->avpkt.buf);
av_freep(&p->buf);
av_freep(&p->released_buffers); av_freep(&p->released_buffers);
if (i) { if (i) {