mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Musepack SV7 decoding support
Originally committed as revision 7375 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov
parent
f8aa696f9f
commit
185c7b6b26
@ -66,6 +66,7 @@ version <next>
|
|||||||
- TIFF picture decoder
|
- TIFF picture decoder
|
||||||
- GIF picture decoder
|
- GIF picture decoder
|
||||||
- Intel Music decoder
|
- Intel Music decoder
|
||||||
|
- Musepack decoder
|
||||||
|
|
||||||
version 0.4.9-pre1:
|
version 0.4.9-pre1:
|
||||||
|
|
||||||
|
|||||||
@ -137,6 +137,7 @@ Codecs:
|
|||||||
lzo.h, lzo.c Reimar Doeffinger
|
lzo.h, lzo.c Reimar Doeffinger
|
||||||
mdec.c Michael Niedermayer
|
mdec.c Michael Niedermayer
|
||||||
mjpeg.c Michael Niedermayer
|
mjpeg.c Michael Niedermayer
|
||||||
|
mpc* Kostya Shishkov
|
||||||
mpeg12.c, mpeg12data.h Michael Niedermayer
|
mpeg12.c, mpeg12data.h Michael Niedermayer
|
||||||
mpegvideo.c, mpegvideo.h Michael Niedermayer
|
mpegvideo.c, mpegvideo.h Michael Niedermayer
|
||||||
msmpeg4.c, msmpeg4data.h Michael Niedermayer
|
msmpeg4.c, msmpeg4data.h Michael Niedermayer
|
||||||
@ -211,6 +212,7 @@ Muxers/Demuxers:
|
|||||||
matroska.c Aurelien Jacobs
|
matroska.c Aurelien Jacobs
|
||||||
mov.c Francois Revol, Michael Niedermayer
|
mov.c Francois Revol, Michael Niedermayer
|
||||||
movenc.c Michael Niedermayer, Baptiste Coudurier
|
movenc.c Michael Niedermayer, Baptiste Coudurier
|
||||||
|
mpc.c Kostya Shishkov
|
||||||
mpegts* Mans Rullgard
|
mpegts* Mans Rullgard
|
||||||
mtv.c Reynaldo H. Verdejo Pinochet
|
mtv.c Reynaldo H. Verdejo Pinochet
|
||||||
mxf.c Baptiste Coudurier
|
mxf.c Baptiste Coudurier
|
||||||
|
|||||||
@ -1090,6 +1090,8 @@ following image formats are supported:
|
|||||||
@item Cin Audio @tab @tab X
|
@item Cin Audio @tab @tab X
|
||||||
@tab Codec used in Delphine Software games.
|
@tab Codec used in Delphine Software games.
|
||||||
@item Intel Music Coder @tab @tab X
|
@item Intel Music Coder @tab @tab X
|
||||||
|
@item Musepack @tab @tab X
|
||||||
|
@tab Only SV7 is supported
|
||||||
@end multitable
|
@end multitable
|
||||||
|
|
||||||
@code{X} means that encoding (resp. decoding) is supported.
|
@code{X} means that encoding (resp. decoding) is supported.
|
||||||
|
|||||||
@ -101,6 +101,7 @@ OBJS-$(CONFIG_MACE3_DECODER) += mace.o
|
|||||||
OBJS-$(CONFIG_MACE6_DECODER) += mace.o
|
OBJS-$(CONFIG_MACE6_DECODER) += mace.o
|
||||||
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
|
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
|
||||||
OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o
|
OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o
|
||||||
|
OBJS-$(CONFIG_MPC7_DECODER) += mpc.o
|
||||||
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o
|
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o
|
||||||
OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
|
OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
|
||||||
OBJS-$(CONFIG_MSZH_DECODER) += lcl.o
|
OBJS-$(CONFIG_MSZH_DECODER) += lcl.o
|
||||||
|
|||||||
@ -197,6 +197,7 @@ void avcodec_register_all(void)
|
|||||||
REGISTER_ENCODER(MP3LAME, mp3lame);
|
REGISTER_ENCODER(MP3LAME, mp3lame);
|
||||||
#endif
|
#endif
|
||||||
REGISTER_DECODER(MP3ON4, mp3on4);
|
REGISTER_DECODER(MP3ON4, mp3on4);
|
||||||
|
REGISTER_DECODER(MPC7, mpc7);
|
||||||
#ifdef CONFIG_LIBVORBIS
|
#ifdef CONFIG_LIBVORBIS
|
||||||
if (!ENABLE_VORBIS_ENCODER) REGISTER_ENCODER(OGGVORBIS, oggvorbis);
|
if (!ENABLE_VORBIS_ENCODER) REGISTER_ENCODER(OGGVORBIS, oggvorbis);
|
||||||
if (!ENABLE_VORBIS_DECODER) REGISTER_DECODER(OGGVORBIS, oggvorbis);
|
if (!ENABLE_VORBIS_DECODER) REGISTER_DECODER(OGGVORBIS, oggvorbis);
|
||||||
|
|||||||
@ -37,8 +37,8 @@ extern "C" {
|
|||||||
#define AV_STRINGIFY(s) AV_TOSTRING(s)
|
#define AV_STRINGIFY(s) AV_TOSTRING(s)
|
||||||
#define AV_TOSTRING(s) #s
|
#define AV_TOSTRING(s) #s
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_INT ((51<<16)+(27<<8)+0)
|
#define LIBAVCODEC_VERSION_INT ((51<<16)+(28<<8)+0)
|
||||||
#define LIBAVCODEC_VERSION 51.27.0
|
#define LIBAVCODEC_VERSION 51.28.0
|
||||||
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
|
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
|
||||||
|
|
||||||
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
|
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
|
||||||
@ -237,6 +237,7 @@ enum CodecID {
|
|||||||
CODEC_ID_WAVPACK,
|
CODEC_ID_WAVPACK,
|
||||||
CODEC_ID_DSICINAUDIO,
|
CODEC_ID_DSICINAUDIO,
|
||||||
CODEC_ID_IMC,
|
CODEC_ID_IMC,
|
||||||
|
CODEC_ID_MUSEPACK7,
|
||||||
|
|
||||||
/* subtitle codecs */
|
/* subtitle codecs */
|
||||||
CODEC_ID_DVD_SUBTITLE= 0x17000,
|
CODEC_ID_DVD_SUBTITLE= 0x17000,
|
||||||
@ -2317,6 +2318,7 @@ extern AVCodec dsicinaudio_decoder;
|
|||||||
extern AVCodec tiertexseqvideo_decoder;
|
extern AVCodec tiertexseqvideo_decoder;
|
||||||
extern AVCodec tiff_decoder;
|
extern AVCodec tiff_decoder;
|
||||||
extern AVCodec imc_decoder;
|
extern AVCodec imc_decoder;
|
||||||
|
extern AVCodec mpc7_decoder;
|
||||||
|
|
||||||
/* pcm codecs */
|
/* pcm codecs */
|
||||||
#define PCM_CODEC(id, name) \
|
#define PCM_CODEC(id, name) \
|
||||||
|
|||||||
346
libavcodec/mpc.c
Normal file
346
libavcodec/mpc.c
Normal file
@ -0,0 +1,346 @@
|
|||||||
|
/*
|
||||||
|
* Musepack decoder
|
||||||
|
* Copyright (c) 2006 Konstantin Shishkov
|
||||||
|
*
|
||||||
|
* 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 mpc.c Musepack decoder
|
||||||
|
* MPEG Audio Layer 1/2 -like codec with frames of 1152 samples
|
||||||
|
* divided into 32 subbands.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "avcodec.h"
|
||||||
|
#include "bitstream.h"
|
||||||
|
#include "dsputil.h"
|
||||||
|
|
||||||
|
#ifdef CONFIG_MPEGAUDIO_HP
|
||||||
|
#define USE_HIGHPRECISION
|
||||||
|
#endif
|
||||||
|
#include "mpegaudio.h"
|
||||||
|
|
||||||
|
#include "mpcdata.h"
|
||||||
|
|
||||||
|
#define BANDS 32
|
||||||
|
#define SAMPLES_PER_BAND 36
|
||||||
|
#define MPC_FRAME_SIZE (BANDS * SAMPLES_PER_BAND)
|
||||||
|
|
||||||
|
static VLC scfi_vlc, dscf_vlc, hdr_vlc, quant_vlc[MPC7_QUANT_VLC_TABLES][2];
|
||||||
|
|
||||||
|
static DECLARE_ALIGNED_16(MPA_INT, mpa_window[512]);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
DSPContext dsp;
|
||||||
|
int IS, MSS, gapless;
|
||||||
|
int lastframelen, bands;
|
||||||
|
int oldDSCF[2][BANDS];
|
||||||
|
int rnd;
|
||||||
|
/* for synthesis */
|
||||||
|
DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]);
|
||||||
|
int synth_buf_offset[MPA_MAX_CHANNELS];
|
||||||
|
DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]);
|
||||||
|
} MPCContext;
|
||||||
|
|
||||||
|
/** Subband structure - hold all variables for each subband */
|
||||||
|
typedef struct {
|
||||||
|
int msf; ///< mid-stereo flag
|
||||||
|
int res[2];
|
||||||
|
int scfi[2];
|
||||||
|
int scf_idx[2][3];
|
||||||
|
int Q[2];
|
||||||
|
}Band;
|
||||||
|
|
||||||
|
static int mpc7_decode_init(AVCodecContext * avctx)
|
||||||
|
{
|
||||||
|
int i, j;
|
||||||
|
MPCContext *c = avctx->priv_data;
|
||||||
|
GetBitContext gb;
|
||||||
|
uint8_t buf[16];
|
||||||
|
float f1=1.20050805774840750476 * 256;
|
||||||
|
static int vlc_inited = 0;
|
||||||
|
|
||||||
|
if(avctx->extradata_size < 16){
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Too small extradata size (%i)!\n", avctx->extradata_size);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
|
||||||
|
c->rnd = 0xDEADBEEF;
|
||||||
|
dsputil_init(&c->dsp, avctx);
|
||||||
|
c->dsp.bswap_buf(buf, avctx->extradata, 4);
|
||||||
|
ff_mpa_synth_init(mpa_window);
|
||||||
|
init_get_bits(&gb, buf, 128);
|
||||||
|
|
||||||
|
c->IS = get_bits1(&gb);
|
||||||
|
c->MSS = get_bits1(&gb);
|
||||||
|
c->bands = get_bits(&gb, 6);
|
||||||
|
if(c->bands >= BANDS){
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Too many bands: %i\n", c->bands);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
skip_bits(&gb, 88);
|
||||||
|
c->gapless = get_bits1(&gb);
|
||||||
|
c->lastframelen = get_bits(&gb, 11);
|
||||||
|
av_log(avctx, AV_LOG_DEBUG, "IS: %d, MSS: %d, TG: %d, LFL: %d, bands: %d\n",
|
||||||
|
c->IS, c->MSS, c->gapless, c->lastframelen, c->bands);
|
||||||
|
|
||||||
|
if(vlc_inited) return 0;
|
||||||
|
av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
|
||||||
|
if(init_vlc(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
|
||||||
|
&mpc7_scfi[1], 2, 1,
|
||||||
|
&mpc7_scfi[0], 2, 1, INIT_VLC_USE_STATIC)){
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Cannot init SCFI VLC\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if(init_vlc(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
|
||||||
|
&mpc7_dscf[1], 2, 1,
|
||||||
|
&mpc7_dscf[0], 2, 1, INIT_VLC_USE_STATIC)){
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Cannot init DSCF VLC\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if(init_vlc(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
|
||||||
|
&mpc7_hdr[1], 2, 1,
|
||||||
|
&mpc7_hdr[0], 2, 1, INIT_VLC_USE_STATIC)){
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Cannot init HDR VLC\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
|
||||||
|
for(j = 0; j < 2; j++){
|
||||||
|
if(init_vlc(&quant_vlc[i][j], 9, mpc7_quant_vlc_sizes[i],
|
||||||
|
&mpc7_quant_vlc[i][j][1], 4, 2,
|
||||||
|
&mpc7_quant_vlc[i][j][0], 4, 2, INIT_VLC_USE_STATIC)){
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Cannot init QUANT VLC %i,%i\n",i,j);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
vlc_inited = 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// XXX replace with something better
|
||||||
|
static int av_always_inline mpc_rnd(MPCContext *c)
|
||||||
|
{
|
||||||
|
c->rnd = c->rnd * 27 + 17;
|
||||||
|
return c->rnd;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Process decoded Musepack data and produce PCM
|
||||||
|
* @todo make it available for MPC8 and MPC6
|
||||||
|
*/
|
||||||
|
static void mpc_synth(MPCContext *c, int16_t *out)
|
||||||
|
{
|
||||||
|
int dither_state = 0;
|
||||||
|
int i, ch;
|
||||||
|
OUT_INT samples[MPA_MAX_CHANNELS * MPA_FRAME_SIZE], *samples_ptr;
|
||||||
|
|
||||||
|
for(ch = 0; ch < 2; ch++){
|
||||||
|
samples_ptr = samples + ch;
|
||||||
|
for(i = 0; i < SAMPLES_PER_BAND; i++) {
|
||||||
|
ff_mpa_synth_filter(c->synth_buf[ch], &(c->synth_buf_offset[ch]),
|
||||||
|
mpa_window, &dither_state,
|
||||||
|
samples_ptr, 2,
|
||||||
|
c->sb_samples[ch][i]);
|
||||||
|
samples_ptr += 64;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for(i = 0; i < MPC_FRAME_SIZE*2; i++)
|
||||||
|
*out++=samples[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fill samples for given subband
|
||||||
|
*/
|
||||||
|
static void inline idx_to_quant(MPCContext *c, GetBitContext *gb, int idx, int *dst)
|
||||||
|
{
|
||||||
|
int i, i1, t;
|
||||||
|
switch(idx){
|
||||||
|
case -1:
|
||||||
|
for(i = 0; i < SAMPLES_PER_BAND; i++){
|
||||||
|
t = mpc_rnd(c);
|
||||||
|
*dst++ = ((t>>24)& 0xFF) + ((t>>16) & 0xFF) + ((t>>8) & 0xFF) + (t & 0xFF) - 510;
|
||||||
|
}
|
||||||
|
case 1:
|
||||||
|
i1 = get_bits1(gb);
|
||||||
|
for(i = 0; i < SAMPLES_PER_BAND/3; i++){
|
||||||
|
t = get_vlc2(gb, quant_vlc[0][i1].table, 9, 2);
|
||||||
|
*dst++ = mpc_idx30[t];
|
||||||
|
*dst++ = mpc_idx31[t];
|
||||||
|
*dst++ = mpc_idx32[t];
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
i1 = get_bits1(gb);
|
||||||
|
for(i = 0; i < SAMPLES_PER_BAND/2; i++){
|
||||||
|
t = get_vlc2(gb, quant_vlc[1][i1].table, 9, 2);
|
||||||
|
*dst++ = mpc_idx50[t];
|
||||||
|
*dst++ = mpc_idx51[t];
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 3: case 4: case 5: case 6: case 7:
|
||||||
|
i1 = get_bits1(gb);
|
||||||
|
for(i = 0; i < SAMPLES_PER_BAND; i++)
|
||||||
|
*dst++ = get_vlc2(gb, quant_vlc[idx-1][i1].table, 9, 2) - mpc7_quant_vlc_off[idx-1];
|
||||||
|
break;
|
||||||
|
case 8: case 9: case 10: case 11: case 12:
|
||||||
|
case 13: case 14: case 15: case 16: case 17:
|
||||||
|
t = (1 << (idx - 2)) - 1;
|
||||||
|
for(i = 0; i < SAMPLES_PER_BAND; i++)
|
||||||
|
*dst++ = get_bits(gb, idx - 1) - t;
|
||||||
|
break;
|
||||||
|
default: // case 0 and -2..-17
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int mpc7_decode_frame(AVCodecContext * avctx,
|
||||||
|
void *data, int *data_size,
|
||||||
|
uint8_t * buf, int buf_size)
|
||||||
|
{
|
||||||
|
MPCContext *c = avctx->priv_data;
|
||||||
|
GetBitContext gb;
|
||||||
|
uint8_t *bits;
|
||||||
|
int i, j, ch, t;
|
||||||
|
int mb = -1;
|
||||||
|
Band bands[BANDS];
|
||||||
|
int Q[2][MPC_FRAME_SIZE];
|
||||||
|
int off;
|
||||||
|
float mul;
|
||||||
|
int bits_used, bits_avail;
|
||||||
|
|
||||||
|
memset(bands, 0, sizeof(bands));
|
||||||
|
if(buf_size <= 4){
|
||||||
|
av_log(avctx, AV_LOG_ERROR, "Too small buffer passed (%i bytes)\n", buf_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
bits = av_malloc((buf_size - 1) & ~3);
|
||||||
|
c->dsp.bswap_buf(bits, buf + 4, (buf_size - 4) >> 2);
|
||||||
|
init_get_bits(&gb, bits, (buf_size - 4)* 8);
|
||||||
|
skip_bits(&gb, buf[0]);
|
||||||
|
|
||||||
|
/* read subband indexes */
|
||||||
|
for(i = 0; i <= c->bands; i++){
|
||||||
|
for(ch = 0; ch < 2; ch++){
|
||||||
|
if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
|
||||||
|
if(!i || (t == 4)) bands[i].res[ch] = get_bits(&gb, 4);
|
||||||
|
else bands[i].res[ch] = bands[i-1].res[ch] + t;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(bands[i].res[0] || bands[i].res[1]){
|
||||||
|
mb = i;
|
||||||
|
if(c->MSS) bands[i].msf = get_bits1(&gb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* get scale indexes coding method */
|
||||||
|
for(i = 0; i <= mb; i++)
|
||||||
|
for(ch = 0; ch < 2; ch++)
|
||||||
|
if(bands[i].res[ch]) bands[i].scfi[ch] = get_vlc2(&gb, scfi_vlc.table, MPC7_SCFI_BITS, 1);
|
||||||
|
/* get scale indexes */
|
||||||
|
for(i = 0; i <= mb; i++){
|
||||||
|
for(ch = 0; ch < 2; ch++){
|
||||||
|
if(bands[i].res[ch]){
|
||||||
|
bands[i].scf_idx[ch][2] = c->oldDSCF[ch][i];
|
||||||
|
t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
|
||||||
|
bands[i].scf_idx[ch][0] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][2] + t);
|
||||||
|
switch(bands[i].scfi[ch]){
|
||||||
|
case 0:
|
||||||
|
t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
|
||||||
|
bands[i].scf_idx[ch][1] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][0] + t);
|
||||||
|
t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
|
||||||
|
bands[i].scf_idx[ch][2] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][1] + t);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
|
||||||
|
bands[i].scf_idx[ch][1] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][0] + t);
|
||||||
|
bands[i].scf_idx[ch][2] = bands[i].scf_idx[ch][1];
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
bands[i].scf_idx[ch][1] = bands[i].scf_idx[ch][0];
|
||||||
|
t = get_vlc2(&gb, dscf_vlc.table, MPC7_DSCF_BITS, 1) - 7;
|
||||||
|
bands[i].scf_idx[ch][2] = (t == 8) ? get_bits(&gb, 6) : (bands[i].scf_idx[ch][1] + t);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
bands[i].scf_idx[ch][2] = bands[i].scf_idx[ch][1] = bands[i].scf_idx[ch][0];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
c->oldDSCF[ch][i] = bands[i].scf_idx[ch][2];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* get quantizers */
|
||||||
|
memset(Q, 0, sizeof(Q));
|
||||||
|
off = 0;
|
||||||
|
for(i = 0; i < BANDS; i++, off += SAMPLES_PER_BAND)
|
||||||
|
for(ch = 0; ch < 2; ch++)
|
||||||
|
idx_to_quant(c, &gb, bands[i].res[ch], Q[ch] + off);
|
||||||
|
/* dequantize */
|
||||||
|
memset(c->sb_samples, 0, sizeof(c->sb_samples));
|
||||||
|
off = 0;
|
||||||
|
for(i = 0; i <= mb; i++, off += SAMPLES_PER_BAND){
|
||||||
|
for(ch = 0; ch < 2; ch++){
|
||||||
|
if(bands[i].res[ch]){
|
||||||
|
j = 0;
|
||||||
|
mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][0]];
|
||||||
|
for(; j < 12; j++)
|
||||||
|
c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
|
||||||
|
mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][1]];
|
||||||
|
for(; j < 24; j++)
|
||||||
|
c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
|
||||||
|
mul = mpc_CC[bands[i].res[ch]] * mpc7_SCF[bands[i].scf_idx[ch][2]];
|
||||||
|
for(; j < 36; j++)
|
||||||
|
c->sb_samples[ch][j][i] = mul * Q[ch][j + off];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(bands[i].msf){
|
||||||
|
int t1, t2;
|
||||||
|
for(j = 0; j < SAMPLES_PER_BAND; j++){
|
||||||
|
t1 = c->sb_samples[0][j][i];
|
||||||
|
t2 = c->sb_samples[1][j][i];
|
||||||
|
c->sb_samples[0][j][i] = t1 + t2;
|
||||||
|
c->sb_samples[1][j][i] = t1 - t2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mpc_synth(c, data);
|
||||||
|
|
||||||
|
av_free(bits);
|
||||||
|
|
||||||
|
bits_used = get_bits_count(&gb);
|
||||||
|
bits_avail = (buf_size - 4) * 8;
|
||||||
|
if(!buf[1] && ((bits_avail < bits_used) || (bits_used + 32 <= bits_avail))){
|
||||||
|
av_log(NULL,0, "Error decoding frame: used %i of %i bits\n", bits_used, bits_avail);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
*data_size = (buf[1] ? c->lastframelen : MPC_FRAME_SIZE) * 4;
|
||||||
|
|
||||||
|
return buf_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AVCodec mpc7_decoder = {
|
||||||
|
"mpc sv7",
|
||||||
|
CODEC_TYPE_AUDIO,
|
||||||
|
CODEC_ID_MUSEPACK7,
|
||||||
|
sizeof(MPCContext),
|
||||||
|
mpc7_decode_init,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
mpc7_decode_frame,
|
||||||
|
};
|
||||||
206
libavcodec/mpcdata.h
Normal file
206
libavcodec/mpcdata.h
Normal file
@ -0,0 +1,206 @@
|
|||||||
|
/*
|
||||||
|
* Musepack decoder
|
||||||
|
* Copyright (c) 2006 Konstantin Shishkov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
static const int8_t mpc_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1};
|
||||||
|
static const int8_t mpc_idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1};
|
||||||
|
static const int8_t mpc_idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
|
||||||
|
static const int8_t mpc_idx50[] = { -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2};
|
||||||
|
static const int8_t mpc_idx51[] = { -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2};
|
||||||
|
|
||||||
|
static const float mpc_CC[18] = {
|
||||||
|
65536.0000, 21845.3333, 13107.2000, 9362.2857, 7281.7778, 4369.0667, 2114.0645,
|
||||||
|
1040.2539, 516.0315, 257.0039, 128.2505, 64.0626, 32.0156, 16.0039, 8.0010,
|
||||||
|
4.0002, 2.0001, 1.0000
|
||||||
|
};
|
||||||
|
|
||||||
|
#define MPC7_SCFI_SIZE 4
|
||||||
|
#define MPC7_SCFI_BITS 3
|
||||||
|
static const uint8_t mpc7_scfi[MPC7_SCFI_SIZE * 2] = {
|
||||||
|
0x2, 3, 0x1, 1, 0x3, 3, 0x0, 2
|
||||||
|
};
|
||||||
|
|
||||||
|
#define MPC7_DSCF_SIZE 16
|
||||||
|
#define MPC7_DSCF_BITS 6
|
||||||
|
static const uint8_t mpc7_dscf[MPC7_DSCF_SIZE * 2] = {
|
||||||
|
0x20, 6, 0x04, 5, 0x11, 5, 0x1E, 5, 0x0D, 4, 0x00, 3, 0x03, 3, 0x09, 4,
|
||||||
|
0x05, 3, 0x02, 3, 0x0E, 4, 0x03, 4, 0x1F, 5, 0x05, 5, 0x21, 6, 0x0C, 4
|
||||||
|
};
|
||||||
|
|
||||||
|
#define MPC7_HDR_SIZE 10
|
||||||
|
#define MPC7_HDR_BITS 9
|
||||||
|
static const uint8_t mpc7_hdr[MPC7_HDR_SIZE * 2] = {
|
||||||
|
0x5C, 8, 0x2F, 7, 0x0A, 5, 0x04, 4, 0x00, 2,
|
||||||
|
0x01, 1, 0x03, 3, 0x16, 6, 0xBB, 9, 0xBA, 9
|
||||||
|
};
|
||||||
|
|
||||||
|
#define MPC7_QUANT_VLC_TABLES 7
|
||||||
|
static const uint8_t mpc7_quant_vlc_sizes[MPC7_QUANT_VLC_TABLES * 2] = {
|
||||||
|
27, 25, 7, 9, 15, 31, 63
|
||||||
|
};
|
||||||
|
|
||||||
|
static const uint8_t mpc7_quant_vlc_off[MPC7_QUANT_VLC_TABLES] = {
|
||||||
|
0, 0, 3, 4, 7, 15, 31
|
||||||
|
};
|
||||||
|
|
||||||
|
static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = {
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0x0036, 6, 0x0009, 5, 0x0020, 6, 0x0005, 5, 0x000A, 4, 0x0007, 5,
|
||||||
|
0x0034, 6, 0x0000, 5, 0x0023, 6, 0x000A, 5, 0x0006, 4, 0x0004, 5,
|
||||||
|
0x000B, 4, 0x0007, 3, 0x000C, 4, 0x0003, 5, 0x0007, 4, 0x000B, 5,
|
||||||
|
0x0022, 6, 0x0001, 5, 0x0035, 6, 0x0006, 5, 0x0009, 4, 0x0002, 5,
|
||||||
|
0x0021, 6, 0x0008, 5, 0x0037, 6
|
||||||
|
},
|
||||||
|
{
|
||||||
|
0x0067, 8, 0x003E, 7, 0x00E1, 9, 0x0037, 7, 0x0003, 4, 0x0034, 7,
|
||||||
|
0x0065, 8, 0x003C, 7, 0x00E3, 9, 0x0018, 6, 0x0000, 4, 0x003D, 7,
|
||||||
|
0x0004, 4, 0x0001, 1, 0x0005, 4, 0x003F, 7, 0x0001, 4, 0x003B, 7,
|
||||||
|
0x00E2, 9, 0x0039, 7, 0x0064, 8, 0x0035, 7, 0x0002, 4, 0x0036, 7,
|
||||||
|
0x00E0, 9, 0x003A, 7, 0x0066, 8
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0x0059, 7, 0x002F, 6, 0x000F, 5, 0x0000, 5, 0x005B, 7, 0x0004, 5,
|
||||||
|
0x0006, 4, 0x000D, 4, 0x0004, 4, 0x0005, 5, 0x0014, 5, 0x000C, 4,
|
||||||
|
0x0004, 3, 0x000F, 4, 0x000E, 5, 0x0003, 5, 0x0003, 4, 0x000E, 4,
|
||||||
|
0x0005, 4, 0x0001, 5, 0x005A, 7, 0x0002, 5, 0x0015, 5, 0x002E, 6,
|
||||||
|
0x0058, 7
|
||||||
|
},
|
||||||
|
{
|
||||||
|
0x0399, 10, 0x0071, 7, 0x0033, 6, 0x00E7, 8, 0x039A, 10, 0x0068, 7,
|
||||||
|
0x001E, 5, 0x0000, 3, 0x001D, 5, 0x0069, 7, 0x0032, 6, 0x0001, 3,
|
||||||
|
0x0002, 2, 0x0003, 3, 0x0031, 6, 0x006B, 7, 0x001B, 5, 0x0002, 3,
|
||||||
|
0x001F, 5, 0x0070, 7, 0x0398, 10, 0x006A, 7, 0x0030, 6, 0x0072, 7,
|
||||||
|
0x039B, 10
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0x000C, 4, 0x0004, 3, 0x0000, 2, 0x0001, 2, 0x0007, 3, 0x0005, 3, 0x000D, 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
0x0004, 5, 0x0003, 4, 0x0002, 2, 0x0003, 2, 0x0001, 2, 0x0000, 3, 0x0005, 5
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0x0005, 4, 0x0000, 3, 0x0004, 3, 0x0006, 3, 0x0007, 3, 0x0005, 3, 0x0003, 3, 0x0001, 3, 0x0004, 4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
0x0009, 5, 0x000C, 4, 0x0003, 3, 0x0000, 2, 0x0002, 2, 0x0007, 3, 0x000D, 4, 0x0005, 4, 0x0008, 5
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0x0039, 6, 0x0017, 5, 0x0008, 4, 0x000A, 4, 0x000D, 4, 0x0000, 3,
|
||||||
|
0x0002, 3, 0x0003, 3, 0x0001, 3, 0x000F, 4, 0x000C, 4, 0x0009, 4,
|
||||||
|
0x001D, 5, 0x0016, 5, 0x0038, 6,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
0x00E5, 8, 0x0038, 6, 0x0007, 5, 0x0002, 4, 0x0000, 3, 0x0003, 3,
|
||||||
|
0x0005, 3, 0x0006, 3, 0x0004, 3, 0x0002, 3, 0x000F, 4, 0x001D, 5,
|
||||||
|
0x0006, 5, 0x0073, 7, 0x00E4, 8,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0x0041, 7, 0x0006, 6, 0x002C, 6, 0x002D, 6, 0x003B, 6, 0x000D, 5,
|
||||||
|
0x0011, 5, 0x0013, 5, 0x0017, 5, 0x0015, 5, 0x001A, 5, 0x001E, 5,
|
||||||
|
0x0000, 4, 0x0002, 4, 0x0005, 4, 0x0007, 4, 0x0003, 4, 0x0004, 4,
|
||||||
|
0x001F, 5, 0x001C, 5, 0x0019, 5, 0x001B, 5, 0x0018, 5, 0x0014, 5,
|
||||||
|
0x0012, 5, 0x000C, 5, 0x0002, 5, 0x003A, 6, 0x0021, 6, 0x0007, 6,
|
||||||
|
0x0040, 7
|
||||||
|
},
|
||||||
|
{
|
||||||
|
0x1948, 13, 0x194A, 13, 0x0328, 10, 0x0195, 9, 0x00CB, 8, 0x0066, 7,
|
||||||
|
0x0031, 6, 0x0009, 5, 0x000F, 5, 0x001F, 5, 0x0002, 4, 0x0006, 4,
|
||||||
|
0x0008, 4, 0x000B, 4, 0x000D, 4, 0x0000, 3, 0x000E, 4, 0x000A, 4,
|
||||||
|
0x0009, 4, 0x0005, 4, 0x0003, 4, 0x001E, 5, 0x000E, 5, 0x0008, 5,
|
||||||
|
0x0030, 6, 0x0067, 7, 0x00C9, 8, 0x00C8, 8, 0x0653, 11, 0x1949, 13,
|
||||||
|
0x194B, 13
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
{
|
||||||
|
0x0067, 8, 0x0099, 8, 0x00B5, 8, 0x00E9, 8, 0x0040, 7, 0x0041, 7,
|
||||||
|
0x004D, 7, 0x0051, 7, 0x005B, 7, 0x0071, 7, 0x0070, 7, 0x0018, 6,
|
||||||
|
0x001D, 6, 0x0023, 6, 0x0025, 6, 0x0029, 6, 0x002C, 6, 0x002E, 6,
|
||||||
|
0x0033, 6, 0x0031, 6, 0x0036, 6, 0x0037, 6, 0x0039, 6, 0x003C, 6,
|
||||||
|
0x0000, 5, 0x0002, 5, 0x000A, 5, 0x0005, 5, 0x0009, 5, 0x0006, 5,
|
||||||
|
0x000D, 5, 0x0007, 5, 0x000B, 5, 0x000F, 5, 0x0008, 5, 0x0004, 5,
|
||||||
|
0x0003, 5, 0x0001, 5, 0x003F, 6, 0x003E, 6, 0x003D, 6, 0x0035, 6,
|
||||||
|
0x003B, 6, 0x0034, 6, 0x0030, 6, 0x002F, 6, 0x002B, 6, 0x002A, 6,
|
||||||
|
0x0027, 6, 0x0024, 6, 0x0021, 6, 0x001C, 6, 0x0075, 7, 0x0065, 7,
|
||||||
|
0x0064, 7, 0x0050, 7, 0x0045, 7, 0x0044, 7, 0x0032, 7, 0x00E8, 8,
|
||||||
|
0x00B4, 8, 0x0098, 8, 0x0066, 8
|
||||||
|
},
|
||||||
|
{
|
||||||
|
0x37A4, 14, 0x37AD, 14, 0x37A6, 14, 0x37AE, 14, 0x0DEA, 12, 0x02F0, 10,
|
||||||
|
0x02F1, 10, 0x00A0, 9, 0x00A2, 9, 0x01BC, 9, 0x007A, 8, 0x00DF, 8,
|
||||||
|
0x003C, 7, 0x0049, 7, 0x006E, 7, 0x000E, 6, 0x0018, 6, 0x0019, 6,
|
||||||
|
0x0022, 6, 0x0025, 6, 0x0036, 6, 0x0003, 5, 0x0009, 5, 0x000B, 5,
|
||||||
|
0x0010, 5, 0x0013, 5, 0x0015, 5, 0x0018, 5, 0x001A, 5, 0x001D, 5,
|
||||||
|
0x001F, 5, 0x0002, 4, 0x0000, 4, 0x001E, 5, 0x001C, 5, 0x0019, 5,
|
||||||
|
0x0016, 5, 0x0014, 5, 0x000E, 5, 0x000D, 5, 0x0008, 5, 0x0006, 5,
|
||||||
|
0x0002, 5, 0x002E, 6, 0x0023, 6, 0x001F, 6, 0x0015, 6, 0x000F, 6,
|
||||||
|
0x005F, 7, 0x0048, 7, 0x0029, 7, 0x00BD, 8, 0x007B, 8, 0x0179, 9,
|
||||||
|
0x00A1, 9, 0x037B, 10, 0x0147, 10, 0x0146, 10, 0x0DE8, 12, 0x37AF, 14,
|
||||||
|
0x37A7, 14, 0x37AC, 14, 0x37A5, 14
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static const float mpc7_SCF[128] = {
|
||||||
|
307.330047607421875000, 255.999984741210937500, 213.243041992187500000, 177.627334594726562500,
|
||||||
|
147.960128784179687500, 123.247924804687500000, 102.663139343261718750, 85.516410827636718750,
|
||||||
|
71.233520507812500000, 59.336143493652343750, 49.425861358642578125, 41.170787811279296875,
|
||||||
|
34.294471740722656250, 28.566631317138671875, 23.795452117919921875, 19.821151733398437500,
|
||||||
|
16.510635375976562500, 13.753040313720703125, 11.456016540527343750, 9.542640686035156250,
|
||||||
|
7.948835372924804688, 6.621226310729980469, 5.515353679656982422, 4.594182968139648438,
|
||||||
|
3.826865673065185547, 3.187705039978027344, 2.655296564102172852, 2.211810588836669922,
|
||||||
|
1.842395424842834473, 1.534679770469665527, 1.278358578681945801, 1.064847946166992188,
|
||||||
|
0.886997759342193604, 0.738851964473724365, 0.615449428558349609, 0.512657463550567627,
|
||||||
|
0.427033752202987671, 0.355710864067077637, 0.296300262212753296, 0.246812388300895691,
|
||||||
|
0.205589950084686279, 0.171252459287643433, 0.142649993300437927, 0.118824683129787445,
|
||||||
|
0.098978661000728607, 0.082447312772274017, 0.068677015602588654, 0.057206626981496811,
|
||||||
|
0.047652013599872589, 0.039693206548690796, 0.033063672482967377, 0.027541399002075195,
|
||||||
|
0.022941453382372856, 0.019109787419438362, 0.015918083488941193, 0.013259455561637878,
|
||||||
|
0.011044870130717754, 0.009200163185596466, 0.007663558237254620, 0.006383595988154411,
|
||||||
|
0.005317411851137877, 0.004429301247000694, 0.003689522389322519, 0.003073300700634718,
|
||||||
|
0.002560000168159604, 0.002132430672645569, 0.001776273478753865, 0.001479601487517357,
|
||||||
|
0.001232479466125369, 0.001026631565764546, 0.000855164253152907, 0.000712335284333676,
|
||||||
|
0.000593361502978951, 0.000494258652906865, 0.000411707907915115, 0.000342944724252447,
|
||||||
|
0.000285666319541633, 0.000237954518524930, 0.000198211506358348, 0.000165106350323185,
|
||||||
|
0.000137530398205854, 0.000114560163638089, 0.000095426403277088, 0.000079488345363643,
|
||||||
|
0.000066212254751008, 0.000055153526773211, 0.000045941822463647, 0.000038268648495432,
|
||||||
|
0.000031877043511486, 0.000026552961571724, 0.000022118103515822, 0.000018423952496960,
|
||||||
|
0.000015346795407822, 0.000012783583770215, 0.000010648477655195, 0.000008869976227288,
|
||||||
|
0.000007388518497464, 0.000006154492893984, 0.000005126573796588, 0.000004270336830814,
|
||||||
|
0.000003557107902452, 0.000002963002089018, 0.000002468123511790, 0.000002055899130937,
|
||||||
|
0.000001712524181130, 0.000001426499579793, 0.000001188246528727, 0.000000989786371974,
|
||||||
|
0.000000824472920158, 0.000000686770022185, 0.000000572066142013, 0.000000476520028769,
|
||||||
|
0.000000396931966407, 0.000000330636652279, 0.000000275413924555, 0.000000229414467867,
|
||||||
|
0.000000191097811353, 0.000000159180785886, 0.000000132594522029, 0.000000110448674207,
|
||||||
|
0.000000092001613439, 0.000000076635565449, 0.000000063835940978, 0.000000053174105119,
|
||||||
|
0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
|
||||||
|
};
|
||||||
@ -62,6 +62,7 @@ OBJS-$(CONFIG_TG2_MUXER) += movenc.o riff.o isom.o
|
|||||||
OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o
|
OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o
|
||||||
OBJS-$(CONFIG_MP2_MUXER) += mp3.o
|
OBJS-$(CONFIG_MP2_MUXER) += mp3.o
|
||||||
OBJS-$(CONFIG_MP3_MUXER) += mp3.o
|
OBJS-$(CONFIG_MP3_MUXER) += mp3.o
|
||||||
|
OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o
|
||||||
OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpeg.o
|
OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpeg.o
|
||||||
OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpeg.o
|
OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpeg.o
|
||||||
OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpeg.o
|
OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpeg.o
|
||||||
|
|||||||
@ -100,6 +100,7 @@ void av_register_all(void)
|
|||||||
REGISTER_MUXER (MP2, mp2);
|
REGISTER_MUXER (MP2, mp2);
|
||||||
REGISTER_MUXDEMUX(MP3, mp3);
|
REGISTER_MUXDEMUX(MP3, mp3);
|
||||||
REGISTER_MUXER (MP4, mp4);
|
REGISTER_MUXER (MP4, mp4);
|
||||||
|
REGISTER_DEMUXER (MPC, mpc);
|
||||||
REGISTER_MUXER (MPEG1SYSTEM, mpeg1system);
|
REGISTER_MUXER (MPEG1SYSTEM, mpeg1system);
|
||||||
REGISTER_MUXER (MPEG1VCD, mpeg1vcd);
|
REGISTER_MUXER (MPEG1VCD, mpeg1vcd);
|
||||||
REGISTER_MUXER (MPEG1VIDEO, mpeg1video);
|
REGISTER_MUXER (MPEG1VIDEO, mpeg1video);
|
||||||
|
|||||||
@ -82,6 +82,7 @@ extern AVOutputFormat tg2_muxer;
|
|||||||
extern AVInputFormat mp3_demuxer;
|
extern AVInputFormat mp3_demuxer;
|
||||||
extern AVOutputFormat mp2_muxer;
|
extern AVOutputFormat mp2_muxer;
|
||||||
extern AVOutputFormat mp3_muxer;
|
extern AVOutputFormat mp3_muxer;
|
||||||
|
extern AVInputFormat mpc_demuxer;
|
||||||
extern AVOutputFormat mpeg1system_muxer;
|
extern AVOutputFormat mpeg1system_muxer;
|
||||||
extern AVOutputFormat mpeg1vcd_muxer;
|
extern AVOutputFormat mpeg1vcd_muxer;
|
||||||
extern AVOutputFormat mpeg2vob_muxer;
|
extern AVOutputFormat mpeg2vob_muxer;
|
||||||
|
|||||||
@ -25,8 +25,8 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT ((51<<16)+(6<<8)+0)
|
#define LIBAVFORMAT_VERSION_INT ((51<<16)+(7<<8)+0)
|
||||||
#define LIBAVFORMAT_VERSION 51.6.0
|
#define LIBAVFORMAT_VERSION 51.7.0
|
||||||
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
|
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
|
||||||
|
|
||||||
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
|
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
|
||||||
|
|||||||
182
libavformat/mpc.c
Normal file
182
libavformat/mpc.c
Normal file
@ -0,0 +1,182 @@
|
|||||||
|
/*
|
||||||
|
* Musepack demuxer
|
||||||
|
* Copyright (c) 2006 Konstantin Shishkov
|
||||||
|
*
|
||||||
|
* 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 St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
#include "avformat.h"
|
||||||
|
#include "bitstream.h"
|
||||||
|
|
||||||
|
#define MPC_FRAMESIZE 1152
|
||||||
|
|
||||||
|
static const int mpc_rate[4] = { 44100, 48000, 37800, 32000 };
|
||||||
|
typedef struct {
|
||||||
|
int64_t pos;
|
||||||
|
int size, skip;
|
||||||
|
}MPCFrame;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int ver;
|
||||||
|
uint32_t curframe, lastframe;
|
||||||
|
uint32_t fcount;
|
||||||
|
MPCFrame *frames;
|
||||||
|
int curbits;
|
||||||
|
int frames_noted;
|
||||||
|
} MPCContext;
|
||||||
|
|
||||||
|
static int mpc_probe(AVProbeData *p)
|
||||||
|
{
|
||||||
|
const uint8_t *d = p->buf;
|
||||||
|
if (p->buf_size < 32)
|
||||||
|
return 0;
|
||||||
|
if (d[0] == 'M' && d[1] == 'P' && d[2] == '+' && (d[3] == 0x17 || d[3] == 0x7))
|
||||||
|
return AVPROBE_SCORE_MAX;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||||
|
{
|
||||||
|
MPCContext *c = s->priv_data;
|
||||||
|
AVStream *st;
|
||||||
|
|
||||||
|
if(get_le24(&s->pb) != MKTAG('M', 'P', '+', 0)){
|
||||||
|
av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
c->ver = get_byte(&s->pb);
|
||||||
|
if(c->ver != 0x07 && c->ver != 0x17){
|
||||||
|
av_log(s, AV_LOG_ERROR, "Can demux Musepack SV7, got version %02X\n", c->ver);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
c->fcount = get_le32(&s->pb);
|
||||||
|
if((int64_t)c->fcount * sizeof(MPCFrame) >= UINT_MAX){
|
||||||
|
av_log(s, AV_LOG_ERROR, "Too many frames, seeking is not possible\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
c->frames = av_malloc(c->fcount * sizeof(MPCFrame));
|
||||||
|
c->curframe = 0;
|
||||||
|
c->lastframe = -1;
|
||||||
|
c->curbits = 8;
|
||||||
|
|
||||||
|
st = av_new_stream(s, 0);
|
||||||
|
if (!st)
|
||||||
|
return AVERROR_NOMEM;
|
||||||
|
st->codec->codec_type = CODEC_TYPE_AUDIO;
|
||||||
|
st->codec->codec_id = CODEC_ID_MUSEPACK7;
|
||||||
|
st->codec->channels = 2;
|
||||||
|
st->codec->bits_per_sample = 16;
|
||||||
|
|
||||||
|
st->codec->extradata_size = 16;
|
||||||
|
st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE);
|
||||||
|
get_buffer(&s->pb, st->codec->extradata, 16);
|
||||||
|
st->codec->sample_rate = mpc_rate[st->codec->extradata[2] & 3];
|
||||||
|
av_set_pts_info(st, 32, MPC_FRAMESIZE, st->codec->sample_rate);
|
||||||
|
/* scan for seekpoints */
|
||||||
|
s->start_time = 0;
|
||||||
|
s->duration = (int64_t)c->fcount * MPC_FRAMESIZE * AV_TIME_BASE / st->codec->sample_rate;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||||
|
{
|
||||||
|
MPCContext *c = s->priv_data;
|
||||||
|
int ret, size, size2, curbits, cur = c->curframe;
|
||||||
|
int64_t tmp, pos;
|
||||||
|
|
||||||
|
if (c->curframe > c->fcount)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if(c->curframe != c->lastframe + 1){
|
||||||
|
url_fseek(&s->pb, c->frames[c->curframe].pos, SEEK_SET);
|
||||||
|
c->curbits = c->frames[c->curframe].skip;
|
||||||
|
}
|
||||||
|
c->lastframe = c->curframe;
|
||||||
|
c->curframe++;
|
||||||
|
curbits = c->curbits;
|
||||||
|
pos = url_ftell(&s->pb);
|
||||||
|
tmp = get_le32(&s->pb);
|
||||||
|
if(curbits <= 12){
|
||||||
|
size2 = (tmp >> (12 - curbits)) & 0xFFFFF;
|
||||||
|
}else{
|
||||||
|
tmp = (tmp << 32) | get_le32(&s->pb);
|
||||||
|
size2 = (tmp >> (44 - curbits)) & 0xFFFFF;
|
||||||
|
}
|
||||||
|
curbits += 20;
|
||||||
|
url_fseek(&s->pb, pos, SEEK_SET);
|
||||||
|
|
||||||
|
size = ((size2 + curbits + 31) & ~31) >> 3;
|
||||||
|
if(cur == c->frames_noted){
|
||||||
|
c->frames[cur].pos = pos;
|
||||||
|
c->frames[cur].size = size;
|
||||||
|
c->frames[cur].skip = curbits - 20;
|
||||||
|
av_add_index_entry(s->streams[0], cur, cur, size, 0, AVINDEX_KEYFRAME);
|
||||||
|
c->frames_noted++;
|
||||||
|
}
|
||||||
|
c->curbits = (curbits + size2) & 0x1F;
|
||||||
|
|
||||||
|
if (av_new_packet(pkt, size) < 0)
|
||||||
|
return AVERROR_IO;
|
||||||
|
|
||||||
|
pkt->data[0] = curbits;
|
||||||
|
pkt->data[1] = (c->curframe > c->fcount);
|
||||||
|
|
||||||
|
pkt->stream_index = 0;
|
||||||
|
ret = get_buffer(&s->pb, pkt->data + 4, size);
|
||||||
|
if(c->curbits)
|
||||||
|
url_fseek(&s->pb, -4, SEEK_CUR);
|
||||||
|
if(ret < size){
|
||||||
|
av_free_packet(pkt);
|
||||||
|
return AVERROR_IO;
|
||||||
|
}
|
||||||
|
pkt->size = ret + 4;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int mpc_read_close(AVFormatContext *s)
|
||||||
|
{
|
||||||
|
MPCContext *c = s->priv_data;
|
||||||
|
|
||||||
|
av_freep(&c->frames);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int mpc_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
|
||||||
|
{
|
||||||
|
AVStream *st = s->streams[stream_index];
|
||||||
|
MPCContext *c = s->priv_data;
|
||||||
|
int index = av_index_search_timestamp(st, timestamp, flags);
|
||||||
|
if (index < 0)
|
||||||
|
return -1;
|
||||||
|
c->curframe = st->index_entries[index].pos;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AVInputFormat mpc_demuxer = {
|
||||||
|
"mpc",
|
||||||
|
"musepack",
|
||||||
|
sizeof(MPCContext),
|
||||||
|
mpc_probe,
|
||||||
|
mpc_read_header,
|
||||||
|
mpc_read_packet,
|
||||||
|
mpc_read_close,
|
||||||
|
mpc_read_seek,
|
||||||
|
.extensions = "mpc",
|
||||||
|
};
|
||||||
Loading…
Reference in New Issue
Block a user