[Ffmpeg-cvslog] r7835 - trunk/libavcodec/dtsdec.c
mru
subversion
Mon Feb 5 20:35:37 CET 2007
Author: mru
Date: Mon Feb 5 20:35:36 2007
New Revision: 7835
Modified:
trunk/libavcodec/dtsdec.c
Log:
cosmetic: indent sensibly so code can be read at all
Modified: trunk/libavcodec/dtsdec.c
==============================================================================
--- trunk/libavcodec/dtsdec.c (original)
+++ trunk/libavcodec/dtsdec.c Mon Feb 5 20:35:36 2007
@@ -44,8 +44,8 @@
#define CONVERT_BIAS 384
#endif
-static inline
-int16_t convert (int32_t i)
+static inline int16_t
+convert(int32_t i)
{
#ifdef LIBDTS_FIXED
i >>= 15;
@@ -56,265 +56,255 @@
}
static void
-convert2s16_2 (sample_t * _f, int16_t * s16)
+convert2s16_2(sample_t * _f, int16_t * s16)
{
- int i;
- int32_t * f = (int32_t *) _f;
+ int i;
+ int32_t *f = (int32_t *) _f;
- for (i = 0; i < 256; i++)
- {
- s16[2*i] = convert (f[i]);
- s16[2*i+1] = convert (f[i+256]);
+ for(i = 0; i < 256; i++) {
+ s16[2 * i] = convert(f[i]);
+ s16[2 * i + 1] = convert(f[i + 256]);
}
}
static void
-convert2s16_4 (sample_t * _f, int16_t * s16)
+convert2s16_4(sample_t * _f, int16_t * s16)
{
- int i;
- int32_t * f = (int32_t *) _f;
+ int i;
+ int32_t *f = (int32_t *) _f;
- for (i = 0; i < 256; i++)
- {
- s16[4*i] = convert (f[i]);
- s16[4*i+1] = convert (f[i+256]);
- s16[4*i+2] = convert (f[i+512]);
- s16[4*i+3] = convert (f[i+768]);
+ for(i = 0; i < 256; i++) {
+ s16[4 * i] = convert(f[i]);
+ s16[4 * i + 1] = convert(f[i + 256]);
+ s16[4 * i + 2] = convert(f[i + 512]);
+ s16[4 * i + 3] = convert(f[i + 768]);
}
}
static void
-convert2s16_5 (sample_t * _f, int16_t * s16)
+convert2s16_5(sample_t * _f, int16_t * s16)
{
- int i;
- int32_t * f = (int32_t *) _f;
+ int i;
+ int32_t *f = (int32_t *) _f;
- for (i = 0; i < 256; i++)
- {
- s16[5*i] = convert (f[i]);
- s16[5*i+1] = convert (f[i+256]);
- s16[5*i+2] = convert (f[i+512]);
- s16[5*i+3] = convert (f[i+768]);
- s16[5*i+4] = convert (f[i+1024]);
+ for(i = 0; i < 256; i++) {
+ s16[5 * i] = convert(f[i]);
+ s16[5 * i + 1] = convert(f[i + 256]);
+ s16[5 * i + 2] = convert(f[i + 512]);
+ s16[5 * i + 3] = convert(f[i + 768]);
+ s16[5 * i + 4] = convert(f[i + 1024]);
}
}
static void
-convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
+convert2s16_multi(sample_t * _f, int16_t * s16, int flags)
{
- int i;
- int32_t * f = (int32_t *) _f;
+ int i;
+ int32_t *f = (int32_t *) _f;
- switch (flags)
- {
+ switch (flags) {
case DTS_MONO:
- for (i = 0; i < 256; i++)
- {
- s16[5*i] = s16[5*i+1] = s16[5*i+2] = s16[5*i+3] = 0;
- s16[5*i+4] = convert (f[i]);
+ for(i = 0; i < 256; i++) {
+ s16[5 * i] = s16[5 * i + 1] = s16[5 * i + 2] = s16[5 * i + 3] =
+ 0;
+ s16[5 * i + 4] = convert(f[i]);
}
- break;
+ break;
case DTS_CHANNEL:
case DTS_STEREO:
case DTS_DOLBY:
- convert2s16_2 (_f, s16);
- break;
+ convert2s16_2(_f, s16);
+ break;
case DTS_3F:
- for (i = 0; i < 256; i++)
- {
- s16[5*i] = convert (f[i]);
- s16[5*i+1] = convert (f[i+512]);
- s16[5*i+2] = s16[5*i+3] = 0;
- s16[5*i+4] = convert (f[i+256]);
+ for(i = 0; i < 256; i++) {
+ s16[5 * i] = convert(f[i]);
+ s16[5 * i + 1] = convert(f[i + 512]);
+ s16[5 * i + 2] = s16[5 * i + 3] = 0;
+ s16[5 * i + 4] = convert(f[i + 256]);
}
- break;
+ break;
case DTS_2F2R:
- convert2s16_4 (_f, s16);
- break;
+ convert2s16_4(_f, s16);
+ break;
case DTS_3F2R:
- convert2s16_5 (_f, s16);
- break;
+ convert2s16_5(_f, s16);
+ break;
case DTS_MONO | DTS_LFE:
- for (i = 0; i < 256; i++)
- {
- s16[6*i] = s16[6*i+1] = s16[6*i+2] = s16[6*i+3] = 0;
- s16[6*i+4] = convert (f[i+256]);
- s16[6*i+5] = convert (f[i]);
+ for(i = 0; i < 256; i++) {
+ s16[6 * i] = s16[6 * i + 1] = s16[6 * i + 2] = s16[6 * i + 3] =
+ 0;
+ s16[6 * i + 4] = convert(f[i + 256]);
+ s16[6 * i + 5] = convert(f[i]);
}
- break;
+ break;
case DTS_CHANNEL | DTS_LFE:
case DTS_STEREO | DTS_LFE:
case DTS_DOLBY | DTS_LFE:
- for (i = 0; i < 256; i++)
- {
- s16[6*i] = convert (f[i+256]);
- s16[6*i+1] = convert (f[i+512]);
- s16[6*i+2] = s16[6*i+3] = s16[6*i+4] = 0;
- s16[6*i+5] = convert (f[i]);
+ for(i = 0; i < 256; i++) {
+ s16[6 * i] = convert(f[i + 256]);
+ s16[6 * i + 1] = convert(f[i + 512]);
+ s16[6 * i + 2] = s16[6 * i + 3] = s16[6 * i + 4] = 0;
+ s16[6 * i + 5] = convert(f[i]);
}
- break;
+ break;
case DTS_3F | DTS_LFE:
- for (i = 0; i < 256; i++)
- {
- s16[6*i] = convert (f[i+256]);
- s16[6*i+1] = convert (f[i+768]);
- s16[6*i+2] = s16[6*i+3] = 0;
- s16[6*i+4] = convert (f[i+512]);
- s16[6*i+5] = convert (f[i]);
+ for(i = 0; i < 256; i++) {
+ s16[6 * i] = convert(f[i + 256]);
+ s16[6 * i + 1] = convert(f[i + 768]);
+ s16[6 * i + 2] = s16[6 * i + 3] = 0;
+ s16[6 * i + 4] = convert(f[i + 512]);
+ s16[6 * i + 5] = convert(f[i]);
}
- break;
+ break;
case DTS_2F2R | DTS_LFE:
- for (i = 0; i < 256; i++)
- {
- s16[6*i] = convert (f[i+256]);
- s16[6*i+1] = convert (f[i+512]);
- s16[6*i+2] = convert (f[i+768]);
- s16[6*i+3] = convert (f[i+1024]);
- s16[6*i+4] = 0;
- s16[6*i+5] = convert (f[i]);
+ for(i = 0; i < 256; i++) {
+ s16[6 * i] = convert(f[i + 256]);
+ s16[6 * i + 1] = convert(f[i + 512]);
+ s16[6 * i + 2] = convert(f[i + 768]);
+ s16[6 * i + 3] = convert(f[i + 1024]);
+ s16[6 * i + 4] = 0;
+ s16[6 * i + 5] = convert(f[i]);
}
- break;
+ break;
case DTS_3F2R | DTS_LFE:
- for (i = 0; i < 256; i++)
- {
- s16[6*i] = convert (f[i+256]);
- s16[6*i+1] = convert (f[i+768]);
- s16[6*i+2] = convert (f[i+1024]);
- s16[6*i+3] = convert (f[i+1280]);
- s16[6*i+4] = convert (f[i+512]);
- s16[6*i+5] = convert (f[i]);
+ for(i = 0; i < 256; i++) {
+ s16[6 * i] = convert(f[i + 256]);
+ s16[6 * i + 1] = convert(f[i + 768]);
+ s16[6 * i + 2] = convert(f[i + 1024]);
+ s16[6 * i + 3] = convert(f[i + 1280]);
+ s16[6 * i + 4] = convert(f[i + 512]);
+ s16[6 * i + 5] = convert(f[i]);
}
- break;
+ break;
}
}
static int
-channels_multi (int flags)
+channels_multi(int flags)
{
- if (flags & DTS_LFE)
- return 6;
- else if (flags & 1) /* center channel */
- return 5;
- else if ((flags & DTS_CHANNEL_MASK) == DTS_2F2R)
- return 4;
- else
- return 2;
+ if(flags & DTS_LFE)
+ return 6;
+ else if(flags & 1) /* center channel */
+ return 5;
+ else if((flags & DTS_CHANNEL_MASK) == DTS_2F2R)
+ return 4;
+ else
+ return 2;
}
static int
-dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size,
- uint8_t *buff, int buff_size)
+dts_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
+ uint8_t * buff, int buff_size)
{
- uint8_t * start = buff;
- uint8_t * end = buff + buff_size;
- static uint8_t buf[BUFFER_SIZE];
- static uint8_t * bufptr = buf;
- static uint8_t * bufpos = buf + HEADER_SIZE;
- int16_t *out_samples = data;
- static int sample_rate;
- static int frame_length;
- static int flags;
- int bit_rate;
- int len;
- dts_state_t *state = avctx->priv_data;
-
- *data_size = 0;
+ uint8_t *start = buff;
+ uint8_t *end = buff + buff_size;
+ static uint8_t buf[BUFFER_SIZE];
+ static uint8_t *bufptr = buf;
+ static uint8_t *bufpos = buf + HEADER_SIZE;
+ int16_t *out_samples = data;
+ static int sample_rate;
+ static int frame_length;
+ static int flags;
+ int bit_rate;
+ int len;
+ dts_state_t *state = avctx->priv_data;
+
+ *data_size = 0;
+
+ while(1) {
+ len = end - start;
+ if(!len)
+ break;
+ if(len > bufpos - bufptr)
+ len = bufpos - bufptr;
+ memcpy(bufptr, start, len);
+ bufptr += len;
+ start += len;
+ if(bufptr != bufpos)
+ return start - buff;
+ if(bufpos != buf + HEADER_SIZE)
+ break;
- while (1)
- {
- len = end - start;
- if (!len)
- break;
- if (len > bufpos - bufptr)
- len = bufpos - bufptr;
- memcpy (bufptr, start, len);
- bufptr += len;
- start += len;
- if (bufptr != bufpos)
- return start - buff;
- if (bufpos != buf + HEADER_SIZE)
- break;
-
- {
- int length;
+ {
+ int length;
- length = dts_syncinfo (state, buf, &flags, &sample_rate,
- &bit_rate, &frame_length);
- if (!length)
- {
- av_log (NULL, AV_LOG_INFO, "skip\n");
- for (bufptr = buf; bufptr < buf + HEADER_SIZE-1; bufptr++)
+ length =
+ dts_syncinfo(state, buf, &flags, &sample_rate, &bit_rate,
+ &frame_length);
+ if(!length) {
+ av_log(NULL, AV_LOG_INFO, "skip\n");
+ for(bufptr = buf; bufptr < buf + HEADER_SIZE - 1; bufptr++)
bufptr[0] = bufptr[1];
- continue;
- }
- bufpos = buf + length;
+ continue;
}
+ bufpos = buf + length;
+ }
}
+ {
+ level_t level;
+ sample_t bias;
+ int i;
+
+ flags = 2; /* ???????????? */
+ level = CONVERT_LEVEL;
+ bias = CONVERT_BIAS;
+
+ flags |= DTS_ADJUST_LEVEL;
+ if(dts_frame(state, buf, &flags, &level, bias))
+ goto error;
+ avctx->sample_rate = sample_rate;
+ avctx->channels = channels_multi(flags);
+ avctx->bit_rate = bit_rate;
+ for(i = 0; i < dts_blocks_num(state); i++) {
+ if(dts_block(state))
+ goto error;
{
- level_t level;
- sample_t bias;
- int i;
-
- flags = 2; /* ???????????? */
- level = CONVERT_LEVEL;
- bias = CONVERT_BIAS;
+ int chans;
- flags |= DTS_ADJUST_LEVEL;
- if (dts_frame (state, buf, &flags, &level, bias))
- goto error;
- avctx->sample_rate = sample_rate;
- avctx->channels = channels_multi (flags);
- avctx->bit_rate = bit_rate;
- for (i = 0; i < dts_blocks_num (state); i++)
- {
- if (dts_block (state))
- goto error;
- {
- int chans;
- chans = channels_multi (flags);
- convert2s16_multi (dts_samples (state), out_samples,
- flags & (DTS_CHANNEL_MASK | DTS_LFE));
-
- out_samples += 256 * chans;
- *data_size += 256 * sizeof (int16_t) * chans;
- }
- }
- bufptr = buf;
- bufpos = buf + HEADER_SIZE;
- return start-buff;
- error:
- av_log (NULL, AV_LOG_ERROR, "error\n");
- bufptr = buf;
- bufpos = buf + HEADER_SIZE;
+ chans = channels_multi(flags);
+ convert2s16_multi(dts_samples(state), out_samples,
+ flags & (DTS_CHANNEL_MASK | DTS_LFE));
+
+ out_samples += 256 * chans;
+ *data_size += 256 * sizeof(int16_t) * chans;
}
+ }
+ bufptr = buf;
+ bufpos = buf + HEADER_SIZE;
+ return start - buff;
+ error:
+ av_log(NULL, AV_LOG_ERROR, "error\n");
+ bufptr = buf;
+ bufpos = buf + HEADER_SIZE;
+ }
- return start-buff;
+ return start - buff;
}
static int
-dts_decode_init (AVCodecContext *avctx)
+dts_decode_init(AVCodecContext * avctx)
{
- avctx->priv_data = dts_init (0);
- if (avctx->priv_data == NULL)
- return -1;
+ avctx->priv_data = dts_init(0);
+ if(avctx->priv_data == NULL)
+ return -1;
- return 0;
+ return 0;
}
static int
-dts_decode_end (AVCodecContext *s)
+dts_decode_end(AVCodecContext * s)
{
- return 0;
+ return 0;
}
AVCodec dts_decoder = {
- "dts",
- CODEC_TYPE_AUDIO,
- CODEC_ID_DTS,
- sizeof (dts_state_t *),
- dts_decode_init,
- NULL,
- dts_decode_end,
- dts_decode_frame,
+ "dts",
+ CODEC_TYPE_AUDIO,
+ CODEC_ID_DTS,
+ sizeof(dts_state_t *),
+ dts_decode_init,
+ NULL,
+ dts_decode_end,
+ dts_decode_frame,
};
More information about the ffmpeg-cvslog
mailing list