#include <limits.h>
#define ALT_BITSTREAM_READER
+#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
#include "golomb.h"
-#include "crc.h"
+#include "flac.h"
#undef NDEBUG
#include <assert.h>
};
typedef struct FLACContext {
+ FLACSTREAMINFO
+
AVCodecContext *avctx;
GetBitContext gb;
- int min_blocksize, max_blocksize;
- int min_framesize, max_framesize;
- int samplerate, channels;
int blocksize/*, last_blocksize*/;
- int bps, curr_bps;
+ int curr_bps;
enum decorrelation_type decorrelation;
int32_t *decoded[MAX_CHANNELS];
uint8_t *bitstream;
- int bitstream_size;
- int bitstream_index;
+ unsigned int bitstream_size;
+ unsigned int bitstream_index;
unsigned int allocated_bitstream_size;
} FLACContext;
#define METADATA_TYPE_STREAMINFO 0
-static int sample_rate_table[] =
-{ 0, 0, 0, 0,
+static const int sample_rate_table[] =
+{ 0,
+ 88200, 176400, 192000,
8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,
0, 0, 0, 0 };
-static int sample_size_table[] =
+static const int sample_size_table[] =
{ 0, 8, 12, 0, 16, 20, 24, 0 };
-static int blocksize_table[] = {
+static const int blocksize_table[] = {
0, 192, 576<<0, 576<<1, 576<<2, 576<<3, 0, 0,
256<<0, 256<<1, 256<<2, 256<<3, 256<<4, 256<<5, 256<<6, 256<<7
};
return val;
}
-static void metadata_streaminfo(FLACContext *s);
static void allocate_buffers(FLACContext *s);
static int metadata_parse(FLACContext *s);
-static int flac_decode_init(AVCodecContext * avctx)
+static av_cold int flac_decode_init(AVCodecContext * avctx)
{
FLACContext *s = avctx->priv_data;
s->avctx = avctx;
if (avctx->extradata_size > 4) {
/* initialize based on the demuxer-supplied streamdata header */
- init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
if (avctx->extradata_size == FLAC_STREAMINFO_SIZE) {
- metadata_streaminfo(s);
+ ff_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, avctx->extradata);
allocate_buffers(s);
} else {
+ init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
metadata_parse(s);
}
}
+ avctx->sample_fmt = SAMPLE_FMT_S16;
return 0;
}
-static void dump_headers(FLACContext *s)
+static void dump_headers(AVCodecContext *avctx, FLACStreaminfo *s)
{
- av_log(s->avctx, AV_LOG_DEBUG, " Blocksize: %d .. %d (%d)\n", s->min_blocksize, s->max_blocksize, s->blocksize);
- av_log(s->avctx, AV_LOG_DEBUG, " Framesize: %d .. %d\n", s->min_framesize, s->max_framesize);
- av_log(s->avctx, AV_LOG_DEBUG, " Samplerate: %d\n", s->samplerate);
- av_log(s->avctx, AV_LOG_DEBUG, " Channels: %d\n", s->channels);
- av_log(s->avctx, AV_LOG_DEBUG, " Bits: %d\n", s->bps);
+ av_log(avctx, AV_LOG_DEBUG, " Blocksize: %d .. %d\n", s->min_blocksize, s->max_blocksize);
+ av_log(avctx, AV_LOG_DEBUG, " Max Framesize: %d\n", s->max_framesize);
+ av_log(avctx, AV_LOG_DEBUG, " Samplerate: %d\n", s->samplerate);
+ av_log(avctx, AV_LOG_DEBUG, " Channels: %d\n", s->channels);
+ av_log(avctx, AV_LOG_DEBUG, " Bits: %d\n", s->bps);
}
static void allocate_buffers(FLACContext *s){
s->decoded[i] = av_realloc(s->decoded[i], sizeof(int32_t)*s->max_blocksize);
}
- s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
+ if(s->allocated_bitstream_size < s->max_framesize)
+ s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
}
-static void metadata_streaminfo(FLACContext *s)
+void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
+ const uint8_t *buffer)
{
+ GetBitContext gb;
+ init_get_bits(&gb, buffer, FLAC_STREAMINFO_SIZE*8);
+
/* mandatory streaminfo */
- s->min_blocksize = get_bits(&s->gb, 16);
- s->max_blocksize = get_bits(&s->gb, 16);
+ s->min_blocksize = get_bits(&gb, 16);
+ s->max_blocksize = get_bits(&gb, 16);
- s->min_framesize = get_bits_long(&s->gb, 24);
- s->max_framesize = get_bits_long(&s->gb, 24);
+ skip_bits(&gb, 24); /* skip min frame size */
+ s->max_framesize = get_bits_long(&gb, 24);
- s->samplerate = get_bits_long(&s->gb, 20);
- s->channels = get_bits(&s->gb, 3) + 1;
- s->bps = get_bits(&s->gb, 5) + 1;
+ s->samplerate = get_bits_long(&gb, 20);
+ s->channels = get_bits(&gb, 3) + 1;
+ s->bps = get_bits(&gb, 5) + 1;
- s->avctx->channels = s->channels;
- s->avctx->sample_rate = s->samplerate;
+ avctx->channels = s->channels;
+ avctx->sample_rate = s->samplerate;
- skip_bits(&s->gb, 36); /* total num of samples */
+ skip_bits(&gb, 36); /* total num of samples */
- skip_bits(&s->gb, 64); /* md5 sum */
- skip_bits(&s->gb, 64); /* md5 sum */
+ skip_bits(&gb, 64); /* md5 sum */
+ skip_bits(&gb, 64); /* md5 sum */
- dump_headers(s);
+ dump_headers(avctx, s);
}
/**
static int metadata_parse(FLACContext *s)
{
int i, metadata_last, metadata_type, metadata_size, streaminfo_updated=0;
+ int initial_pos= get_bits_count(&s->gb);
if (show_bits_long(&s->gb, 32) == MKBETAG('f','L','a','C')) {
skip_bits(&s->gb, 32);
metadata_type = get_bits(&s->gb, 7);
metadata_size = get_bits_long(&s->gb, 24);
+ if(get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits){
+ skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb));
+ break;
+ }
+
av_log(s->avctx, AV_LOG_DEBUG,
" metadata block: flag = %d, type = %d, size = %d\n",
metadata_last, metadata_type, metadata_size);
if (metadata_size) {
switch (metadata_type) {
case METADATA_TYPE_STREAMINFO:
- metadata_streaminfo(s);
+ ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, s->gb.buffer+get_bits_count(&s->gb)/8);
streaminfo_updated = 1;
- break;
default:
for (i=0; i<metadata_size; i++)
int sample = 0, samples;
method_type = get_bits(&s->gb, 2);
- if (method_type != 0){
+ if (method_type > 1){
av_log(s->avctx, AV_LOG_DEBUG, "illegal residual coding method %d\n", method_type);
return -1;
}
i= pred_order;
for (partition = 0; partition < (1 << rice_order); partition++)
{
- tmp = get_bits(&s->gb, 4);
- if (tmp == 15)
+ tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5);
+ if (tmp == (method_type == 0 ? 15 : 31))
{
av_log(s->avctx, AV_LOG_DEBUG, "fixed len partition\n");
tmp = get_bits(&s->gb, 5);
static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order)
{
- int i;
+ const int blocksize = s->blocksize;
+ int32_t *decoded = s->decoded[channel];
+ int a, b, c, d, i;
// av_log(s->avctx, AV_LOG_DEBUG, " SUBFRAME FIXED\n");
for (i = 0; i < pred_order; i++)
{
- s->decoded[channel][i] = get_sbits(&s->gb, s->curr_bps);
+ decoded[i] = get_sbits(&s->gb, s->curr_bps);
// av_log(s->avctx, AV_LOG_DEBUG, " %d: %d\n", i, s->decoded[channel][i]);
}
if (decode_residuals(s, channel, pred_order) < 0)
return -1;
+ if(pred_order > 0)
+ a = decoded[pred_order-1];
+ if(pred_order > 1)
+ b = a - decoded[pred_order-2];
+ if(pred_order > 2)
+ c = b - decoded[pred_order-2] + decoded[pred_order-3];
+ if(pred_order > 3)
+ d = c - decoded[pred_order-2] + 2*decoded[pred_order-3] - decoded[pred_order-4];
+
switch(pred_order)
{
case 0:
break;
case 1:
- for (i = pred_order; i < s->blocksize; i++)
- s->decoded[channel][i] += s->decoded[channel][i-1];
+ for (i = pred_order; i < blocksize; i++)
+ decoded[i] = a += decoded[i];
break;
case 2:
- for (i = pred_order; i < s->blocksize; i++)
- s->decoded[channel][i] += 2*s->decoded[channel][i-1]
- - s->decoded[channel][i-2];
+ for (i = pred_order; i < blocksize; i++)
+ decoded[i] = a += b += decoded[i];
break;
case 3:
- for (i = pred_order; i < s->blocksize; i++)
- s->decoded[channel][i] += 3*s->decoded[channel][i-1]
- - 3*s->decoded[channel][i-2]
- + s->decoded[channel][i-3];
+ for (i = pred_order; i < blocksize; i++)
+ decoded[i] = a += b += c += decoded[i];
break;
case 4:
- for (i = pred_order; i < s->blocksize; i++)
- s->decoded[channel][i] += 4*s->decoded[channel][i-1]
- - 6*s->decoded[channel][i-2]
- + 4*s->decoded[channel][i-3]
- - s->decoded[channel][i-4];
+ for (i = pred_order; i < blocksize; i++)
+ decoded[i] = a += b += c += d += decoded[i];
break;
default:
av_log(s->avctx, AV_LOG_ERROR, "illegal pred order %d\n", pred_order);
int i, j;
int coeff_prec, qlevel;
int coeffs[pred_order];
+ int32_t *decoded = s->decoded[channel];
// av_log(s->avctx, AV_LOG_DEBUG, " SUBFRAME LPC\n");
for (i = 0; i < pred_order; i++)
{
- s->decoded[channel][i] = get_sbits(&s->gb, s->curr_bps);
-// av_log(s->avctx, AV_LOG_DEBUG, " %d: %d\n", i, s->decoded[channel][i]);
+ decoded[i] = get_sbits(&s->gb, s->curr_bps);
+// av_log(s->avctx, AV_LOG_DEBUG, " %d: %d\n", i, decoded[i]);
}
coeff_prec = get_bits(&s->gb, 4) + 1;
{
sum = 0;
for (j = 0; j < pred_order; j++)
- sum += (int64_t)coeffs[j] * s->decoded[channel][i-j-1];
- s->decoded[channel][i] += sum >> qlevel;
+ sum += (int64_t)coeffs[j] * decoded[i-j-1];
+ decoded[i] += sum >> qlevel;
}
} else {
- int sum;
- for (i = pred_order; i < s->blocksize; i++)
+ for (i = pred_order; i < s->blocksize-1; i += 2)
{
- sum = 0;
+ int c;
+ int d = decoded[i-pred_order];
+ int s0 = 0, s1 = 0;
+ for (j = pred_order-1; j > 0; j--)
+ {
+ c = coeffs[j];
+ s0 += c*d;
+ d = decoded[i-j];
+ s1 += c*d;
+ }
+ c = coeffs[0];
+ s0 += c*d;
+ d = decoded[i] += s0 >> qlevel;
+ s1 += c*d;
+ decoded[i+1] += s1 >> qlevel;
+ }
+ if (i < s->blocksize)
+ {
+ int sum = 0;
for (j = 0; j < pred_order; j++)
- sum += coeffs[j] * s->decoded[channel][i-j-1];
- s->decoded[channel][i] += sum >> qlevel;
+ sum += coeffs[j] * decoded[i-j-1];
+ decoded[i] += sum >> qlevel;
}
}
if (sample_rate_code == 0){
samplerate= s->samplerate;
- }else if ((sample_rate_code > 3) && (sample_rate_code < 12))
+ }else if (sample_rate_code < 12)
samplerate = sample_rate_table[sample_rate_code];
else if (sample_rate_code == 12)
samplerate = get_bits(&s->gb, 8) * 1000;
}
skip_bits(&s->gb, 8);
- crc8= av_crc(av_crc07, 0, s->gb.buffer, get_bits_count(&s->gb)/8);
+ crc8 = av_crc(av_crc_get_table(AV_CRC_8_ATM), 0,
+ s->gb.buffer, get_bits_count(&s->gb)/8);
if(crc8){
av_log(s->avctx, AV_LOG_ERROR, "header crc mismatch crc=%2X\n", crc8);
return -1;
s->bps = bps;
s->decorrelation= decorrelation;
-// dump_headers(s);
+// dump_headers(s->avctx, (FLACStreaminfo *)s);
/* subframes */
for (i = 0; i < s->channels; i++)
static int flac_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
FLACContext *s = avctx->priv_data;
int tmp = 0, i, j = 0, input_buf_size = 0;
*data_size=0;
if(s->max_framesize == 0){
- s->max_framesize= 65536; // should hopefully be enough for the first header
+ s->max_framesize= FFMAX(4, buf_size); // should hopefully be enough for the first header
s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize);
}
if(1 && s->max_framesize){//FIXME truncated
- buf_size= FFMAX(FFMIN(buf_size, s->max_framesize - s->bitstream_size), 0);
+ if(s->bitstream_size < 4 || AV_RL32(s->bitstream) != MKTAG('f','L','a','C'))
+ buf_size= FFMIN(buf_size, s->max_framesize - FFMIN(s->bitstream_size, s->max_framesize));
input_buf_size= buf_size;
+ if(s->bitstream_size + buf_size < buf_size || s->bitstream_index + s->bitstream_size + buf_size < s->bitstream_index)
+ return -1;
+
+ if(s->allocated_bitstream_size < s->bitstream_size + buf_size)
+ s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->bitstream_size + buf_size);
+
if(s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size){
// printf("memmove\n");
memmove(s->bitstream, &s->bitstream[s->bitstream_index], s->bitstream_size);
buf_size += s->bitstream_size;
s->bitstream_size= buf_size;
- if(buf_size < s->max_framesize){
+ if(buf_size < s->max_framesize && input_buf_size){
// printf("wanna more data ...\n");
return input_buf_size;
}
init_get_bits(&s->gb, buf, buf_size*8);
- if (!metadata_parse(s))
- {
+ if(metadata_parse(s))
+ goto end;
+
tmp = show_bits(&s->gb, 16);
- if(tmp != 0xFFF8){
+ if((tmp & 0xFFFE) != 0xFFF8){
av_log(s->avctx, AV_LOG_ERROR, "FRAME HEADER not here\n");
- while(get_bits_count(&s->gb)/8+2 < buf_size && show_bits(&s->gb, 16) != 0xFFF8)
+ while(get_bits_count(&s->gb)/8+2 < buf_size && (show_bits(&s->gb, 16) & 0xFFFE) != 0xFFF8)
skip_bits(&s->gb, 8);
goto end; // we may not have enough bits left to decode a frame, so try next time
}
s->bitstream_index=0;
return -1;
}
- }
#if 0
// s->last_blocksize = s->blocksize;
end:
- i= (get_bits_count(&s->gb)+7)/8;;
+ i= (get_bits_count(&s->gb)+7)/8;
if(i > buf_size){
av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size);
s->bitstream_size=0;
return i;
}
-static int flac_decode_close(AVCodecContext *avctx)
+static av_cold int flac_decode_close(AVCodecContext *avctx)
{
FLACContext *s = avctx->priv_data;
int i;
NULL,
flac_decode_close,
flac_decode_frame,
+ CODEC_CAP_DELAY,
.flush= flac_flush,
+ .long_name= NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
};
projects / ffmpeg / blobdiff