mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02: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>
144 lines
4.6 KiB
C
144 lines
4.6 KiB
C
/*
|
|
* Xiph CELT decoder using libcelt
|
|
* Copyright (c) 2011 Nicolas George
|
|
*
|
|
* 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 <celt/celt.h>
|
|
#include <celt/celt_header.h>
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
#include "libavutil/intreadwrite.h"
|
|
|
|
struct libcelt_context {
|
|
CELTMode *mode;
|
|
CELTDecoder *dec;
|
|
int discard;
|
|
};
|
|
|
|
static int ff_celt_error_to_averror(int err)
|
|
{
|
|
switch (err) {
|
|
case CELT_BAD_ARG: return AVERROR(EINVAL);
|
|
#ifdef CELT_BUFFER_TOO_SMALL
|
|
case CELT_BUFFER_TOO_SMALL: return AVERROR(ENOBUFS);
|
|
#endif
|
|
case CELT_INTERNAL_ERROR: return AVERROR(EFAULT);
|
|
case CELT_CORRUPTED_DATA: return AVERROR_INVALIDDATA;
|
|
case CELT_UNIMPLEMENTED: return AVERROR(ENOSYS);
|
|
#ifdef ENOTRECOVERABLE
|
|
case CELT_INVALID_STATE: return AVERROR(ENOTRECOVERABLE);
|
|
#endif
|
|
case CELT_ALLOC_FAIL: return AVERROR(ENOMEM);
|
|
default: return AVERROR(EINVAL);
|
|
}
|
|
}
|
|
|
|
static int ff_celt_bitstream_version_hack(CELTMode *mode)
|
|
{
|
|
CELTHeader header = { .version_id = 0 };
|
|
celt_header_init(&header, mode, 960, 2);
|
|
return header.version_id;
|
|
}
|
|
|
|
static av_cold int libcelt_dec_init(AVCodecContext *c)
|
|
{
|
|
struct libcelt_context *celt = c->priv_data;
|
|
int err;
|
|
|
|
if (!c->channels || !c->frame_size ||
|
|
c->frame_size > INT_MAX / sizeof(int16_t) / c->channels)
|
|
return AVERROR(EINVAL);
|
|
celt->mode = celt_mode_create(c->sample_rate, c->frame_size, &err);
|
|
if (!celt->mode)
|
|
return ff_celt_error_to_averror(err);
|
|
celt->dec = celt_decoder_create_custom(celt->mode, c->channels, &err);
|
|
if (!celt->dec) {
|
|
celt_mode_destroy(celt->mode);
|
|
return ff_celt_error_to_averror(err);
|
|
}
|
|
if (c->extradata_size >= 4) {
|
|
celt->discard = AV_RL32(c->extradata);
|
|
if (celt->discard < 0 || celt->discard >= c->frame_size) {
|
|
av_log(c, AV_LOG_WARNING,
|
|
"Invalid overlap (%d), ignored.\n", celt->discard);
|
|
celt->discard = 0;
|
|
}
|
|
}
|
|
if (c->extradata_size >= 8) {
|
|
unsigned version = AV_RL32(c->extradata + 4);
|
|
unsigned lib_version = ff_celt_bitstream_version_hack(celt->mode);
|
|
if (version != lib_version)
|
|
av_log(c, AV_LOG_WARNING,
|
|
"CELT bitstream version 0x%x may be "
|
|
"improperly decoded by libcelt for version 0x%x.\n",
|
|
version, lib_version);
|
|
}
|
|
c->sample_fmt = AV_SAMPLE_FMT_S16;
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int libcelt_dec_close(AVCodecContext *c)
|
|
{
|
|
struct libcelt_context *celt = c->priv_data;
|
|
|
|
celt_decoder_destroy(celt->dec);
|
|
celt_mode_destroy(celt->mode);
|
|
return 0;
|
|
}
|
|
|
|
static int libcelt_dec_decode(AVCodecContext *c, void *data,
|
|
int *got_frame_ptr, AVPacket *pkt)
|
|
{
|
|
struct libcelt_context *celt = c->priv_data;
|
|
AVFrame *frame = data;
|
|
int err;
|
|
int16_t *pcm;
|
|
|
|
frame->nb_samples = c->frame_size;
|
|
err = ff_get_buffer(c, frame, 0);
|
|
if (err < 0) {
|
|
av_log(c, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return err;
|
|
}
|
|
pcm = (int16_t *)frame->data[0];
|
|
err = celt_decode(celt->dec, pkt->data, pkt->size, pcm, c->frame_size);
|
|
if (err < 0)
|
|
return ff_celt_error_to_averror(err);
|
|
if (celt->discard) {
|
|
frame->nb_samples -= celt->discard;
|
|
memmove(pcm, pcm + celt->discard * c->channels,
|
|
frame->nb_samples * c->channels * sizeof(int16_t));
|
|
celt->discard = 0;
|
|
}
|
|
*got_frame_ptr = 1;
|
|
return pkt->size;
|
|
}
|
|
|
|
AVCodec ff_libcelt_decoder = {
|
|
.name = "libcelt",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_CELT,
|
|
.priv_data_size = sizeof(struct libcelt_context),
|
|
.init = libcelt_dec_init,
|
|
.close = libcelt_dec_close,
|
|
.decode = libcelt_dec_decode,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Xiph CELT decoder using libcelt"),
|
|
};
|