mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-25 04:30:02 +00:00
80e9e63c94
* commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
271 lines
8.5 KiB
C
271 lines
8.5 KiB
C
/*
|
|
* Copyright (c) 2012 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "frame_thread_encoder.h"
|
|
|
|
#include "libavutil/fifo.h"
|
|
#include "libavutil/avassert.h"
|
|
#include "libavutil/imgutils.h"
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
#include "thread.h"
|
|
|
|
#if HAVE_PTHREADS
|
|
#include <pthread.h>
|
|
#elif HAVE_W32THREADS
|
|
#include "w32pthreads.h"
|
|
#elif HAVE_OS2THREADS
|
|
#include "os2threads.h"
|
|
#endif
|
|
|
|
#define MAX_THREADS 64
|
|
#define BUFFER_SIZE (2*MAX_THREADS)
|
|
|
|
typedef struct{
|
|
void *indata;
|
|
void *outdata;
|
|
int64_t return_code;
|
|
unsigned index;
|
|
} Task;
|
|
|
|
typedef struct{
|
|
AVCodecContext *parent_avctx;
|
|
pthread_mutex_t buffer_mutex;
|
|
|
|
AVFifoBuffer *task_fifo;
|
|
pthread_mutex_t task_fifo_mutex;
|
|
pthread_cond_t task_fifo_cond;
|
|
|
|
Task finished_tasks[BUFFER_SIZE];
|
|
pthread_mutex_t finished_task_mutex;
|
|
pthread_cond_t finished_task_cond;
|
|
|
|
unsigned task_index;
|
|
unsigned finished_task_index;
|
|
|
|
pthread_t worker[MAX_THREADS];
|
|
int exit;
|
|
} ThreadContext;
|
|
|
|
static void * attribute_align_arg worker(void *v){
|
|
AVCodecContext *avctx = v;
|
|
ThreadContext *c = avctx->internal->frame_thread_encoder;
|
|
AVPacket *pkt = NULL;
|
|
|
|
while(!c->exit){
|
|
int got_packet, ret;
|
|
AVFrame *frame;
|
|
Task task;
|
|
|
|
if(!pkt) pkt= av_mallocz(sizeof(*pkt));
|
|
if(!pkt) continue;
|
|
av_init_packet(pkt);
|
|
|
|
pthread_mutex_lock(&c->task_fifo_mutex);
|
|
while (av_fifo_size(c->task_fifo) <= 0 || c->exit) {
|
|
if(c->exit){
|
|
pthread_mutex_unlock(&c->task_fifo_mutex);
|
|
goto end;
|
|
}
|
|
pthread_cond_wait(&c->task_fifo_cond, &c->task_fifo_mutex);
|
|
}
|
|
av_fifo_generic_read(c->task_fifo, &task, sizeof(task), NULL);
|
|
pthread_mutex_unlock(&c->task_fifo_mutex);
|
|
frame = task.indata;
|
|
|
|
ret = avcodec_encode_video2(avctx, pkt, frame, &got_packet);
|
|
pthread_mutex_lock(&c->buffer_mutex);
|
|
av_frame_unref(frame);
|
|
pthread_mutex_unlock(&c->buffer_mutex);
|
|
av_frame_free(&frame);
|
|
if(got_packet) {
|
|
av_dup_packet(pkt);
|
|
} else {
|
|
pkt->data = NULL;
|
|
pkt->size = 0;
|
|
}
|
|
pthread_mutex_lock(&c->finished_task_mutex);
|
|
c->finished_tasks[task.index].outdata = pkt; pkt = NULL;
|
|
c->finished_tasks[task.index].return_code = ret;
|
|
pthread_cond_signal(&c->finished_task_cond);
|
|
pthread_mutex_unlock(&c->finished_task_mutex);
|
|
}
|
|
end:
|
|
av_free(pkt);
|
|
pthread_mutex_lock(&c->buffer_mutex);
|
|
avcodec_close(avctx);
|
|
pthread_mutex_unlock(&c->buffer_mutex);
|
|
av_freep(&avctx);
|
|
return NULL;
|
|
}
|
|
|
|
int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
|
|
int i=0;
|
|
ThreadContext *c;
|
|
|
|
|
|
if( !(avctx->thread_type & FF_THREAD_FRAME)
|
|
|| !(avctx->codec->capabilities & CODEC_CAP_INTRA_ONLY))
|
|
return 0;
|
|
|
|
if(!avctx->thread_count) {
|
|
avctx->thread_count = ff_get_logical_cpus(avctx);
|
|
avctx->thread_count = FFMIN(avctx->thread_count, MAX_THREADS);
|
|
}
|
|
|
|
if(avctx->thread_count <= 1)
|
|
return 0;
|
|
|
|
if(avctx->thread_count > MAX_THREADS)
|
|
return AVERROR(EINVAL);
|
|
|
|
av_assert0(!avctx->internal->frame_thread_encoder);
|
|
c = avctx->internal->frame_thread_encoder = av_mallocz(sizeof(ThreadContext));
|
|
if(!c)
|
|
return AVERROR(ENOMEM);
|
|
|
|
c->parent_avctx = avctx;
|
|
|
|
c->task_fifo = av_fifo_alloc(sizeof(Task) * BUFFER_SIZE);
|
|
if(!c->task_fifo)
|
|
goto fail;
|
|
|
|
pthread_mutex_init(&c->task_fifo_mutex, NULL);
|
|
pthread_mutex_init(&c->finished_task_mutex, NULL);
|
|
pthread_mutex_init(&c->buffer_mutex, NULL);
|
|
pthread_cond_init(&c->task_fifo_cond, NULL);
|
|
pthread_cond_init(&c->finished_task_cond, NULL);
|
|
|
|
for(i=0; i<avctx->thread_count ; i++){
|
|
AVDictionary *tmp = NULL;
|
|
void *tmpv;
|
|
AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec);
|
|
if(!thread_avctx)
|
|
goto fail;
|
|
tmpv = thread_avctx->priv_data;
|
|
*thread_avctx = *avctx;
|
|
thread_avctx->priv_data = tmpv;
|
|
thread_avctx->internal = NULL;
|
|
memcpy(thread_avctx->priv_data, avctx->priv_data, avctx->codec->priv_data_size);
|
|
thread_avctx->thread_count = 1;
|
|
thread_avctx->active_thread_type &= ~FF_THREAD_FRAME;
|
|
|
|
av_dict_copy(&tmp, options, 0);
|
|
av_dict_set(&tmp, "threads", "1", 0);
|
|
if(avcodec_open2(thread_avctx, avctx->codec, &tmp) < 0) {
|
|
av_dict_free(&tmp);
|
|
goto fail;
|
|
}
|
|
av_dict_free(&tmp);
|
|
av_assert0(!thread_avctx->internal->frame_thread_encoder);
|
|
thread_avctx->internal->frame_thread_encoder = c;
|
|
if(pthread_create(&c->worker[i], NULL, worker, thread_avctx)) {
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
avctx->active_thread_type = FF_THREAD_FRAME;
|
|
|
|
return 0;
|
|
fail:
|
|
avctx->thread_count = i;
|
|
av_log(avctx, AV_LOG_ERROR, "ff_frame_thread_encoder_init failed\n");
|
|
ff_frame_thread_encoder_free(avctx);
|
|
return -1;
|
|
}
|
|
|
|
void ff_frame_thread_encoder_free(AVCodecContext *avctx){
|
|
int i;
|
|
ThreadContext *c= avctx->internal->frame_thread_encoder;
|
|
|
|
pthread_mutex_lock(&c->task_fifo_mutex);
|
|
c->exit = 1;
|
|
pthread_cond_broadcast(&c->task_fifo_cond);
|
|
pthread_mutex_unlock(&c->task_fifo_mutex);
|
|
|
|
for (i=0; i<avctx->thread_count; i++) {
|
|
pthread_join(c->worker[i], NULL);
|
|
}
|
|
|
|
pthread_mutex_destroy(&c->task_fifo_mutex);
|
|
pthread_mutex_destroy(&c->finished_task_mutex);
|
|
pthread_mutex_destroy(&c->buffer_mutex);
|
|
pthread_cond_destroy(&c->task_fifo_cond);
|
|
pthread_cond_destroy(&c->finished_task_cond);
|
|
av_fifo_free(c->task_fifo); c->task_fifo = NULL;
|
|
av_freep(&avctx->internal->frame_thread_encoder);
|
|
}
|
|
|
|
int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet_ptr){
|
|
ThreadContext *c = avctx->internal->frame_thread_encoder;
|
|
Task task;
|
|
int ret;
|
|
|
|
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;
|
|
}
|
|
|
|
task.index = c->task_index;
|
|
task.indata = (void*)frame;
|
|
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);
|
|
pthread_mutex_unlock(&c->task_fifo_mutex);
|
|
|
|
c->task_index = (c->task_index+1) % BUFFER_SIZE;
|
|
|
|
if(!c->finished_tasks[c->finished_task_index].outdata && (c->task_index - c->finished_task_index) % BUFFER_SIZE <= avctx->thread_count)
|
|
return 0;
|
|
}
|
|
|
|
if(c->task_index == c->finished_task_index)
|
|
return 0;
|
|
|
|
pthread_mutex_lock(&c->finished_task_mutex);
|
|
while (!c->finished_tasks[c->finished_task_index].outdata) {
|
|
pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex);
|
|
}
|
|
task = c->finished_tasks[c->finished_task_index];
|
|
*pkt = *(AVPacket*)(task.outdata);
|
|
if(pkt->data)
|
|
*got_packet_ptr = 1;
|
|
av_freep(&c->finished_tasks[c->finished_task_index].outdata);
|
|
c->finished_task_index = (c->finished_task_index+1) % BUFFER_SIZE;
|
|
pthread_mutex_unlock(&c->finished_task_mutex);
|
|
|
|
return task.return_code;
|
|
}
|