mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-18 13:00:00 +01: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>
202 lines
6.4 KiB
C
202 lines
6.4 KiB
C
/*
|
|
* Copyright (c) 2002 Mark Hills <mark@pogo.org.uk>
|
|
*
|
|
* 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 <vorbis/vorbisenc.h>
|
|
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct OggVorbisDecContext {
|
|
vorbis_info vi; /**< vorbis_info used during init */
|
|
vorbis_dsp_state vd; /**< DSP state used for analysis */
|
|
vorbis_block vb; /**< vorbis_block used for analysis */
|
|
vorbis_comment vc; /**< VorbisComment info */
|
|
ogg_packet op; /**< ogg packet */
|
|
} OggVorbisDecContext;
|
|
|
|
static int oggvorbis_decode_init(AVCodecContext *avccontext) {
|
|
OggVorbisDecContext *context = avccontext->priv_data ;
|
|
uint8_t *p= avccontext->extradata;
|
|
int i, hsizes[3];
|
|
unsigned char *headers[3], *extradata = avccontext->extradata;
|
|
|
|
vorbis_info_init(&context->vi) ;
|
|
vorbis_comment_init(&context->vc) ;
|
|
|
|
if(! avccontext->extradata_size || ! p) {
|
|
av_log(avccontext, AV_LOG_ERROR, "vorbis extradata absent\n");
|
|
return -1;
|
|
}
|
|
|
|
if(p[0] == 0 && p[1] == 30) {
|
|
for(i = 0; i < 3; i++){
|
|
hsizes[i] = bytestream_get_be16((const uint8_t **)&p);
|
|
headers[i] = p;
|
|
p += hsizes[i];
|
|
}
|
|
} else if(*p == 2) {
|
|
unsigned int offset = 1;
|
|
p++;
|
|
for(i=0; i<2; i++) {
|
|
hsizes[i] = 0;
|
|
while((*p == 0xFF) && (offset < avccontext->extradata_size)) {
|
|
hsizes[i] += 0xFF;
|
|
offset++;
|
|
p++;
|
|
}
|
|
if(offset >= avccontext->extradata_size - 1) {
|
|
av_log(avccontext, AV_LOG_ERROR,
|
|
"vorbis header sizes damaged\n");
|
|
return -1;
|
|
}
|
|
hsizes[i] += *p;
|
|
offset++;
|
|
p++;
|
|
}
|
|
hsizes[2] = avccontext->extradata_size - hsizes[0]-hsizes[1]-offset;
|
|
#if 0
|
|
av_log(avccontext, AV_LOG_DEBUG,
|
|
"vorbis header sizes: %d, %d, %d, / extradata_len is %d \n",
|
|
hsizes[0], hsizes[1], hsizes[2], avccontext->extradata_size);
|
|
#endif
|
|
headers[0] = extradata + offset;
|
|
headers[1] = extradata + offset + hsizes[0];
|
|
headers[2] = extradata + offset + hsizes[0] + hsizes[1];
|
|
} else {
|
|
av_log(avccontext, AV_LOG_ERROR,
|
|
"vorbis initial header len is wrong: %d\n", *p);
|
|
return -1;
|
|
}
|
|
|
|
for(i=0; i<3; i++){
|
|
context->op.b_o_s= i==0;
|
|
context->op.bytes = hsizes[i];
|
|
context->op.packet = headers[i];
|
|
if(vorbis_synthesis_headerin(&context->vi, &context->vc, &context->op)<0){
|
|
av_log(avccontext, AV_LOG_ERROR, "%d. vorbis header damaged\n", i+1);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
avccontext->channels = context->vi.channels;
|
|
avccontext->sample_rate = context->vi.rate;
|
|
avccontext->sample_fmt = AV_SAMPLE_FMT_S16;
|
|
avccontext->time_base= (AVRational){1, avccontext->sample_rate};
|
|
|
|
vorbis_synthesis_init(&context->vd, &context->vi);
|
|
vorbis_block_init(&context->vd, &context->vb);
|
|
|
|
return 0 ;
|
|
}
|
|
|
|
|
|
static inline int conv(int samples, float **pcm, char *buf, int channels) {
|
|
int i, j;
|
|
ogg_int16_t *ptr, *data = (ogg_int16_t*)buf ;
|
|
float *mono ;
|
|
|
|
for(i = 0 ; i < channels ; i++){
|
|
ptr = &data[i];
|
|
mono = pcm[i] ;
|
|
|
|
for(j = 0 ; j < samples ; j++) {
|
|
*ptr = av_clip_int16(mono[j] * 32767.f);
|
|
ptr += channels;
|
|
}
|
|
}
|
|
|
|
return 0 ;
|
|
}
|
|
|
|
static int oggvorbis_decode_frame(AVCodecContext *avccontext, void *data,
|
|
int *got_frame_ptr, AVPacket *avpkt)
|
|
{
|
|
OggVorbisDecContext *context = avccontext->priv_data ;
|
|
AVFrame *frame = data;
|
|
float **pcm ;
|
|
ogg_packet *op= &context->op;
|
|
int samples, total_samples, total_bytes;
|
|
int ret;
|
|
int16_t *output;
|
|
|
|
if(!avpkt->size){
|
|
//FIXME flush
|
|
return 0;
|
|
}
|
|
|
|
frame->nb_samples = 8192*4;
|
|
if ((ret = ff_get_buffer(avccontext, frame, 0)) < 0) {
|
|
av_log(avccontext, AV_LOG_ERROR, "get_buffer() failed\n");
|
|
return ret;
|
|
}
|
|
output = (int16_t *)frame->data[0];
|
|
|
|
|
|
op->packet = avpkt->data;
|
|
op->bytes = avpkt->size;
|
|
|
|
// av_log(avccontext, AV_LOG_DEBUG, "%d %d %d %"PRId64" %"PRId64" %d %d\n", op->bytes, op->b_o_s, op->e_o_s, op->granulepos, op->packetno, buf_size, context->vi.rate);
|
|
|
|
/* for(i=0; i<op->bytes; i++)
|
|
av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]);
|
|
av_log(avccontext, AV_LOG_DEBUG, "\n");*/
|
|
|
|
if(vorbis_synthesis(&context->vb, op) == 0)
|
|
vorbis_synthesis_blockin(&context->vd, &context->vb) ;
|
|
|
|
total_samples = 0 ;
|
|
total_bytes = 0 ;
|
|
|
|
while((samples = vorbis_synthesis_pcmout(&context->vd, &pcm)) > 0) {
|
|
conv(samples, pcm, (char*)output + total_bytes, context->vi.channels) ;
|
|
total_bytes += samples * 2 * context->vi.channels ;
|
|
total_samples += samples ;
|
|
vorbis_synthesis_read(&context->vd, samples) ;
|
|
}
|
|
|
|
frame->nb_samples = total_samples;
|
|
*got_frame_ptr = 1;
|
|
return avpkt->size;
|
|
}
|
|
|
|
|
|
static int oggvorbis_decode_close(AVCodecContext *avccontext) {
|
|
OggVorbisDecContext *context = avccontext->priv_data ;
|
|
|
|
vorbis_info_clear(&context->vi) ;
|
|
vorbis_comment_clear(&context->vc) ;
|
|
|
|
return 0 ;
|
|
}
|
|
|
|
|
|
AVCodec ff_libvorbis_decoder = {
|
|
.name = "libvorbis",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.id = AV_CODEC_ID_VORBIS,
|
|
.priv_data_size = sizeof(OggVorbisDecContext),
|
|
.init = oggvorbis_decode_init,
|
|
.decode = oggvorbis_decode_frame,
|
|
.close = oggvorbis_decode_close,
|
|
.capabilities = CODEC_CAP_DELAY,
|
|
.long_name = NULL_IF_CONFIG_SMALL("libvorbis"),
|
|
};
|