Merge commit '759001c534'
* commit '759001c534': 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 '759001c534' 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>
This commit is contained in:
Michael Niedermayer
commit
80e9e63c94
275 changed files with 4180 additions and 4878 deletions
|
|
@ -25,6 +25,7 @@
|
|||
*/
|
||||
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/frame.h"
|
||||
#include "libavutil/lfg.h"
|
||||
#include "libavutil/xga_font_data.h"
|
||||
#include "avcodec.h"
|
||||
|
|
@ -50,7 +51,7 @@ static const uint8_t ansi_to_cga[16] = {
|
|||
};
|
||||
|
||||
typedef struct {
|
||||
AVFrame frame;
|
||||
AVFrame *frame;
|
||||
int x; /**< x cursor position (pixels) */
|
||||
int y; /**< y cursor position (pixels) */
|
||||
int sx; /**< saved x cursor position (pixels) */
|
||||
|
|
@ -79,13 +80,16 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
|||
AnsiContext *s = avctx->priv_data;
|
||||
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
||||
|
||||
s->frame = av_frame_alloc();
|
||||
if (!s->frame)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
/* defaults */
|
||||
s->font = avpriv_vga16_font;
|
||||
s->font_height = 16;
|
||||
s->fg = DEFAULT_FG_COLOR;
|
||||
s->bg = DEFAULT_BG_COLOR;
|
||||
|
||||
avcodec_get_frame_defaults(&s->frame);
|
||||
if (!avctx->width || !avctx->height)
|
||||
avcodec_set_dimensions(avctx, 80<<3, 25<<4);
|
||||
|
||||
|
|
@ -119,11 +123,11 @@ static void hscroll(AVCodecContext *avctx)
|
|||
|
||||
i = 0;
|
||||
for (; i < avctx->height - s->font_height; i++)
|
||||
memcpy(s->frame.data[0] + i * s->frame.linesize[0],
|
||||
s->frame.data[0] + (i + s->font_height) * s->frame.linesize[0],
|
||||
memcpy(s->frame->data[0] + i * s->frame->linesize[0],
|
||||
s->frame->data[0] + (i + s->font_height) * s->frame->linesize[0],
|
||||
avctx->width);
|
||||
for (; i < avctx->height; i++)
|
||||
memset(s->frame.data[0] + i * s->frame.linesize[0],
|
||||
memset(s->frame->data[0] + i * s->frame->linesize[0],
|
||||
DEFAULT_BG_COLOR, avctx->width);
|
||||
}
|
||||
|
||||
|
|
@ -132,7 +136,7 @@ static void erase_line(AVCodecContext * avctx, int xoffset, int xlength)
|
|||
AnsiContext *s = avctx->priv_data;
|
||||
int i;
|
||||
for (i = 0; i < s->font_height; i++)
|
||||
memset(s->frame.data[0] + (s->y + i)*s->frame.linesize[0] + xoffset,
|
||||
memset(s->frame->data[0] + (s->y + i)*s->frame->linesize[0] + xoffset,
|
||||
DEFAULT_BG_COLOR, xlength);
|
||||
}
|
||||
|
||||
|
|
@ -141,7 +145,7 @@ static void erase_screen(AVCodecContext *avctx)
|
|||
AnsiContext *s = avctx->priv_data;
|
||||
int i;
|
||||
for (i = 0; i < avctx->height; i++)
|
||||
memset(s->frame.data[0] + i * s->frame.linesize[0], DEFAULT_BG_COLOR, avctx->width);
|
||||
memset(s->frame->data[0] + i * s->frame->linesize[0], DEFAULT_BG_COLOR, avctx->width);
|
||||
s->x = s->y = 0;
|
||||
}
|
||||
|
||||
|
|
@ -162,8 +166,8 @@ static void draw_char(AVCodecContext *avctx, int c)
|
|||
FFSWAP(int, fg, bg);
|
||||
if ((s->attributes & ATTR_CONCEALED))
|
||||
fg = bg;
|
||||
ff_draw_pc_font(s->frame.data[0] + s->y * s->frame.linesize[0] + s->x,
|
||||
s->frame.linesize[0], s->font, s->font_height, c, fg, bg);
|
||||
ff_draw_pc_font(s->frame->data[0] + s->y * s->frame->linesize[0] + s->x,
|
||||
s->frame->linesize[0], s->font, s->font_height, c, fg, bg);
|
||||
s->x += FONT_WIDTH;
|
||||
if (s->x >= avctx->width) {
|
||||
s->x = 0;
|
||||
|
|
@ -240,17 +244,16 @@ static int execute_code(AVCodecContext * avctx, int c)
|
|||
av_log_ask_for_sample(avctx, "unsupported screen mode\n");
|
||||
}
|
||||
if (width != avctx->width || height != avctx->height) {
|
||||
if (s->frame.data[0])
|
||||
avctx->release_buffer(avctx, &s->frame);
|
||||
av_frame_unref(s->frame);
|
||||
avcodec_set_dimensions(avctx, width, height);
|
||||
ret = ff_get_buffer(avctx, &s->frame);
|
||||
ret = ff_get_buffer(avctx, s->frame, AV_GET_BUFFER_FLAG_REF);
|
||||
if (ret < 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
||||
return ret;
|
||||
}
|
||||
s->frame.pict_type = AV_PICTURE_TYPE_I;
|
||||
s->frame.palette_has_changed = 1;
|
||||
set_palette((uint32_t *)s->frame.data[1]);
|
||||
s->frame->pict_type = AV_PICTURE_TYPE_I;
|
||||
s->frame->palette_has_changed = 1;
|
||||
set_palette((uint32_t *)s->frame->data[1]);
|
||||
erase_screen(avctx);
|
||||
} else if (c == 'l') {
|
||||
erase_screen(avctx);
|
||||
|
|
@ -261,13 +264,13 @@ static int execute_code(AVCodecContext * avctx, int c)
|
|||
case 0:
|
||||
erase_line(avctx, s->x, avctx->width - s->x);
|
||||
if (s->y < avctx->height - s->font_height)
|
||||
memset(s->frame.data[0] + (s->y + s->font_height)*s->frame.linesize[0],
|
||||
DEFAULT_BG_COLOR, (avctx->height - s->y - s->font_height)*s->frame.linesize[0]);
|
||||
memset(s->frame->data[0] + (s->y + s->font_height)*s->frame->linesize[0],
|
||||
DEFAULT_BG_COLOR, (avctx->height - s->y - s->font_height)*s->frame->linesize[0]);
|
||||
break;
|
||||
case 1:
|
||||
erase_line(avctx, 0, s->x);
|
||||
if (s->y > 0)
|
||||
memset(s->frame.data[0], DEFAULT_BG_COLOR, s->y * s->frame.linesize[0]);
|
||||
memset(s->frame->data[0], DEFAULT_BG_COLOR, s->y * s->frame->linesize[0]);
|
||||
break;
|
||||
case 2:
|
||||
erase_screen(avctx);
|
||||
|
|
@ -348,20 +351,20 @@ static int decode_frame(AVCodecContext *avctx,
|
|||
const uint8_t *buf_end = buf+buf_size;
|
||||
int ret, i, count;
|
||||
|
||||
ret = avctx->reget_buffer(avctx, &s->frame);
|
||||
ret = ff_reget_buffer(avctx, s->frame);
|
||||
if (ret < 0){
|
||||
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
||||
return ret;
|
||||
}
|
||||
if (!avctx->frame_number) {
|
||||
for (i=0; i<avctx->height; i++)
|
||||
memset(s->frame.data[0]+ i*s->frame.linesize[0], 0, avctx->width);
|
||||
memset(s->frame.data[1], 0, AVPALETTE_SIZE);
|
||||
memset(s->frame->data[0]+ i*s->frame->linesize[0], 0, avctx->width);
|
||||
memset(s->frame->data[1], 0, AVPALETTE_SIZE);
|
||||
}
|
||||
|
||||
s->frame.pict_type = AV_PICTURE_TYPE_I;
|
||||
s->frame.palette_has_changed = 1;
|
||||
set_palette((uint32_t *)s->frame.data[1]);
|
||||
s->frame->pict_type = AV_PICTURE_TYPE_I;
|
||||
s->frame->palette_has_changed = 1;
|
||||
set_palette((uint32_t *)s->frame->data[1]);
|
||||
if (!s->first_frame) {
|
||||
erase_screen(avctx);
|
||||
s->first_frame = 1;
|
||||
|
|
@ -449,15 +452,16 @@ static int decode_frame(AVCodecContext *avctx,
|
|||
}
|
||||
|
||||
*got_frame = 1;
|
||||
*(AVFrame*)data = s->frame;
|
||||
if ((ret = av_frame_ref(data, s->frame)) < 0)
|
||||
return ret;
|
||||
return buf_size;
|
||||
}
|
||||
|
||||
static av_cold int decode_close(AVCodecContext *avctx)
|
||||
{
|
||||
AnsiContext *s = avctx->priv_data;
|
||||
if (s->frame.data[0])
|
||||
avctx->release_buffer(avctx, &s->frame);
|
||||
|
||||
av_frame_free(&s->frame);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue