mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* 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>
219 lines
6.8 KiB
C
219 lines
6.8 KiB
C
/*
|
|
* Copyright (C) 2008 Jaikrishnan Menon
|
|
* Copyright (C) 2011 Stefano Sabatini
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* 8svx audio decoder
|
|
* @author Jaikrishnan Menon
|
|
*
|
|
* supports: fibonacci delta encoding
|
|
* : exponential encoding
|
|
*
|
|
* For more information about the 8SVX format:
|
|
* http://netghost.narod.ru/gff/vendspec/iff/iff.txt
|
|
* http://sox.sourceforge.net/AudioFormats-11.html
|
|
* http://aminet.net/package/mus/misc/wavepak
|
|
* http://amigan.1emu.net/reg/8SVX.txt
|
|
*
|
|
* Samples can be found here:
|
|
* http://aminet.net/mods/smpl/
|
|
*/
|
|
|
|
#include "libavutil/avassert.h"
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
#include "libavutil/common.h"
|
|
|
|
/** decoder context */
|
|
typedef struct EightSvxContext {
|
|
uint8_t fib_acc[2];
|
|
const int8_t *table;
|
|
|
|
/* buffer used to store the whole first packet.
|
|
data is only sent as one large packet */
|
|
uint8_t *data[2];
|
|
int data_size;
|
|
int data_idx;
|
|
} EightSvxContext;
|
|
|
|
static const int8_t fibonacci[16] = { -34, -21, -13, -8, -5, -3, -2, -1, 0, 1, 2, 3, 5, 8, 13, 21 };
|
|
static const int8_t exponential[16] = { -128, -64, -32, -16, -8, -4, -2, -1, 0, 1, 2, 4, 8, 16, 32, 64 };
|
|
|
|
#define MAX_FRAME_SIZE 2048
|
|
|
|
/**
|
|
* Delta decode the compressed values in src, and put the resulting
|
|
* decoded samples in dst.
|
|
*
|
|
* @param[in,out] state starting value. it is saved for use in the next call.
|
|
* @param table delta sequence table
|
|
*/
|
|
static void delta_decode(uint8_t *dst, const uint8_t *src, int src_size,
|
|
uint8_t *state, const int8_t *table)
|
|
{
|
|
uint8_t val = *state;
|
|
|
|
while (src_size--) {
|
|
uint8_t d = *src++;
|
|
val = av_clip_uint8(val + table[d & 0xF]);
|
|
*dst++ = val;
|
|
val = av_clip_uint8(val + table[d >> 4]);
|
|
*dst++ = val;
|
|
}
|
|
|
|
*state = val;
|
|
}
|
|
|
|
/** decode a frame */
|
|
static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
|
|
int *got_frame_ptr, AVPacket *avpkt)
|
|
{
|
|
EightSvxContext *esc = avctx->priv_data;
|
|
AVFrame *frame = data;
|
|
int buf_size;
|
|
int ch, ret;
|
|
int hdr_size = 2;
|
|
|
|
/* decode and interleave the first packet */
|
|
if (!esc->data[0] && avpkt) {
|
|
int chan_size = avpkt->size / avctx->channels - hdr_size;
|
|
|
|
if (avpkt->size % avctx->channels) {
|
|
av_log(avctx, AV_LOG_WARNING, "Packet with odd size, ignoring last byte\n");
|
|
}
|
|
if (avpkt->size < (hdr_size + 1) * avctx->channels) {
|
|
av_log(avctx, AV_LOG_ERROR, "packet size is too small\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
|
|
esc->fib_acc[0] = avpkt->data[1] + 128;
|
|
if (avctx->channels == 2)
|
|
esc->fib_acc[1] = avpkt->data[2+chan_size+1] + 128;
|
|
|
|
esc->data_idx = 0;
|
|
esc->data_size = chan_size;
|
|
if (!(esc->data[0] = av_malloc(chan_size)))
|
|
return AVERROR(ENOMEM);
|
|
if (avctx->channels == 2) {
|
|
if (!(esc->data[1] = av_malloc(chan_size))) {
|
|
av_freep(&esc->data[0]);
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
}
|
|
memcpy(esc->data[0], &avpkt->data[hdr_size], chan_size);
|
|
if (avctx->channels == 2)
|
|
memcpy(esc->data[1], &avpkt->data[2*hdr_size+chan_size], chan_size);
|
|
}
|
|
if (!esc->data[0]) {
|
|
av_log(avctx, AV_LOG_ERROR, "unexpected empty packet\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
|
|
/* decode next piece of data from the buffer */
|
|
buf_size = FFMIN(MAX_FRAME_SIZE, esc->data_size - esc->data_idx);
|
|
if (buf_size <= 0) {
|
|
*got_frame_ptr = 0;
|
|
return avpkt->size;
|
|
}
|
|
|
|
/* get output buffer */
|
|
frame->nb_samples = buf_size * 2;
|
|
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
for (ch = 0; ch < avctx->channels; ch++) {
|
|
delta_decode(frame->data[ch], &esc->data[ch][esc->data_idx],
|
|
buf_size, &esc->fib_acc[ch], esc->table);
|
|
}
|
|
|
|
esc->data_idx += buf_size;
|
|
|
|
*got_frame_ptr = 1;
|
|
|
|
return ((avctx->frame_number == 0)*hdr_size + buf_size)*avctx->channels;
|
|
}
|
|
|
|
static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
|
|
{
|
|
EightSvxContext *esc = avctx->priv_data;
|
|
|
|
if (avctx->channels < 1 || avctx->channels > 2) {
|
|
av_log(avctx, AV_LOG_ERROR, "8SVX does not support more than 2 channels\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
switch (avctx->codec->id) {
|
|
case AV_CODEC_ID_8SVX_FIB: esc->table = fibonacci; break;
|
|
case AV_CODEC_ID_8SVX_EXP: esc->table = exponential; break;
|
|
default:
|
|
av_log(avctx, AV_LOG_ERROR, "Invalid codec id %d.\n", avctx->codec->id);
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
avctx->sample_fmt = AV_SAMPLE_FMT_U8P;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int eightsvx_decode_close(AVCodecContext *avctx)
|
|
{
|
|
EightSvxContext *esc = avctx->priv_data;
|
|
|
|
av_freep(&esc->data[0]);
|
|
av_freep(&esc->data[1]);
|
|
esc->data_size = 0;
|
|
esc->data_idx = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if CONFIG_EIGHTSVX_FIB_DECODER
|
|
AVCodec ff_eightsvx_fib_decoder = {
|
|
.name = "8svx_fib",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_8SVX_FIB,
|
|
.priv_data_size = sizeof (EightSvxContext),
|
|
.init = eightsvx_decode_init,
|
|
.decode = eightsvx_decode_frame,
|
|
.close = eightsvx_decode_close,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
|
|
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
|
|
AV_SAMPLE_FMT_NONE },
|
|
};
|
|
#endif
|
|
#if CONFIG_EIGHTSVX_EXP_DECODER
|
|
AVCodec ff_eightsvx_exp_decoder = {
|
|
.name = "8svx_exp",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_8SVX_EXP,
|
|
.priv_data_size = sizeof (EightSvxContext),
|
|
.init = eightsvx_decode_init,
|
|
.decode = eightsvx_decode_frame,
|
|
.close = eightsvx_decode_close,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"),
|
|
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
|
|
AV_SAMPLE_FMT_NONE },
|
|
};
|
|
#endif
|