* 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>
202 lines
6.8 KiB
C
202 lines
6.8 KiB
C
/*
|
|
* Opus decoder using libopus
|
|
* Copyright (c) 2012 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 <opus.h>
|
|
#include <opus_multistream.h>
|
|
|
|
#include "libavutil/avassert.h"
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
#include "vorbis.h"
|
|
#include "mathops.h"
|
|
#include "libopus.h"
|
|
|
|
struct libopus_context {
|
|
OpusMSDecoder *dec;
|
|
int pre_skip;
|
|
#ifndef OPUS_SET_GAIN
|
|
union { int i; double d; } gain;
|
|
#endif
|
|
};
|
|
|
|
#define OPUS_HEAD_SIZE 19
|
|
|
|
static av_cold int libopus_decode_init(AVCodecContext *avc)
|
|
{
|
|
struct libopus_context *opus = avc->priv_data;
|
|
int ret, channel_map = 0, gain_db = 0, nb_streams, nb_coupled;
|
|
uint8_t mapping_arr[8] = { 0, 1 }, *mapping;
|
|
|
|
avc->sample_rate = 48000;
|
|
avc->sample_fmt = avc->request_sample_fmt == AV_SAMPLE_FMT_FLT ?
|
|
AV_SAMPLE_FMT_FLT : AV_SAMPLE_FMT_S16;
|
|
avc->channel_layout = avc->channels > 8 ? 0 :
|
|
ff_vorbis_channel_layouts[avc->channels - 1];
|
|
|
|
if (avc->extradata_size >= OPUS_HEAD_SIZE) {
|
|
opus->pre_skip = AV_RL16(avc->extradata + 10);
|
|
gain_db = sign_extend(AV_RL16(avc->extradata + 16), 16);
|
|
channel_map = AV_RL8 (avc->extradata + 18);
|
|
}
|
|
if (avc->extradata_size >= OPUS_HEAD_SIZE + 2 + avc->channels) {
|
|
nb_streams = avc->extradata[OPUS_HEAD_SIZE + 0];
|
|
nb_coupled = avc->extradata[OPUS_HEAD_SIZE + 1];
|
|
if (nb_streams + nb_coupled != avc->channels)
|
|
av_log(avc, AV_LOG_WARNING, "Inconsistent channel mapping.\n");
|
|
mapping = avc->extradata + OPUS_HEAD_SIZE + 2;
|
|
} else {
|
|
if (avc->channels > 2 || channel_map) {
|
|
av_log(avc, AV_LOG_ERROR,
|
|
"No channel mapping for %d channels.\n", avc->channels);
|
|
return AVERROR(EINVAL);
|
|
}
|
|
nb_streams = 1;
|
|
nb_coupled = avc->channels > 1;
|
|
mapping = mapping_arr;
|
|
}
|
|
|
|
if (avc->channels > 2 && avc->channels <= 8) {
|
|
const uint8_t *vorbis_offset = ff_vorbis_channel_layout_offsets[avc->channels - 1];
|
|
int ch;
|
|
|
|
/* Remap channels from vorbis order to ffmpeg order */
|
|
for (ch = 0; ch < avc->channels; ch++)
|
|
mapping_arr[ch] = mapping[vorbis_offset[ch]];
|
|
mapping = mapping_arr;
|
|
}
|
|
|
|
opus->dec = opus_multistream_decoder_create(avc->sample_rate, avc->channels,
|
|
nb_streams, nb_coupled,
|
|
mapping, &ret);
|
|
if (!opus->dec) {
|
|
av_log(avc, AV_LOG_ERROR, "Unable to create decoder: %s\n",
|
|
opus_strerror(ret));
|
|
return ff_opus_error_to_averror(ret);
|
|
}
|
|
|
|
#ifdef OPUS_SET_GAIN
|
|
ret = opus_multistream_decoder_ctl(opus->dec, OPUS_SET_GAIN(gain_db));
|
|
if (ret != OPUS_OK)
|
|
av_log(avc, AV_LOG_WARNING, "Failed to set gain: %s\n",
|
|
opus_strerror(ret));
|
|
#else
|
|
{
|
|
double gain_lin = pow(10, gain_db / (20.0 * 256));
|
|
if (avc->sample_fmt == AV_SAMPLE_FMT_FLT)
|
|
opus->gain.d = gain_lin;
|
|
else
|
|
opus->gain.i = FFMIN(gain_lin * 65536, INT_MAX);
|
|
}
|
|
#endif
|
|
|
|
avc->internal->skip_samples = opus->pre_skip;
|
|
avc->delay = 3840; /* Decoder delay (in samples) at 48kHz */
|
|
|
|
return 0;
|
|
}
|
|
|
|
static av_cold int libopus_decode_close(AVCodecContext *avc)
|
|
{
|
|
struct libopus_context *opus = avc->priv_data;
|
|
|
|
opus_multistream_decoder_destroy(opus->dec);
|
|
return 0;
|
|
}
|
|
|
|
#define MAX_FRAME_SIZE (960 * 6)
|
|
|
|
static int libopus_decode(AVCodecContext *avc, void *data,
|
|
int *got_frame_ptr, AVPacket *pkt)
|
|
{
|
|
struct libopus_context *opus = avc->priv_data;
|
|
AVFrame *frame = data;
|
|
int ret, nb_samples;
|
|
|
|
frame->nb_samples = MAX_FRAME_SIZE;
|
|
ret = ff_get_buffer(avc, frame, 0);
|
|
if (ret < 0) {
|
|
av_log(avc, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
|
|
if (avc->sample_fmt == AV_SAMPLE_FMT_S16)
|
|
nb_samples = opus_multistream_decode(opus->dec, pkt->data, pkt->size,
|
|
(opus_int16 *)frame->data[0],
|
|
frame->nb_samples, 0);
|
|
else
|
|
nb_samples = opus_multistream_decode_float(opus->dec, pkt->data, pkt->size,
|
|
(float *)frame->data[0],
|
|
frame->nb_samples, 0);
|
|
|
|
if (nb_samples < 0) {
|
|
av_log(avc, AV_LOG_ERROR, "Decoding error: %s\n",
|
|
opus_strerror(nb_samples));
|
|
return ff_opus_error_to_averror(nb_samples);
|
|
}
|
|
|
|
#ifndef OPUS_SET_GAIN
|
|
{
|
|
int i = avc->channels * nb_samples;
|
|
if (avc->sample_fmt == AV_SAMPLE_FMT_FLT) {
|
|
float *pcm = (float *)frame->data[0];
|
|
for (; i > 0; i--, pcm++)
|
|
*pcm = av_clipf(*pcm * opus->gain.d, -1, 1);
|
|
} else {
|
|
int16_t *pcm = (int16_t *)frame->data[0];
|
|
for (; i > 0; i--, pcm++)
|
|
*pcm = av_clip_int16(((int64_t)opus->gain.i * *pcm) >> 16);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
frame->nb_samples = nb_samples;
|
|
*got_frame_ptr = 1;
|
|
|
|
return pkt->size;
|
|
}
|
|
|
|
static void libopus_flush(AVCodecContext *avc)
|
|
{
|
|
struct libopus_context *opus = avc->priv_data;
|
|
|
|
opus_multistream_decoder_ctl(opus->dec, OPUS_RESET_STATE);
|
|
/* The stream can have been extracted by a tool that is not Opus-aware.
|
|
Therefore, any packet can become the first of the stream. */
|
|
avc->internal->skip_samples = opus->pre_skip;
|
|
}
|
|
|
|
AVCodec ff_libopus_decoder = {
|
|
.name = "libopus",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_OPUS,
|
|
.priv_data_size = sizeof(struct libopus_context),
|
|
.init = libopus_decode_init,
|
|
.close = libopus_decode_close,
|
|
.decode = libopus_decode,
|
|
.flush = libopus_flush,
|
|
.capabilities = CODEC_CAP_DR1,
|
|
.long_name = NULL_IF_CONFIG_SMALL("libopus Opus"),
|
|
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
|
|
AV_SAMPLE_FMT_S16,
|
|
AV_SAMPLE_FMT_NONE },
|
|
};
|