mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-11-02 23:24:01 +08:00
* 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>
212 lines
6.8 KiB
C
212 lines
6.8 KiB
C
/*
|
|
* NellyMoser audio decoder
|
|
* Copyright (c) 2007 a840bda5870ba11f19698ff6eb9581dfb0f95fa5,
|
|
* 539459aeb7d425140b62a3ec7dbf6dc8e408a306, and
|
|
* 520e17cd55896441042b14df2566a6eb610ed444
|
|
* Copyright (c) 2007 Loic Minier <lool at dooz.org>
|
|
* Benjamin Larsson
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* The 3 alphanumeric copyright notices are md5summed they are from the original
|
|
* implementors. The original code is available from http://code.google.com/p/nelly2pcm/
|
|
*/
|
|
|
|
#include "libavutil/channel_layout.h"
|
|
#include "libavutil/float_dsp.h"
|
|
#include "libavutil/lfg.h"
|
|
#include "libavutil/random_seed.h"
|
|
#include "avcodec.h"
|
|
#include "fft.h"
|
|
#include "fmtconvert.h"
|
|
#include "internal.h"
|
|
#include "nellymoser.h"
|
|
#include "sinewin.h"
|
|
|
|
#define BITSTREAM_READER_LE
|
|
#include "get_bits.h"
|
|
|
|
|
|
typedef struct NellyMoserDecodeContext {
|
|
AVCodecContext* avctx;
|
|
AVLFG random_state;
|
|
GetBitContext gb;
|
|
float scale_bias;
|
|
AVFloatDSPContext fdsp;
|
|
FFTContext imdct_ctx;
|
|
DECLARE_ALIGNED(32, float, imdct_buf)[2][NELLY_BUF_LEN];
|
|
float *imdct_out;
|
|
float *imdct_prev;
|
|
} NellyMoserDecodeContext;
|
|
|
|
static void nelly_decode_block(NellyMoserDecodeContext *s,
|
|
const unsigned char block[NELLY_BLOCK_LEN],
|
|
float audio[NELLY_SAMPLES])
|
|
{
|
|
int i,j;
|
|
float buf[NELLY_FILL_LEN], pows[NELLY_FILL_LEN];
|
|
float *aptr, *bptr, *pptr, val, pval;
|
|
int bits[NELLY_BUF_LEN];
|
|
unsigned char v;
|
|
|
|
init_get_bits(&s->gb, block, NELLY_BLOCK_LEN * 8);
|
|
|
|
bptr = buf;
|
|
pptr = pows;
|
|
val = ff_nelly_init_table[get_bits(&s->gb, 6)];
|
|
for (i=0 ; i<NELLY_BANDS ; i++) {
|
|
if (i > 0)
|
|
val += ff_nelly_delta_table[get_bits(&s->gb, 5)];
|
|
pval = -pow(2, val/2048) * s->scale_bias;
|
|
for (j = 0; j < ff_nelly_band_sizes_table[i]; j++) {
|
|
*bptr++ = val;
|
|
*pptr++ = pval;
|
|
}
|
|
|
|
}
|
|
|
|
ff_nelly_get_sample_bits(buf, bits);
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
aptr = audio + i * NELLY_BUF_LEN;
|
|
|
|
init_get_bits(&s->gb, block, NELLY_BLOCK_LEN * 8);
|
|
skip_bits_long(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS);
|
|
|
|
for (j = 0; j < NELLY_FILL_LEN; j++) {
|
|
if (bits[j] <= 0) {
|
|
aptr[j] = M_SQRT1_2*pows[j];
|
|
if (av_lfg_get(&s->random_state) & 1)
|
|
aptr[j] *= -1.0;
|
|
} else {
|
|
v = get_bits(&s->gb, bits[j]);
|
|
aptr[j] = ff_nelly_dequantization_table[(1<<bits[j])-1+v]*pows[j];
|
|
}
|
|
}
|
|
memset(&aptr[NELLY_FILL_LEN], 0,
|
|
(NELLY_BUF_LEN - NELLY_FILL_LEN) * sizeof(float));
|
|
|
|
s->imdct_ctx.imdct_half(&s->imdct_ctx, s->imdct_out, aptr);
|
|
s->fdsp.vector_fmul_window(aptr, s->imdct_prev + NELLY_BUF_LEN / 2,
|
|
s->imdct_out, ff_sine_128,
|
|
NELLY_BUF_LEN / 2);
|
|
FFSWAP(float *, s->imdct_out, s->imdct_prev);
|
|
}
|
|
}
|
|
|
|
static av_cold int decode_init(AVCodecContext * avctx) {
|
|
NellyMoserDecodeContext *s = avctx->priv_data;
|
|
|
|
s->avctx = avctx;
|
|
s->imdct_out = s->imdct_buf[0];
|
|
s->imdct_prev = s->imdct_buf[1];
|
|
av_lfg_init(&s->random_state, 0);
|
|
ff_mdct_init(&s->imdct_ctx, 8, 1, 1.0);
|
|
|
|
avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
|
|
|
|
s->scale_bias = 1.0/(32768*8);
|
|
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
|
|
|
|
/* Generate overlap window */
|
|
if (!ff_sine_128[127])
|
|
ff_init_ff_sine_windows(7);
|
|
|
|
avctx->channels = 1;
|
|
avctx->channel_layout = AV_CH_LAYOUT_MONO;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int decode_tag(AVCodecContext *avctx, void *data,
|
|
int *got_frame_ptr, AVPacket *avpkt)
|
|
{
|
|
AVFrame *frame = data;
|
|
const uint8_t *buf = avpkt->data;
|
|
const uint8_t *side=av_packet_get_side_data(avpkt, 'F', NULL);
|
|
int buf_size = avpkt->size;
|
|
NellyMoserDecodeContext *s = avctx->priv_data;
|
|
int blocks, i, ret;
|
|
float *samples_flt;
|
|
|
|
blocks = buf_size / NELLY_BLOCK_LEN;
|
|
|
|
if (blocks <= 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
if (buf_size % NELLY_BLOCK_LEN) {
|
|
av_log(avctx, AV_LOG_WARNING, "Leftover bytes: %d.\n",
|
|
buf_size % NELLY_BLOCK_LEN);
|
|
}
|
|
/* Normal numbers of blocks for sample rates:
|
|
* 8000 Hz - 1
|
|
* 11025 Hz - 2
|
|
* 16000 Hz - 3
|
|
* 22050 Hz - 4
|
|
* 44100 Hz - 8
|
|
*/
|
|
if(side && blocks>1 && avctx->sample_rate%11025==0 && (1<<((side[0]>>2)&3)) == blocks)
|
|
avctx->sample_rate= 11025*(blocks/2);
|
|
|
|
/* get output buffer */
|
|
frame->nb_samples = NELLY_SAMPLES * blocks;
|
|
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
samples_flt = (float *)frame->data[0];
|
|
|
|
for (i=0 ; i<blocks ; i++) {
|
|
nelly_decode_block(s, buf, samples_flt);
|
|
samples_flt += NELLY_SAMPLES;
|
|
buf += NELLY_BLOCK_LEN;
|
|
}
|
|
|
|
*got_frame_ptr = 1;
|
|
|
|
return buf_size;
|
|
}
|
|
|
|
static av_cold int decode_end(AVCodecContext * avctx) {
|
|
NellyMoserDecodeContext *s = avctx->priv_data;
|
|
|
|
ff_mdct_end(&s->imdct_ctx);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVCodec ff_nellymoser_decoder = {
|
|
.name = "nellymoser",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_NELLYMOSER,
|
|
.priv_data_size = sizeof(NellyMoserDecodeContext),
|
|
.init = decode_init,
|
|
.close = decode_end,
|
|
.decode = decode_tag,
|
|
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE,
|
|
.long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
|
|
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT,
|
|
AV_SAMPLE_FMT_NONE },
|
|
};
|