#include "avcodec.h"
#include "bitstream.h"
#include "bytestream.h"
+#include "unary.h"
#define ALAC_EXTRADATA_SIZE 36
#define MAX_CHANNELS 2
static int alac_set_info(ALACContext *alac)
{
- unsigned char *ptr = alac->avctx->extradata;
+ const unsigned char *ptr = alac->avctx->extradata;
ptr += 4; /* size */
ptr += 4; /* alac */
int sign_modifier = 0;
for (output_count = 0; output_count < output_size; output_count++) {
- int32_t x = 0;
+ int32_t x;
int32_t x_modified;
int32_t final_val;
/* read x - number of 1s before 0 represent the rice */
- while (x <= 8 && get_bits1(&alac->gb)) {
- x++;
- }
-
+ x = get_unary_0_9(&alac->gb);
if (x > 8) { /* RICE THRESHOLD */
/* use alternative encoding */
if (extrabits > 1) {
x += extrabits - 1;
- get_bits(&alac->gb, k);
+ skip_bits(&alac->gb, k);
} else
- get_bits(&alac->gb, k - 1);
+ skip_bits(&alac->gb, k - 1);
}
}
sign_modifier = 1;
- x = 0;
- while (x <= 8 && get_bits1(&alac->gb)) {
- x++;
- }
+ x = get_unary_0_9(&alac->gb);
if (x > 8) {
block_size = get_bits(&alac->gb, 16);
if (extrabits < 2) {
x = 1 - extrabits;
block_size += x;
- get_bits(&alac->gb, k - 1);
+ skip_bits(&alac->gb, k - 1);
} else {
- get_bits(&alac->gb, k);
+ skip_bits(&alac->gb, k);
}
}
}
}
-#define SIGN_EXTENDED32(val, bits) ((val << (32 - bits)) >> (32 - bits))
+static inline int32_t extend_sign32(int32_t val, int bits)
+{
+ return (val << (32 - bits)) >> (32 - bits);
+}
-#define SIGN_ONLY(v) \
- ((v < 0) ? (-1) : \
- ((v > 0) ? (1) : \
- (0)))
+static inline int sign_only(int v)
+{
+ return v ? FFSIGN(v) : 0;
+}
static void predictor_decompress_fir_adapt(int32_t *error_buffer,
int32_t *buffer_out,
prev_value = buffer_out[i];
error_value = error_buffer[i+1];
buffer_out[i+1] =
- SIGN_EXTENDED32((prev_value + error_value), readsamplesize);
+ extend_sign32((prev_value + error_value), readsamplesize);
}
return;
}
int32_t val;
val = buffer_out[i] + error_buffer[i+1];
- val = SIGN_EXTENDED32(val, readsamplesize);
+ val = extend_sign32(val, readsamplesize);
buffer_out[i+1] = val;
}
#if 0
/* 4 and 8 are very common cases (the only ones i've seen). these
- * should be unrolled and optimised
+ * should be unrolled and optimized
*/
if (predictor_coef_num == 4) {
- /* FIXME: optimised general case */
+ /* FIXME: optimized general case */
return;
}
if (predictor_coef_table == 8) {
- /* FIXME: optimised general case */
+ /* FIXME: optimized general case */
return;
}
#endif
outval = (1 << (predictor_quantitization-1)) + sum;
outval = outval >> predictor_quantitization;
outval = outval + buffer_out[0] + error_val;
- outval = SIGN_EXTENDED32(outval, readsamplesize);
+ outval = extend_sign32(outval, readsamplesize);
buffer_out[predictor_coef_num+1] = outval;
while (predictor_num >= 0 && error_val > 0) {
int val = buffer_out[0] - buffer_out[predictor_coef_num - predictor_num];
- int sign = SIGN_ONLY(val);
+ int sign = sign_only(val);
predictor_coef_table[predictor_num] -= sign;
while (predictor_num >= 0 && error_val < 0) {
int val = buffer_out[0] - buffer_out[predictor_coef_num - predictor_num];
- int sign = - SIGN_ONLY(val);
+ int sign = - sign_only(val);
predictor_coef_table[predictor_num] -= sign;
}
}
-static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b,
- int16_t *buffer_out,
- int numchannels, int numsamples,
- uint8_t interlacing_shift,
- uint8_t interlacing_leftweight)
+static void reconstruct_stereo_16(int32_t *buffer[MAX_CHANNELS],
+ int16_t *buffer_out,
+ int numchannels, int numsamples,
+ uint8_t interlacing_shift,
+ uint8_t interlacing_leftweight)
{
int i;
if (numsamples <= 0)
/* weighted interlacing */
if (interlacing_leftweight) {
for (i = 0; i < numsamples; i++) {
- int32_t difference, midright;
- int16_t left;
- int16_t right;
-
- midright = buffer_a[i];
- difference = buffer_b[i];
+ int32_t a, b;
+ a = buffer[0][i];
+ b = buffer[1][i];
- right = midright - ((difference * interlacing_leftweight) >> interlacing_shift);
- left = right + difference;
+ a -= (b * interlacing_leftweight) >> interlacing_shift;
+ b += a;
- buffer_out[i*numchannels] = left;
- buffer_out[i*numchannels + 1] = right;
+ buffer_out[i*numchannels] = b;
+ buffer_out[i*numchannels + 1] = a;
}
return;
for (i = 0; i < numsamples; i++) {
int16_t left, right;
- left = buffer_a[i];
- right = buffer_b[i];
+ left = buffer[0][i];
+ right = buffer[1][i];
buffer_out[i*numchannels] = left;
buffer_out[i*numchannels + 1] = right;
static int alac_decode_frame(AVCodecContext *avctx,
void *outbuffer, int *outputsize,
- uint8_t *inbuffer, int input_buffer_size)
+ const uint8_t *inbuffer, int input_buffer_size)
{
ALACContext *alac = avctx->priv_data;
/* 2^result = something to do with output waiting.
* perhaps matters if we read > 1 frame in a pass?
*/
- get_bits(&alac->gb, 4);
+ skip_bits(&alac->gb, 4);
- get_bits(&alac->gb, 12); /* unknown, skip 12 bits */
+ skip_bits(&alac->gb, 12); /* unknown, skip 12 bits */
/* the output sample size is stored soon */
- hassize = get_bits(&alac->gb, 1);
+ hassize = get_bits1(&alac->gb);
wasted_bytes = get_bits(&alac->gb, 2); /* unknown ? */
/* whether the frame is compressed */
- isnotcompressed = get_bits(&alac->gb, 1);
+ isnotcompressed = get_bits1(&alac->gb);
if (hassize) {
/* now read the number of samples as a 32bit integer */
predictor_coef_table[chan][i] = (int16_t)get_bits(&alac->gb, 16);
}
- if (wasted_bytes) {
+ if (wasted_bytes)
av_log(avctx, AV_LOG_ERROR, "FIXME: unimplemented, unhandling of wasted_bytes\n");
- }
for (chan = 0; chan < channels; chan++) {
bastardized_rice_decompress(alac,
int32_t audiobits;
audiobits = get_bits(&alac->gb, alac->setinfo_sample_size);
- audiobits = SIGN_EXTENDED32(audiobits, readsamplesize);
+ audiobits = extend_sign32(audiobits, readsamplesize);
alac->outputsamples_buffer[chan][i] = audiobits;
}
}
switch(alac->setinfo_sample_size) {
- case 16: {
+ case 16:
if (channels == 2) {
- deinterlace_16(alac->outputsamples_buffer[0],
- alac->outputsamples_buffer[1],
- (int16_t*)outbuffer,
- alac->numchannels,
- outputsamples,
- interlacing_shift,
- interlacing_leftweight);
+ reconstruct_stereo_16(alac->outputsamples_buffer,
+ (int16_t*)outbuffer,
+ alac->numchannels,
+ outputsamples,
+ interlacing_shift,
+ interlacing_leftweight);
} else {
int i;
for (i = 0; i < outputsamples; i++) {
}
}
break;
- }
case 20:
case 24:
+ // It is not clear if there exist any encoder that creates 24 bit ALAC
+ // files. iTunes convert 24 bit raw files to 16 bit before encoding.
case 32:
av_log(avctx, AV_LOG_ERROR, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
break;