Skip to content

F
ffmpeg.wasm-core
Commit e35b689e authored by Justin Ruggles's avatar Justin Ruggles
Browse files
Options

cosmetics: pretty-print flacenc.c 

Originally committed as revision 24597 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 965a3ddb
Show whitespace changes
Inline Side-by-side
Showing with 344 additions and 325 deletions
libavcodec/flacenc.c
View file @ e35b689e
...@@ -98,8 +98,9 @@ typedef struct FlacEncodeContext { ...@@ -98,8 +98,9 @@ typedef struct FlacEncodeContext {
struct AVMD5 *md5ctx; struct AVMD5 *md5ctx;
} FlacEncodeContext; } FlacEncodeContext;
/** /**
* Write streaminfo metadata block to byte array * Write streaminfo metadata block to byte array.
*/ */
static void write_streaminfo(FlacEncodeContext *s, uint8_t *header) static void write_streaminfo(FlacEncodeContext *s, uint8_t *header)
{ {
...@@ -123,9 +124,10 @@ static void write_streaminfo(FlacEncodeContext *s, uint8_t *header) ...@@ -123,9 +124,10 @@ static void write_streaminfo(FlacEncodeContext *s, uint8_t *header)
memcpy(&header[18], s->md5sum, 16); memcpy(&header[18], s->md5sum, 16);
} }
/** /**
* Set blocksize based on samplerate * Set blocksize based on samplerate.
* Choose the closest predefined blocksize >= BLOCK_TIME_MS milliseconds * Choose the closest predefined blocksize >= BLOCK_TIME_MS milliseconds.
*/ */
static int select_blocksize(int samplerate, int block_time_ms) static int select_blocksize(int samplerate, int block_time_ms)
{ {
...@@ -136,14 +138,16 @@ static int select_blocksize(int samplerate, int block_time_ms) ...@@ -136,14 +138,16 @@ static int select_blocksize(int samplerate, int block_time_ms)
assert(samplerate > 0); assert(samplerate > 0);
blocksize = ff_flac_blocksize_table[1]; blocksize = ff_flac_blocksize_table[1];
target = (samplerate * block_time_ms) / 1000; target = (samplerate * block_time_ms) / 1000;
for(i=0; i<16; i++) { for (i = 0; i < 16; i++) {
if(target >= ff_flac_blocksize_table[i] && ff_flac_blocksize_table[i] > blocksize) { if (target >= ff_flac_blocksize_table[i] &&
ff_flac_blocksize_table[i] > blocksize) {
blocksize = ff_flac_blocksize_table[i]; blocksize = ff_flac_blocksize_table[i];
} }
} }
return blocksize; return blocksize;
} }
static av_cold int flac_encode_init(AVCodecContext *avctx) static av_cold int flac_encode_init(AVCodecContext *avctx)
{ {
int freq = avctx->sample_rate; int freq = avctx->sample_rate;
...@@ -156,20 +160,18 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -156,20 +160,18 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
dsputil_init(&s->dsp, avctx); dsputil_init(&s->dsp, avctx);
if(avctx->sample_fmt != SAMPLE_FMT_S16) { if (avctx->sample_fmt != SAMPLE_FMT_S16)
return -1; return -1;
}
if(channels < 1 || channels > FLAC_MAX_CHANNELS) { if (channels < 1 || channels > FLAC_MAX_CHANNELS)
return -1; return -1;
}
s->channels = channels; s->channels = channels;
/* find samplerate in table */ /* find samplerate in table */
if(freq < 1) if (freq < 1)
return -1; return -1;
for(i=4; i<12; i++) { for (i = 4; i < 12; i++) {
if(freq == ff_flac_sample_rate_table[i]) { if (freq == ff_flac_sample_rate_table[i]) {
s->samplerate = ff_flac_sample_rate_table[i]; s->samplerate = ff_flac_sample_rate_table[i];
s->sr_code[0] = i; s->sr_code[0] = i;
s->sr_code[1] = 0; s->sr_code[1] = 0;
...@@ -177,14 +179,14 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -177,14 +179,14 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
} }
} }
/* if not in table, samplerate is non-standard */ /* if not in table, samplerate is non-standard */
if(i == 12) { if (i == 12) {
if(freq % 1000 == 0 && freq < 255000) { if (freq % 1000 == 0 && freq < 255000) {
s->sr_code[0] = 12; s->sr_code[0] = 12;
s->sr_code[1] = freq / 1000; s->sr_code[1] = freq / 1000;
} else if(freq % 10 == 0 && freq < 655350) { } else if (freq % 10 == 0 && freq < 655350) {
s->sr_code[0] = 14; s->sr_code[0] = 14;
s->sr_code[1] = freq / 10; s->sr_code[1] = freq / 10;
} else if(freq < 65535) { } else if (freq < 65535) {
s->sr_code[0] = 13; s->sr_code[0] = 13;
s->sr_code[1] = freq; s->sr_code[1] = freq;
} else { } else {
...@@ -194,33 +196,36 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -194,33 +196,36 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
} }
/* set compression option defaults based on avctx->compression_level */ /* set compression option defaults based on avctx->compression_level */
if(avctx->compression_level < 0) { if (avctx->compression_level < 0)
s->options.compression_level = 5; s->options.compression_level = 5;
} else { else
s->options.compression_level = avctx->compression_level; s->options.compression_level = avctx->compression_level;
}
av_log(avctx, AV_LOG_DEBUG, " compression: %d\n", s->options.compression_level); av_log(avctx, AV_LOG_DEBUG, " compression: %d\n", s->options.compression_level);
level= s->options.compression_level; level = s->options.compression_level;
if(level > 12) { if (level > 12) {
av_log(avctx, AV_LOG_ERROR, "invalid compression level: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid compression level: %d\n",
s->options.compression_level); s->options.compression_level);
return -1; return -1;
} }
s->options.block_time_ms = ((int[]){ 27, 27, 27,105,105,105,105,105,105,105,105,105,105})[level]; s->options.block_time_ms = ((int[]){ 27, 27, 27,105,105,105,105,105,105,105,105,105,105})[level];
s->options.lpc_type = ((int[]){ AV_LPC_TYPE_FIXED, AV_LPC_TYPE_FIXED, AV_LPC_TYPE_FIXED, s->options.lpc_type = ((int[]){ AV_LPC_TYPE_FIXED, AV_LPC_TYPE_FIXED, AV_LPC_TYPE_FIXED,
AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON,
AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON,
AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON, AV_LPC_TYPE_LEVINSON,
AV_LPC_TYPE_LEVINSON})[level]; AV_LPC_TYPE_LEVINSON})[level];
s->options.min_prediction_order= ((int[]){ 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})[level];
s->options.max_prediction_order= ((int[]){ 3, 4, 4, 6, 8, 8, 8, 8, 12, 12, 12, 32, 32})[level]; s->options.min_prediction_order = ((int[]){ 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})[level];
s->options.max_prediction_order = ((int[]){ 3, 4, 4, 6, 8, 8, 8, 8, 12, 12, 12, 32, 32})[level];
s->options.prediction_order_method = ((int[]){ ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST, s->options.prediction_order_method = ((int[]){ ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST,
ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST, ORDER_METHOD_EST,
ORDER_METHOD_4LEVEL, ORDER_METHOD_LOG, ORDER_METHOD_4LEVEL, ORDER_METHOD_4LEVEL, ORDER_METHOD_LOG, ORDER_METHOD_4LEVEL,
ORDER_METHOD_LOG, ORDER_METHOD_SEARCH, ORDER_METHOD_LOG, ORDER_METHOD_LOG, ORDER_METHOD_SEARCH, ORDER_METHOD_LOG,
ORDER_METHOD_SEARCH})[level]; ORDER_METHOD_SEARCH})[level];
s->options.min_partition_order = ((int[]){ 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})[level]; s->options.min_partition_order = ((int[]){ 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})[level];
s->options.max_partition_order = ((int[]){ 2, 2, 3, 3, 3, 8, 8, 8, 8, 8, 8, 8, 8})[level]; s->options.max_partition_order = ((int[]){ 2, 2, 3, 3, 3, 8, 8, 8, 8, 8, 8, 8, 8})[level];
...@@ -275,12 +280,12 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -275,12 +280,12 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
s->options.min_prediction_order = 0; s->options.min_prediction_order = 0;
} else if (avctx->min_prediction_order >= 0) { } else if (avctx->min_prediction_order >= 0) {
if (s->options.lpc_type == AV_LPC_TYPE_FIXED) { if (s->options.lpc_type == AV_LPC_TYPE_FIXED) {
if(avctx->min_prediction_order > MAX_FIXED_ORDER) { if (avctx->min_prediction_order > MAX_FIXED_ORDER) {
av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n",
avctx->min_prediction_order); avctx->min_prediction_order);
return -1; return -1;
} }
} else if(avctx->min_prediction_order < MIN_LPC_ORDER || } else if (avctx->min_prediction_order < MIN_LPC_ORDER ||
avctx->min_prediction_order > MAX_LPC_ORDER) { avctx->min_prediction_order > MAX_LPC_ORDER) {
av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n",
avctx->min_prediction_order); avctx->min_prediction_order);
...@@ -292,7 +297,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -292,7 +297,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
s->options.max_prediction_order = 0; s->options.max_prediction_order = 0;
} else if (avctx->max_prediction_order >= 0) { } else if (avctx->max_prediction_order >= 0) {
if (s->options.lpc_type == AV_LPC_TYPE_FIXED) { if (s->options.lpc_type == AV_LPC_TYPE_FIXED) {
if(avctx->max_prediction_order > MAX_FIXED_ORDER) { if (avctx->max_prediction_order > MAX_FIXED_ORDER) {
av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n",
avctx->max_prediction_order); avctx->max_prediction_order);
return -1; return -1;
...@@ -305,7 +310,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -305,7 +310,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
} }
s->options.max_prediction_order = avctx->max_prediction_order; s->options.max_prediction_order = avctx->max_prediction_order;
} }
if(s->options.max_prediction_order < s->options.min_prediction_order) { if (s->options.max_prediction_order < s->options.min_prediction_order) {
av_log(avctx, AV_LOG_ERROR, "invalid prediction orders: min=%d max=%d\n", av_log(avctx, AV_LOG_ERROR, "invalid prediction orders: min=%d max=%d\n",
s->options.min_prediction_order, s->options.max_prediction_order); s->options.min_prediction_order, s->options.max_prediction_order);
return -1; return -1;
...@@ -313,15 +318,15 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -313,15 +318,15 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_DEBUG, " prediction order: %d, %d\n", av_log(avctx, AV_LOG_DEBUG, " prediction order: %d, %d\n",
s->options.min_prediction_order, s->options.max_prediction_order); s->options.min_prediction_order, s->options.max_prediction_order);
if(avctx->prediction_order_method >= 0) { if (avctx->prediction_order_method >= 0) {
if(avctx->prediction_order_method > ORDER_METHOD_LOG) { if (avctx->prediction_order_method > ORDER_METHOD_LOG) {
av_log(avctx, AV_LOG_ERROR, "invalid prediction order method: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid prediction order method: %d\n",
avctx->prediction_order_method); avctx->prediction_order_method);
return -1; return -1;
} }
s->options.prediction_order_method = avctx->prediction_order_method; s->options.prediction_order_method = avctx->prediction_order_method;
} }
switch(s->options.prediction_order_method) { switch (s->options.prediction_order_method) {
case ORDER_METHOD_EST: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", case ORDER_METHOD_EST: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n",
"estimate"); break; "estimate"); break;
case ORDER_METHOD_2LEVEL: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n", case ORDER_METHOD_2LEVEL: av_log(avctx, AV_LOG_DEBUG, " order method: %s\n",
...@@ -336,23 +341,23 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -336,23 +341,23 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
"log search"); break; "log search"); break;
} }
if(avctx->min_partition_order >= 0) { if (avctx->min_partition_order >= 0) {
if(avctx->min_partition_order > MAX_PARTITION_ORDER) { if (avctx->min_partition_order > MAX_PARTITION_ORDER) {
av_log(avctx, AV_LOG_ERROR, "invalid min partition order: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid min partition order: %d\n",
avctx->min_partition_order); avctx->min_partition_order);
return -1; return -1;
} }
s->options.min_partition_order = avctx->min_partition_order; s->options.min_partition_order = avctx->min_partition_order;
} }
if(avctx->max_partition_order >= 0) { if (avctx->max_partition_order >= 0) {
if(avctx->max_partition_order > MAX_PARTITION_ORDER) { if (avctx->max_partition_order > MAX_PARTITION_ORDER) {
av_log(avctx, AV_LOG_ERROR, "invalid max partition order: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid max partition order: %d\n",
avctx->max_partition_order); avctx->max_partition_order);
return -1; return -1;
} }
s->options.max_partition_order = avctx->max_partition_order; s->options.max_partition_order = avctx->max_partition_order;
} }
if(s->options.max_partition_order < s->options.min_partition_order) { if (s->options.max_partition_order < s->options.min_partition_order) {
av_log(avctx, AV_LOG_ERROR, "invalid partition orders: min=%d max=%d\n", av_log(avctx, AV_LOG_ERROR, "invalid partition orders: min=%d max=%d\n",
s->options.min_partition_order, s->options.max_partition_order); s->options.min_partition_order, s->options.max_partition_order);
return -1; return -1;
...@@ -360,8 +365,8 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -360,8 +365,8 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_DEBUG, " partition order: %d, %d\n", av_log(avctx, AV_LOG_DEBUG, " partition order: %d, %d\n",
s->options.min_partition_order, s->options.max_partition_order); s->options.min_partition_order, s->options.max_partition_order);
if(avctx->frame_size > 0) { if (avctx->frame_size > 0) {
if(avctx->frame_size < FLAC_MIN_BLOCKSIZE || if (avctx->frame_size < FLAC_MIN_BLOCKSIZE ||
avctx->frame_size > FLAC_MAX_BLOCKSIZE) { avctx->frame_size > FLAC_MAX_BLOCKSIZE) {
av_log(avctx, AV_LOG_ERROR, "invalid block size: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid block size: %d\n",
avctx->frame_size); avctx->frame_size);
...@@ -374,8 +379,8 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -374,8 +379,8 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_DEBUG, " block size: %d\n", s->avctx->frame_size); av_log(avctx, AV_LOG_DEBUG, " block size: %d\n", s->avctx->frame_size);
/* set LPC precision */ /* set LPC precision */
if(avctx->lpc_coeff_precision > 0) { if (avctx->lpc_coeff_precision > 0) {
if(avctx->lpc_coeff_precision > MAX_LPC_PRECISION) { if (avctx->lpc_coeff_precision > MAX_LPC_PRECISION) {
av_log(avctx, AV_LOG_ERROR, "invalid lpc coeff precision: %d\n", av_log(avctx, AV_LOG_ERROR, "invalid lpc coeff precision: %d\n",
avctx->lpc_coeff_precision); avctx->lpc_coeff_precision);
return -1; return -1;
...@@ -394,7 +399,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -394,7 +399,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
/* initialize MD5 context */ /* initialize MD5 context */
s->md5ctx = av_malloc(av_md5_size); s->md5ctx = av_malloc(av_md5_size);
if(!s->md5ctx) if (!s->md5ctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_md5_init(s->md5ctx); av_md5_init(s->md5ctx);
...@@ -412,6 +417,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -412,6 +417,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static void init_frame(FlacEncodeContext *s) static void init_frame(FlacEncodeContext *s)
{ {
int i, ch; int i, ch;
...@@ -419,17 +425,17 @@ static void init_frame(FlacEncodeContext *s) ...@@ -419,17 +425,17 @@ static void init_frame(FlacEncodeContext *s)
frame = &s->frame; frame = &s->frame;
for(i=0; i<16; i++) { for (i = 0; i < 16; i++) {
if(s->avctx->frame_size == ff_flac_blocksize_table[i]) { if (s->avctx->frame_size == ff_flac_blocksize_table[i]) {
frame->blocksize = ff_flac_blocksize_table[i]; frame->blocksize = ff_flac_blocksize_table[i];
frame->bs_code[0] = i; frame->bs_code[0] = i;
frame->bs_code[1] = 0; frame->bs_code[1] = 0;
break; break;
} }
} }
if(i == 16) { if (i == 16) {
frame->blocksize = s->avctx->frame_size; frame->blocksize = s->avctx->frame_size;
if(frame->blocksize <= 256) { if (frame->blocksize <= 256) {
frame->bs_code[0] = 6; frame->bs_code[0] = 6;
frame->bs_code[1] = frame->blocksize-1; frame->bs_code[1] = frame->blocksize-1;
} else { } else {
...@@ -438,13 +444,13 @@ static void init_frame(FlacEncodeContext *s) ...@@ -438,13 +444,13 @@ static void init_frame(FlacEncodeContext *s)
} }
} }
for(ch=0; ch<s->channels; ch++) { for (ch = 0; ch < s->channels; ch++)
frame->subframes[ch].obits = 16; frame->subframes[ch].obits = 16;
}
} }
/** /**
* Copy channel-interleaved input samples into separate subframes * Copy channel-interleaved input samples into separate subframes.
*/ */
static void copy_samples(FlacEncodeContext *s, const int16_t *samples) static void copy_samples(FlacEncodeContext *s, const int16_t *samples)
{ {
...@@ -452,31 +458,30 @@ static void copy_samples(FlacEncodeContext *s, const int16_t *samples) ...@@ -452,31 +458,30 @@ static void copy_samples(FlacEncodeContext *s, const int16_t *samples)
FlacFrame *frame; FlacFrame *frame;
frame = &s->frame; frame = &s->frame;
for(i=0,j=0; i<frame->blocksize; i++) { for (i = 0, j = 0; i < frame->blocksize; i++)
for(ch=0; ch<s->channels; ch++,j++) { for (ch = 0; ch < s->channels; ch++, j++)
frame->subframes[ch].samples[i] = samples[j]; frame->subframes[ch].samples[i] = samples[j];
}
}
} }
#define rice_encode_count(sum, n, k) (((n)*((k)+1))+((sum-(n>>1))>>(k))) #define rice_encode_count(sum, n, k) (((n)*((k)+1))+((sum-(n>>1))>>(k)))
/** /**
* Solve for d/dk(rice_encode_count) = n-((sum-(n>>1))>>(k+1)) = 0 * Solve for d/dk(rice_encode_count) = n-((sum-(n>>1))>>(k+1)) = 0.
*/ */
static int find_optimal_param(uint32_t sum, int n) static int find_optimal_param(uint32_t sum, int n)
{ {
int k; int k;
uint32_t sum2; uint32_t sum2;
if(sum <= n>>1) if (sum <= n >> 1)
return 0; return 0;
sum2 = sum-(n>>1); sum2 = sum - (n >> 1);
k = av_log2(n<256 ? FASTDIV(sum2,n) : sum2/n); k = av_log2(n < 256 ? FASTDIV(sum2, n) : sum2 / n);
return FFMIN(k, MAX_RICE_PARAM); return FFMIN(k, MAX_RICE_PARAM);
} }
static uint32_t calc_optimal_rice_params(RiceContext *rc, int porder, static uint32_t calc_optimal_rice_params(RiceContext *rc, int porder,
uint32_t *sums, int n, int pred_order) uint32_t *sums, int n, int pred_order)
{ {
...@@ -488,7 +493,7 @@ static uint32_t calc_optimal_rice_params(RiceContext *rc, int porder, ...@@ -488,7 +493,7 @@ static uint32_t calc_optimal_rice_params(RiceContext *rc, int porder,
all_bits = 4 * part; all_bits = 4 * part;
cnt = (n >> porder) - pred_order; cnt = (n >> porder) - pred_order;
for(i=0; i<part; i++) { for (i = 0; i < part; i++) {
k = find_optimal_param(sums[i], cnt); k = find_optimal_param(sums[i], cnt);
rc->params[i] = k; rc->params[i] = k;
all_bits += rice_encode_count(sums[i], cnt, k); all_bits += rice_encode_count(sums[i], cnt, k);
...@@ -500,6 +505,7 @@ static uint32_t calc_optimal_rice_params(RiceContext *rc, int porder, ...@@ -500,6 +505,7 @@ static uint32_t calc_optimal_rice_params(RiceContext *rc, int porder,
return all_bits; return all_bits;
} }
static void calc_sums(int pmin, int pmax, uint32_t *data, int n, int pred_order, static void calc_sums(int pmin, int pmax, uint32_t *data, int n, int pred_order,
uint32_t sums[][MAX_PARTITIONS]) uint32_t sums[][MAX_PARTITIONS])
{ {
...@@ -511,23 +517,22 @@ static void calc_sums(int pmin, int pmax, uint32_t *data, int n, int pred_order, ...@@ -511,23 +517,22 @@ static void calc_sums(int pmin, int pmax, uint32_t *data, int n, int pred_order,
parts = (1 << pmax); parts = (1 << pmax);
res = &data[pred_order]; res = &data[pred_order];
res_end = &data[n >> pmax]; res_end = &data[n >> pmax];
for(i=0; i<parts; i++) { for (i = 0; i < parts; i++) {
uint32_t sum = 0; uint32_t sum = 0;
while(res < res_end){ while (res < res_end)
sum += *(res++); sum += *(res++);
}
sums[pmax][i] = sum; sums[pmax][i] = sum;
res_end+= n >> pmax; res_end += n >> pmax;
} }
/* sums for lower levels */ /* sums for lower levels */
for(i=pmax-1; i>=pmin; i--) { for (i = pmax - 1; i >= pmin; i--) {
parts = (1 << i); parts = (1 << i);
for(j=0; j<parts; j++) { for (j = 0; j < parts; j++)
sums[i][j] = sums[i+1][2*j] + sums[i+1][2*j+1]; sums[i][j] = sums[i+1][2*j] + sums[i+1][2*j+1];
} }
}
} }
static uint32_t calc_rice_params(RiceContext *rc, int pmin, int pmax, static uint32_t calc_rice_params(RiceContext *rc, int pmin, int pmax,
int32_t *data, int n, int pred_order) int32_t *data, int n, int pred_order)
{ {
...@@ -543,19 +548,18 @@ static uint32_t calc_rice_params(RiceContext *rc, int pmin, int pmax, ...@@ -543,19 +548,18 @@ static uint32_t calc_rice_params(RiceContext *rc, int pmin, int pmax,
assert(pmin <= pmax); assert(pmin <= pmax);
udata = av_malloc(n * sizeof(uint32_t)); udata = av_malloc(n * sizeof(uint32_t));
for(i=0; i<n; i++) { for (i = 0; i < n; i++)
udata[i] = (2*data[i]) ^ (data[i]>>31); udata[i] = (2*data[i]) ^ (data[i]>>31);
}
calc_sums(pmin, pmax, udata, n, pred_order, sums); calc_sums(pmin, pmax, udata, n, pred_order, sums);
opt_porder = pmin; opt_porder = pmin;
bits[pmin] = UINT32_MAX; bits[pmin] = UINT32_MAX;
for(i=pmin; i<=pmax; i++) { for (i = pmin; i <= pmax; i++) {
bits[i] = calc_optimal_rice_params(&tmp_rc, i, sums[i], n, pred_order); bits[i] = calc_optimal_rice_params(&tmp_rc, i, sums[i], n, pred_order);
if(bits[i] <= bits[opt_porder]) { if (bits[i] <= bits[opt_porder]) {
opt_porder = i; opt_porder = i;
*rc= tmp_rc; *rc = tmp_rc;
} }
} }
...@@ -563,14 +567,16 @@ static uint32_t calc_rice_params(RiceContext *rc, int pmin, int pmax, ...@@ -563,14 +567,16 @@ static uint32_t calc_rice_params(RiceContext *rc, int pmin, int pmax,
return bits[opt_porder]; return bits[opt_porder];
} }
static int get_max_p_order(int max_porder, int n, int order) static int get_max_p_order(int max_porder, int n, int order)
{ {
int porder = FFMIN(max_porder, av_log2(n^(n-1))); int porder = FFMIN(max_porder, av_log2(n^(n-1)));
if(order > 0) if (order > 0)
porder = FFMIN(porder, av_log2(n/order)); porder = FFMIN(porder, av_log2(n/order));
return porder; return porder;
} }
static uint32_t calc_rice_params_fixed(RiceContext *rc, int pmin, int pmax, static uint32_t calc_rice_params_fixed(RiceContext *rc, int pmin, int pmax,
int32_t *data, int n, int pred_order, int32_t *data, int n, int pred_order,
int bps) int bps)
...@@ -578,11 +584,12 @@ static uint32_t calc_rice_params_fixed(RiceContext *rc, int pmin, int pmax, ...@@ -578,11 +584,12 @@ static uint32_t calc_rice_params_fixed(RiceContext *rc, int pmin, int pmax,
uint32_t bits; uint32_t bits;
pmin = get_max_p_order(pmin, n, pred_order); pmin = get_max_p_order(pmin, n, pred_order);
pmax = get_max_p_order(pmax, n, pred_order); pmax = get_max_p_order(pmax, n, pred_order);
bits = pred_order*bps + 6; bits = pred_order * bps + 6;
bits += calc_rice_params(rc, pmin, pmax, data, n, pred_order); bits += calc_rice_params(rc, pmin, pmax, data, n, pred_order);
return bits; return bits;
} }
static uint32_t calc_rice_params_lpc(RiceContext *rc, int pmin, int pmax, static uint32_t calc_rice_params_lpc(RiceContext *rc, int pmin, int pmax,
int32_t *data, int n, int pred_order, int32_t *data, int n, int pred_order,
int bps, int precision) int bps, int precision)
...@@ -595,80 +602,82 @@ static uint32_t calc_rice_params_lpc(RiceContext *rc, int pmin, int pmax, ...@@ -595,80 +602,82 @@ static uint32_t calc_rice_params_lpc(RiceContext *rc, int pmin, int pmax,
return bits; return bits;
} }
static void encode_residual_verbatim(int32_t *res, int32_t *smp, int n) static void encode_residual_verbatim(int32_t *res, int32_t *smp, int n)
{ {
assert(n > 0); assert(n > 0);
memcpy(res, smp, n * sizeof(int32_t)); memcpy(res, smp, n * sizeof(int32_t));
} }
static void encode_residual_fixed(int32_t *res, const int32_t *smp, int n, static void encode_residual_fixed(int32_t *res, const int32_t *smp, int n,
int order) int order)
{ {
int i; int i;
for(i=0; i<order; i++) { for (i = 0; i < order; i++)
res[i] = smp[i]; res[i] = smp[i];
}
if(order==0){ if (order == 0) {
for(i=order; i<n; i++) for (i = order; i < n; i++)
res[i]= smp[i]; res[i] = smp[i];
}else if(order==1){ } else if (order == 1) {
for(i=order; i<n; i++) for (i = order; i < n; i++)
res[i]= smp[i] - smp[i-1]; res[i] = smp[i] - smp[i-1];
}else if(order==2){ } else if (order == 2) {
int a = smp[order-1] - smp[order-2]; int a = smp[order-1] - smp[order-2];
for(i=order; i<n; i+=2) { for (i = order; i < n; i += 2) {
int b = smp[i] - smp[i-1]; int b = smp[i ] - smp[i-1];
res[i]= b - a; res[i] = b - a;
a = smp[i+1] - smp[i]; a = smp[i+1] - smp[i ];
res[i+1]= a - b; res[i+1] = a - b;
} }
}else if(order==3){ } else if (order == 3) {
int a = smp[order-1] - smp[order-2]; int a = smp[order-1] - smp[order-2];
int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; int c = smp[order-1] - 2*smp[order-2] + smp[order-3];
for(i=order; i<n; i+=2) { for (i = order; i < n; i += 2) {
int b = smp[i] - smp[i-1]; int b = smp[i ] - smp[i-1];
int d = b - a; int d = b - a;
res[i]= d - c; res[i] = d - c;
a = smp[i+1] - smp[i]; a = smp[i+1] - smp[i ];
c = a - b; c = a - b;
res[i+1]= c - d; res[i+1] = c - d;
} }
}else{ } else {
int a = smp[order-1] - smp[order-2]; int a = smp[order-1] - smp[order-2];
int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; int c = smp[order-1] - 2*smp[order-2] + smp[order-3];
int e = smp[order-1] - 3*smp[order-2] + 3*smp[order-3] - smp[order-4]; int e = smp[order-1] - 3*smp[order-2] + 3*smp[order-3] - smp[order-4];
for(i=order; i<n; i+=2) { for (i = order; i < n; i += 2) {
int b = smp[i] - smp[i-1]; int b = smp[i ] - smp[i-1];
int d = b - a; int d = b - a;
int f = d - c; int f = d - c;
res[i]= f - e; res[i ] = f - e;
a = smp[i+1] - smp[i]; a = smp[i+1] - smp[i ];
c = a - b; c = a - b;
e = c - d; e = c - d;
res[i+1]= e - f; res[i+1] = e - f;
} }
} }
} }
#define LPC1(x) {\ #define LPC1(x) {\
int c = coefs[(x)-1];\ int c = coefs[(x)-1];\
p0 += c*s;\ p0 += c * s;\
s = smp[i-(x)+1];\ s = smp[i-(x)+1];\
p1 += c*s;\ p1 += c * s;\
} }
static av_always_inline void encode_residual_lpc_unrolled( static av_always_inline void encode_residual_lpc_unrolled(int32_t *res,
int32_t *res, const int32_t *smp, int n, const int32_t *smp, int n, int order,
int order, const int32_t *coefs, int shift, int big) const int32_t *coefs, int shift, int big)
{ {
int i; int i;
for(i=order; i<n; i+=2) { for (i = order; i < n; i += 2) {
int s = smp[i-order]; int s = smp[i-order];
int p0 = 0, p1 = 0; int p0 = 0, p1 = 0;
if(big) { if (big) {
switch(order) { switch (order) {
case 32: LPC1(32) case 32: LPC1(32)
case 31: LPC1(31) case 31: LPC1(31)
case 30: LPC1(30) case 30: LPC1(30)
...@@ -703,7 +712,7 @@ static av_always_inline void encode_residual_lpc_unrolled( ...@@ -703,7 +712,7 @@ static av_always_inline void encode_residual_lpc_unrolled(
LPC1( 1) LPC1( 1)
} }
} else { } else {
switch(order) { switch (order) {
case 8: LPC1( 8) case 8: LPC1( 8)
case 7: LPC1( 7) case 7: LPC1( 7)
case 6: LPC1( 6) case 6: LPC1( 6)
...@@ -719,29 +728,29 @@ static av_always_inline void encode_residual_lpc_unrolled( ...@@ -719,29 +728,29 @@ static av_always_inline void encode_residual_lpc_unrolled(
} }
} }
static void encode_residual_lpc(int32_t *res, const int32_t *smp, int n, static void encode_residual_lpc(int32_t *res, const int32_t *smp, int n,
int order, const int32_t *coefs, int shift) int order, const int32_t *coefs, int shift)
{ {
int i; int i;
for(i=0; i<order; i++) { for (i = 0; i < order; i++)
res[i] = smp[i]; res[i] = smp[i];
}
#if CONFIG_SMALL #if CONFIG_SMALL
for(i=order; i<n; i+=2) { for (i = order; i < n; i += 2) {
int j; int j;
int s = smp[i]; int s = smp[i];
int p0 = 0, p1 = 0; int p0 = 0, p1 = 0;
for(j=0; j<order; j++) { for (j = 0; j < order; j++) {
int c = coefs[j]; int c = coefs[j];
p1 += c*s; p1 += c * s;
s = smp[i-j-1]; s = smp[i-j-1];
p0 += c*s; p0 += c * s;
} }
res[i ] = smp[i ] - (p0 >> shift); res[i ] = smp[i ] - (p0 >> shift);
res[i+1] = smp[i+1] - (p1 >> shift); res[i+1] = smp[i+1] - (p1 >> shift);
} }
#else #else
switch(order) { switch (order) {
case 1: encode_residual_lpc_unrolled(res, smp, n, 1, coefs, shift, 0); break; case 1: encode_residual_lpc_unrolled(res, smp, n, 1, coefs, shift, 0); break;
case 2: encode_residual_lpc_unrolled(res, smp, n, 2, coefs, shift, 0); break; case 2: encode_residual_lpc_unrolled(res, smp, n, 2, coefs, shift, 0); break;
case 3: encode_residual_lpc_unrolled(res, smp, n, 3, coefs, shift, 0); break; case 3: encode_residual_lpc_unrolled(res, smp, n, 3, coefs, shift, 0); break;
...@@ -755,6 +764,7 @@ static void encode_residual_lpc(int32_t *res, const int32_t *smp, int n, ...@@ -755,6 +764,7 @@ static void encode_residual_lpc(int32_t *res, const int32_t *smp, int n,
#endif #endif
} }
static int encode_residual(FlacEncodeContext *ctx, int ch) static int encode_residual(FlacEncodeContext *ctx, int ch)
{ {
int i, n; int i, n;
...@@ -773,17 +783,17 @@ static int encode_residual(FlacEncodeContext *ctx, int ch) ...@@ -773,17 +783,17 @@ static int encode_residual(FlacEncodeContext *ctx, int ch)
n = frame->blocksize; n = frame->blocksize;
/* CONSTANT */ /* CONSTANT */
for(i=1; i<n; i++) { for (i = 1; i < n; i++)
if(smp[i] != smp[0]) break; if(smp[i] != smp[0])
} break;
if(i == n) { if (i == n) {
sub->type = sub->type_code = FLAC_SUBFRAME_CONSTANT; sub->type = sub->type_code = FLAC_SUBFRAME_CONSTANT;
res[0] = smp[0]; res[0] = smp[0];
return sub->obits; return sub->obits;
} }
/* VERBATIM */ /* VERBATIM */
if(n < 5) { if (n < 5) {
sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM; sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM;
encode_residual_verbatim(res, smp, n); encode_residual_verbatim(res, smp, n);
return sub->obits * n; return sub->obits * n;
...@@ -800,21 +810,21 @@ static int encode_residual(FlacEncodeContext *ctx, int ch) ...@@ -800,21 +810,21 @@ static int encode_residual(FlacEncodeContext *ctx, int ch)
if (ctx->options.lpc_type == AV_LPC_TYPE_NONE || if (ctx->options.lpc_type == AV_LPC_TYPE_NONE ||
ctx->options.lpc_type == AV_LPC_TYPE_FIXED || n <= max_order) { ctx->options.lpc_type == AV_LPC_TYPE_FIXED || n <= max_order) {
uint32_t bits[MAX_FIXED_ORDER+1]; uint32_t bits[MAX_FIXED_ORDER+1];
if(max_order > MAX_FIXED_ORDER) max_order = MAX_FIXED_ORDER; if (max_order > MAX_FIXED_ORDER)
max_order = MAX_FIXED_ORDER;
opt_order = 0; opt_order = 0;
bits[0] = UINT32_MAX; bits[0] = UINT32_MAX;
for(i=min_order; i<=max_order; i++) { for (i = min_order; i <= max_order; i++) {
encode_residual_fixed(res, smp, n, i); encode_residual_fixed(res, smp, n, i);
bits[i] = calc_rice_params_fixed(&sub->rc, min_porder, max_porder, res, bits[i] = calc_rice_params_fixed(&sub->rc, min_porder, max_porder, res,
n, i, sub->obits); n, i, sub->obits);
if(bits[i] < bits[opt_order]) { if (bits[i] < bits[opt_order])
opt_order = i; opt_order = i;
} }
}
sub->order = opt_order; sub->order = opt_order;
sub->type = FLAC_SUBFRAME_FIXED; sub->type = FLAC_SUBFRAME_FIXED;
sub->type_code = sub->type | sub->order; sub->type_code = sub->type | sub->order;
if(sub->order != max_order) { if (sub->order != max_order) {
encode_residual_fixed(res, smp, n, sub->order); encode_residual_fixed(res, smp, n, sub->order);
return calc_rice_params_fixed(&sub->rc, min_porder, max_porder, res, n, return calc_rice_params_fixed(&sub->rc, min_porder, max_porder, res, n,
sub->order, sub->obits); sub->order, sub->obits);
...@@ -828,7 +838,7 @@ static int encode_residual(FlacEncodeContext *ctx, int ch) ...@@ -828,7 +838,7 @@ static int encode_residual(FlacEncodeContext *ctx, int ch)
ctx->options.lpc_passes, omethod, ctx->options.lpc_passes, omethod,
MAX_LPC_SHIFT, 0); MAX_LPC_SHIFT, 0);
if(omethod == ORDER_METHOD_2LEVEL || if (omethod == ORDER_METHOD_2LEVEL ||
omethod == ORDER_METHOD_4LEVEL || omethod == ORDER_METHOD_4LEVEL ||
omethod == ORDER_METHOD_8LEVEL) { omethod == ORDER_METHOD_8LEVEL) {
int levels = 1 << omethod; int levels = 1 << omethod;
...@@ -837,49 +847,50 @@ static int encode_residual(FlacEncodeContext *ctx, int ch) ...@@ -837,49 +847,50 @@ static int encode_residual(FlacEncodeContext *ctx, int ch)
int opt_index = levels-1; int opt_index = levels-1;
opt_order = max_order-1; opt_order = max_order-1;
bits[opt_index] = UINT32_MAX; bits[opt_index] = UINT32_MAX;
for(i=levels-1; i>=0; i--) { for (i = levels-1; i >= 0; i--) {
order = min_order + (((max_order-min_order+1) * (i+1)) / levels)-1; order = min_order + (((max_order-min_order+1) * (i+1)) / levels)-1;
if(order < 0) order = 0; if (order < 0)
order = 0;
encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]); encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]);
bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder, bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder,
res, n, order+1, sub->obits, precision); res, n, order+1, sub->obits, precision);
if(bits[i] < bits[opt_index]) { if (bits[i] < bits[opt_index]) {
opt_index = i; opt_index = i;
opt_order = order; opt_order = order;
} }
} }
opt_order++; opt_order++;
} else if(omethod == ORDER_METHOD_SEARCH) { } else if (omethod == ORDER_METHOD_SEARCH) {
// brute-force optimal order search // brute-force optimal order search
uint32_t bits[MAX_LPC_ORDER]; uint32_t bits[MAX_LPC_ORDER];
opt_order = 0; opt_order = 0;
bits[0] = UINT32_MAX; bits[0] = UINT32_MAX;
for(i=min_order-1; i<max_order; i++) { for (i = min_order-1; i < max_order; i++) {
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]);
bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder, bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder,
res, n, i+1, sub->obits, precision); res, n, i+1, sub->obits, precision);
if(bits[i] < bits[opt_order]) { if (bits[i] < bits[opt_order])
opt_order = i; opt_order = i;
} }
}
opt_order++; opt_order++;
} else if(omethod == ORDER_METHOD_LOG) { } else if (omethod == ORDER_METHOD_LOG) {
uint32_t bits[MAX_LPC_ORDER]; uint32_t bits[MAX_LPC_ORDER];
int step; int step;
opt_order= min_order - 1 + (max_order-min_order)/3; opt_order = min_order - 1 + (max_order-min_order)/3;
memset(bits, -1, sizeof(bits)); memset(bits, -1, sizeof(bits));
for(step=16 ;step; step>>=1){ for (step = 16; step; step >>= 1) {
int last= opt_order; int last = opt_order;
for(i=last-step; i<=last+step; i+= step){ for (i = last-step; i <= last+step; i += step) {
if(i<min_order-1 || i>=max_order || bits[i] < UINT32_MAX) if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX)
continue; continue;
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]);
bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder, bits[i] = calc_rice_params_lpc(&sub->rc, min_porder, max_porder,
res, n, i+1, sub->obits, precision); res, n, i+1, sub->obits,
if(bits[i] < bits[opt_order]) precision);
opt_order= i; if (bits[i] < bits[opt_order])
opt_order = i;
} }
} }
opt_order++; opt_order++;
...@@ -889,14 +900,16 @@ static int encode_residual(FlacEncodeContext *ctx, int ch) ...@@ -889,14 +900,16 @@ static int encode_residual(FlacEncodeContext *ctx, int ch)
sub->type = FLAC_SUBFRAME_LPC; sub->type = FLAC_SUBFRAME_LPC;
sub->type_code = sub->type | (sub->order-1); sub->type_code = sub->type | (sub->order-1);
sub->shift = shift[sub->order-1]; sub->shift = shift[sub->order-1];
for(i=0; i<sub->order; i++) { for (i = 0; i < sub->order; i++)
sub->coefs[i] = coefs[sub->order-1][i]; sub->coefs[i] = coefs[sub->order-1][i];
}
encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift); encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift);
return calc_rice_params_lpc(&sub->rc, min_porder, max_porder, res, n, sub->order,
sub->obits, precision); return calc_rice_params_lpc(&sub->rc, min_porder, max_porder, res, n,
sub->order, sub->obits, precision);
} }
static int encode_residual_v(FlacEncodeContext *ctx, int ch) static int encode_residual_v(FlacEncodeContext *ctx, int ch)
{ {
int i, n; int i, n;
...@@ -911,10 +924,10 @@ static int encode_residual_v(FlacEncodeContext *ctx, int ch) ...@@ -911,10 +924,10 @@ static int encode_residual_v(FlacEncodeContext *ctx, int ch)
n = frame->blocksize; n = frame->blocksize;
/* CONSTANT */ /* CONSTANT */
for(i=1; i<n; i++) { for (i = 1; i < n; i++)
if(smp[i] != smp[0]) break; if (smp[i] != smp[0])
} break;
if(i == n) { if (i == n) {
sub->type = sub->type_code = FLAC_SUBFRAME_CONSTANT; sub->type = sub->type_code = FLAC_SUBFRAME_CONSTANT;
res[0] = smp[0]; res[0] = smp[0];
return sub->obits; return sub->obits;
...@@ -926,6 +939,7 @@ static int encode_residual_v(FlacEncodeContext *ctx, int ch) ...@@ -926,6 +939,7 @@ static int encode_residual_v(FlacEncodeContext *ctx, int ch)
return sub->obits * n; return sub->obits * n;
} }
static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n) static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n)
{ {
int i, best; int i, best;
...@@ -936,7 +950,7 @@ static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n) ...@@ -936,7 +950,7 @@ static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n)
/* calculate sum of 2nd order residual for each channel */ /* calculate sum of 2nd order residual for each channel */
sum[0] = sum[1] = sum[2] = sum[3] = 0; sum[0] = sum[1] = sum[2] = sum[3] = 0;
for(i=2; i<n; i++) { for (i = 2; i < n; i++) {
lt = left_ch[i] - 2*left_ch[i-1] + left_ch[i-2]; lt = left_ch[i] - 2*left_ch[i-1] + left_ch[i-2];
rt = right_ch[i] - 2*right_ch[i-1] + right_ch[i-2]; rt = right_ch[i] - 2*right_ch[i-1] + right_ch[i-2];
sum[2] += FFABS((lt + rt) >> 1); sum[2] += FFABS((lt + rt) >> 1);
...@@ -945,9 +959,9 @@ static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n) ...@@ -945,9 +959,9 @@ static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n)
sum[1] += FFABS(rt); sum[1] += FFABS(rt);
} }
/* estimate bit counts */ /* estimate bit counts */
for(i=0; i<4; i++) { for (i = 0; i < 4; i++) {
k = find_optimal_param(2*sum[i], n); k = find_optimal_param(2 * sum[i], n);
sum[i] = rice_encode_count(2*sum[i], n, k); sum[i] = rice_encode_count( 2 * sum[i], n, k);
} }
/* calculate score for each mode */ /* calculate score for each mode */
...@@ -958,24 +972,23 @@ static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n) ...@@ -958,24 +972,23 @@ static int estimate_stereo_mode(int32_t *left_ch, int32_t *right_ch, int n)
/* return mode with lowest score */ /* return mode with lowest score */
best = 0; best = 0;
for(i=1; i<4; i++) { for (i = 1; i < 4; i++)
if(score[i] < score[best]) { if (score[i] < score[best])
best = i; best = i;
} if (best == 0) {
}
if(best == 0) {
return FLAC_CHMODE_INDEPENDENT; return FLAC_CHMODE_INDEPENDENT;
} else if(best == 1) { } else if (best == 1) {
return FLAC_CHMODE_LEFT_SIDE; return FLAC_CHMODE_LEFT_SIDE;
} else if(best == 2) { } else if (best == 2) {
return FLAC_CHMODE_RIGHT_SIDE; return FLAC_CHMODE_RIGHT_SIDE;
} else { } else {
return FLAC_CHMODE_MID_SIDE; return FLAC_CHMODE_MID_SIDE;
} }
} }
/** /**
* Perform stereo channel decorrelation * Perform stereo channel decorrelation.
*/ */
static void channel_decorrelation(FlacEncodeContext *ctx) static void channel_decorrelation(FlacEncodeContext *ctx)
{ {
...@@ -988,7 +1001,7 @@ static void channel_decorrelation(FlacEncodeContext *ctx) ...@@ -988,7 +1001,7 @@ static void channel_decorrelation(FlacEncodeContext *ctx)
left = frame->subframes[0].samples; left = frame->subframes[0].samples;
right = frame->subframes[1].samples; right = frame->subframes[1].samples;
if(ctx->channels != 2) { if (ctx->channels != 2) {
frame->ch_mode = FLAC_CHMODE_INDEPENDENT; frame->ch_mode = FLAC_CHMODE_INDEPENDENT;
return; return;
} }
...@@ -996,36 +1009,35 @@ static void channel_decorrelation(FlacEncodeContext *ctx) ...@@ -996,36 +1009,35 @@ static void channel_decorrelation(FlacEncodeContext *ctx)
frame->ch_mode = estimate_stereo_mode(left, right, n); frame->ch_mode = estimate_stereo_mode(left, right, n);
/* perform decorrelation and adjust bits-per-sample */ /* perform decorrelation and adjust bits-per-sample */
if(frame->ch_mode == FLAC_CHMODE_INDEPENDENT) { if (frame->ch_mode == FLAC_CHMODE_INDEPENDENT)
return; return;
} if (frame->ch_mode == FLAC_CHMODE_MID_SIDE) {
if(frame->ch_mode == FLAC_CHMODE_MID_SIDE) {
int32_t tmp; int32_t tmp;
for(i=0; i<n; i++) { for (i = 0; i < n; i++) {
tmp = left[i]; tmp = left[i];
left[i] = (tmp + right[i]) >> 1; left[i] = (tmp + right[i]) >> 1;
right[i] = tmp - right[i]; right[i] = tmp - right[i];
} }
frame->subframes[1].obits++; frame->subframes[1].obits++;
} else if(frame->ch_mode == FLAC_CHMODE_LEFT_SIDE) { } else if (frame->ch_mode == FLAC_CHMODE_LEFT_SIDE) {
for(i=0; i<n; i++) { for (i = 0; i < n; i++)
right[i] = left[i] - right[i]; right[i] = left[i] - right[i];
}
frame->subframes[1].obits++; frame->subframes[1].obits++;
} else { } else {
for(i=0; i<n; i++) { for (i = 0; i < n; i++)
left[i] -= right[i]; left[i] -= right[i];
}
frame->subframes[0].obits++; frame->subframes[0].obits++;
} }
} }
static void write_utf8(PutBitContext *pb, uint32_t val) static void write_utf8(PutBitContext *pb, uint32_t val)
{ {
uint8_t tmp; uint8_t tmp;
PUT_UTF8(val, tmp, put_bits(pb, 8, tmp);) PUT_UTF8(val, tmp, put_bits(pb, 8, tmp);)
} }
static void output_frame_header(FlacEncodeContext *s) static void output_frame_header(FlacEncodeContext *s)
{ {
FlacFrame *frame; FlacFrame *frame;
...@@ -1036,30 +1048,33 @@ static void output_frame_header(FlacEncodeContext *s) ...@@ -1036,30 +1048,33 @@ static void output_frame_header(FlacEncodeContext *s)
put_bits(&s->pb, 16, 0xFFF8); put_bits(&s->pb, 16, 0xFFF8);
put_bits(&s->pb, 4, frame->bs_code[0]); put_bits(&s->pb, 4, frame->bs_code[0]);
put_bits(&s->pb, 4, s->sr_code[0]); put_bits(&s->pb, 4, s->sr_code[0]);
if(frame->ch_mode == FLAC_CHMODE_INDEPENDENT) {
if (frame->ch_mode == FLAC_CHMODE_INDEPENDENT)
put_bits(&s->pb, 4, s->channels-1); put_bits(&s->pb, 4, s->channels-1);
} else { else
put_bits(&s->pb, 4, frame->ch_mode); put_bits(&s->pb, 4, frame->ch_mode);
}
put_bits(&s->pb, 3, 4); /* bits-per-sample code */ put_bits(&s->pb, 3, 4); /* bits-per-sample code */
put_bits(&s->pb, 1, 0); put_bits(&s->pb, 1, 0);
write_utf8(&s->pb, s->frame_count); write_utf8(&s->pb, s->frame_count);
if(frame->bs_code[0] == 6) {
if (frame->bs_code[0] == 6)
put_bits(&s->pb, 8, frame->bs_code[1]); put_bits(&s->pb, 8, frame->bs_code[1]);
} else if(frame->bs_code[0] == 7) { else if (frame->bs_code[0] == 7)
put_bits(&s->pb, 16, frame->bs_code[1]); put_bits(&s->pb, 16, frame->bs_code[1]);
}
if(s->sr_code[0] == 12) { if (s->sr_code[0] == 12)
put_bits(&s->pb, 8, s->sr_code[1]); put_bits(&s->pb, 8, s->sr_code[1]);
} else if(s->sr_code[0] > 12) { else if (s->sr_code[0] > 12)
put_bits(&s->pb, 16, s->sr_code[1]); put_bits(&s->pb, 16, s->sr_code[1]);
}
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
crc = av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, crc = av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, s->pb.buf,
s->pb.buf, put_bits_count(&s->pb)>>3); put_bits_count(&s->pb) >> 3);
put_bits(&s->pb, 8, crc); put_bits(&s->pb, 8, crc);
} }
static void output_subframe_constant(FlacEncodeContext *s, int ch) static void output_subframe_constant(FlacEncodeContext *s, int ch)
{ {
FlacSubframe *sub; FlacSubframe *sub;
...@@ -1070,6 +1085,7 @@ static void output_subframe_constant(FlacEncodeContext *s, int ch) ...@@ -1070,6 +1085,7 @@ static void output_subframe_constant(FlacEncodeContext *s, int ch)
put_sbits(&s->pb, sub->obits, res); put_sbits(&s->pb, sub->obits, res);
} }
static void output_subframe_verbatim(FlacEncodeContext *s, int ch) static void output_subframe_verbatim(FlacEncodeContext *s, int ch)
{ {
int i; int i;
...@@ -1080,12 +1096,13 @@ static void output_subframe_verbatim(FlacEncodeContext *s, int ch) ...@@ -1080,12 +1096,13 @@ static void output_subframe_verbatim(FlacEncodeContext *s, int ch)
frame = &s->frame; frame = &s->frame;
sub = &frame->subframes[ch]; sub = &frame->subframes[ch];
for(i=0; i<frame->blocksize; i++) { for (i = 0; i < frame->blocksize; i++) {
res = sub->residual[i]; res = sub->residual[i];
put_sbits(&s->pb, sub->obits, res); put_sbits(&s->pb, sub->obits, res);
} }
} }
static void output_residual(FlacEncodeContext *ctx, int ch) static void output_residual(FlacEncodeContext *ctx, int ch)
{ {
int i, j, p, n, parts; int i, j, p, n, parts;
...@@ -1111,16 +1128,17 @@ static void output_residual(FlacEncodeContext *ctx, int ch) ...@@ -1111,16 +1128,17 @@ static void output_residual(FlacEncodeContext *ctx, int ch)
/* residual */ /* residual */
j = sub->order; j = sub->order;
for(p=0; p<parts; p++) { for (p = 0; p < parts; p++) {
k = sub->rc.params[p]; k = sub->rc.params[p];
put_bits(&ctx->pb, 4, k); put_bits(&ctx->pb, 4, k);
if(p == 1) res_cnt = psize; if (p == 1)
for(i=0; i<res_cnt && j<n; i++, j++) { res_cnt = psize;
for (i = 0; i < res_cnt && j < n; i++, j++)
set_sr_golomb_flac(&ctx->pb, res[j], k, INT32_MAX, 0); set_sr_golomb_flac(&ctx->pb, res[j], k, INT32_MAX, 0);
} }
}
} }
static void output_subframe_fixed(FlacEncodeContext *ctx, int ch) static void output_subframe_fixed(FlacEncodeContext *ctx, int ch)
{ {
int i; int i;
...@@ -1131,14 +1149,14 @@ static void output_subframe_fixed(FlacEncodeContext *ctx, int ch) ...@@ -1131,14 +1149,14 @@ static void output_subframe_fixed(FlacEncodeContext *ctx, int ch)
sub = &frame->subframes[ch]; sub = &frame->subframes[ch];
/* warm-up samples */ /* warm-up samples */
for(i=0; i<sub->order; i++) { for (i = 0; i < sub->order; i++)
put_sbits(&ctx->pb, sub->obits, sub->residual[i]); put_sbits(&ctx->pb, sub->obits, sub->residual[i]);
}
/* residual */ /* residual */
output_residual(ctx, ch); output_residual(ctx, ch);
} }
static void output_subframe_lpc(FlacEncodeContext *ctx, int ch) static void output_subframe_lpc(FlacEncodeContext *ctx, int ch)
{ {
int i, cbits; int i, cbits;
...@@ -1149,22 +1167,21 @@ static void output_subframe_lpc(FlacEncodeContext *ctx, int ch) ...@@ -1149,22 +1167,21 @@ static void output_subframe_lpc(FlacEncodeContext *ctx, int ch)
sub = &frame->subframes[ch]; sub = &frame->subframes[ch];
/* warm-up samples */ /* warm-up samples */
for(i=0; i<sub->order; i++) { for (i = 0; i < sub->order; i++)
put_sbits(&ctx->pb, sub->obits, sub->residual[i]); put_sbits(&ctx->pb, sub->obits, sub->residual[i]);
}
/* LPC coefficients */ /* LPC coefficients */
cbits = ctx->options.lpc_coeff_precision; cbits = ctx->options.lpc_coeff_precision;
put_bits(&ctx->pb, 4, cbits-1); put_bits( &ctx->pb, 4, cbits-1);
put_sbits(&ctx->pb, 5, sub->shift); put_sbits(&ctx->pb, 5, sub->shift);
for(i=0; i<sub->order; i++) { for (i = 0; i < sub->order; i++)
put_sbits(&ctx->pb, cbits, sub->coefs[i]); put_sbits(&ctx->pb, cbits, sub->coefs[i]);
}
/* residual */ /* residual */
output_residual(ctx, ch); output_residual(ctx, ch);
} }
static void output_subframes(FlacEncodeContext *s) static void output_subframes(FlacEncodeContext *s)
{ {
FlacFrame *frame; FlacFrame *frame;
...@@ -1173,7 +1190,7 @@ static void output_subframes(FlacEncodeContext *s) ...@@ -1173,7 +1190,7 @@ static void output_subframes(FlacEncodeContext *s)
frame = &s->frame; frame = &s->frame;
for(ch=0; ch<s->channels; ch++) { for (ch = 0; ch < s->channels; ch++) {
sub = &frame->subframes[ch]; sub = &frame->subframes[ch];
/* subframe header */ /* subframe header */
...@@ -1182,33 +1199,34 @@ static void output_subframes(FlacEncodeContext *s) ...@@ -1182,33 +1199,34 @@ static void output_subframes(FlacEncodeContext *s)
put_bits(&s->pb, 1, 0); /* no wasted bits */ put_bits(&s->pb, 1, 0); /* no wasted bits */
/* subframe */ /* subframe */
if(sub->type == FLAC_SUBFRAME_CONSTANT) { if(sub->type == FLAC_SUBFRAME_CONSTANT)
output_subframe_constant(s, ch); output_subframe_constant(s, ch);
} else if(sub->type == FLAC_SUBFRAME_VERBATIM) { else if(sub->type == FLAC_SUBFRAME_VERBATIM)
output_subframe_verbatim(s, ch); output_subframe_verbatim(s, ch);
} else if(sub->type == FLAC_SUBFRAME_FIXED) { else if(sub->type == FLAC_SUBFRAME_FIXED)
output_subframe_fixed(s, ch); output_subframe_fixed(s, ch);
} else if(sub->type == FLAC_SUBFRAME_LPC) { else if(sub->type == FLAC_SUBFRAME_LPC)
output_subframe_lpc(s, ch); output_subframe_lpc(s, ch);
} }
}
} }
static void output_frame_footer(FlacEncodeContext *s) static void output_frame_footer(FlacEncodeContext *s)
{ {
int crc; int crc;
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
crc = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, crc = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, s->pb.buf,
s->pb.buf, put_bits_count(&s->pb)>>3)); put_bits_count(&s->pb)>>3));
put_bits(&s->pb, 16, crc); put_bits(&s->pb, 16, crc);
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
} }
static void update_md5_sum(FlacEncodeContext *s, const int16_t *samples) static void update_md5_sum(FlacEncodeContext *s, const int16_t *samples)
{ {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
int i; int i;
for(i = 0; i < s->frame.blocksize*s->channels; i++) { for (i = 0; i < s->frame.blocksize * s->channels; i++) {
int16_t smp = av_le2ne16(samples[i]); int16_t smp = av_le2ne16(samples[i]);
av_md5_update(s->md5ctx, (uint8_t *)&smp, 2); av_md5_update(s->md5ctx, (uint8_t *)&smp, 2);
} }
...@@ -1217,6 +1235,7 @@ static void update_md5_sum(FlacEncodeContext *s, const int16_t *samples) ...@@ -1217,6 +1235,7 @@ static void update_md5_sum(FlacEncodeContext *s, const int16_t *samples)
#endif #endif
} }
static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame, static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
int buf_size, void *data) int buf_size, void *data)
{ {
...@@ -1228,7 +1247,7 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame, ...@@ -1228,7 +1247,7 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
s = avctx->priv_data; s = avctx->priv_data;
if(buf_size < s->max_framesize*2) { if (buf_size < s->max_framesize * 2) {
av_log(avctx, AV_LOG_ERROR, "output buffer too small\n"); av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");
return 0; return 0;
} }
...@@ -1247,9 +1266,8 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame, ...@@ -1247,9 +1266,8 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
channel_decorrelation(s); channel_decorrelation(s);
for(ch=0; ch<s->channels; ch++) { for (ch = 0; ch < s->channels; ch++)
encode_residual(s, ch); encode_residual(s, ch);
}
write_frame: write_frame:
init_put_bits(&s->pb, frame, buf_size); init_put_bits(&s->pb, frame, buf_size);
...@@ -1258,17 +1276,16 @@ write_frame: ...@@ -1258,17 +1276,16 @@ write_frame:
output_frame_footer(s); output_frame_footer(s);
out_bytes = put_bits_count(&s->pb) >> 3; out_bytes = put_bits_count(&s->pb) >> 3;
if(out_bytes > s->max_framesize) { if (out_bytes > s->max_framesize) {
if(reencoded) { if (reencoded) {
/* still too large. must be an error. */ /* still too large. must be an error. */
av_log(avctx, AV_LOG_ERROR, "error encoding frame\n"); av_log(avctx, AV_LOG_ERROR, "error encoding frame\n");
return -1; return -1;
} }
/* frame too large. use verbatim mode */ /* frame too large. use verbatim mode */
for(ch=0; ch<s->channels; ch++) { for (ch = 0; ch < s->channels; ch++)
encode_residual_v(s, ch); encode_residual_v(s, ch);
}
reencoded = 1; reencoded = 1;
goto write_frame; goto write_frame;
} }
...@@ -1284,6 +1301,7 @@ write_frame: ...@@ -1284,6 +1301,7 @@ write_frame:
return out_bytes; return out_bytes;
} }
static av_cold int flac_encode_close(AVCodecContext *avctx) static av_cold int flac_encode_close(AVCodecContext *avctx)
{ {
if (avctx->priv_data) { if (avctx->priv_data) {
...@@ -1296,6 +1314,7 @@ static av_cold int flac_encode_close(AVCodecContext *avctx) ...@@ -1296,6 +1314,7 @@ static av_cold int flac_encode_close(AVCodecContext *avctx)
return 0; return 0;
} }
AVCodec flac_encoder = { AVCodec flac_encoder = {
"flac", "flac",
AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_AUDIO,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment