virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

cosmetic: indent sensibly so code can be read at all

Browse Source 
Originally committed as revision 7835 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2007-02-05 19:35:36 +00:00
parent d6ceace3e2
commit ac49ddc60d
1 changed files with 193 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
libavcodec/dtsdec.c
View File

@@ -44,8 +44,8 @@
#define CONVERT_BIAS 384 #define CONVERT_BIAS 384
#endif #endif
static inline static inline int16_t
int16_t convert (int32_t i) convert(int32_t i)
{ {
#ifdef LIBDTS_FIXED #ifdef LIBDTS_FIXED
i >>= 15; i >>= 15;
@@ -61,8 +61,7 @@ convert2s16_2 (sample_t * _f, int16_t * s16)
int i; int i;
int32_t *f = (int32_t *) _f; int32_t *f = (int32_t *) _f;
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[2 * i] = convert(f[i]); s16[2 * i] = convert(f[i]);
s16[2 * i + 1] = convert(f[i + 256]); s16[2 * i + 1] = convert(f[i + 256]);
} }
@@ -74,8 +73,7 @@ convert2s16_4 (sample_t * _f, int16_t * s16)
int i; int i;
int32_t *f = (int32_t *) _f; int32_t *f = (int32_t *) _f;
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[4 * i] = convert(f[i]); s16[4 * i] = convert(f[i]);
s16[4 * i + 1] = convert(f[i + 256]); s16[4 * i + 1] = convert(f[i + 256]);
s16[4 * i + 2] = convert(f[i + 512]); s16[4 * i + 2] = convert(f[i + 512]);
@@ -89,8 +87,7 @@ convert2s16_5 (sample_t * _f, int16_t * s16)
int i; int i;
int32_t *f = (int32_t *) _f; int32_t *f = (int32_t *) _f;
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[5 * i] = convert(f[i]); s16[5 * i] = convert(f[i]);
s16[5 * i + 1] = convert(f[i + 256]); s16[5 * i + 1] = convert(f[i + 256]);
s16[5 * i + 2] = convert(f[i + 512]); s16[5 * i + 2] = convert(f[i + 512]);
@@ -105,12 +102,11 @@ convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
int i; int i;
int32_t *f = (int32_t *) _f; int32_t *f = (int32_t *) _f;
switch (flags) switch (flags) {
{
case DTS_MONO: case DTS_MONO:
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{ s16[5 * i] = s16[5 * i + 1] = s16[5 * i + 2] = s16[5 * i + 3] =
s16[5*i] = s16[5*i+1] = s16[5*i+2] = s16[5*i+3] = 0; 0;
s16[5 * i + 4] = convert(f[i]); s16[5 * i + 4] = convert(f[i]);
} }
break; break;
@@ -120,8 +116,7 @@ convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
convert2s16_2(_f, s16); convert2s16_2(_f, s16);
break; break;
case DTS_3F: case DTS_3F:
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[5 * i] = convert(f[i]); s16[5 * i] = convert(f[i]);
s16[5 * i + 1] = convert(f[i + 512]); s16[5 * i + 1] = convert(f[i + 512]);
s16[5 * i + 2] = s16[5 * i + 3] = 0; s16[5 * i + 2] = s16[5 * i + 3] = 0;
@@ -135,9 +130,9 @@ convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
convert2s16_5(_f, s16); convert2s16_5(_f, s16);
break; break;
case DTS_MONO | DTS_LFE: case DTS_MONO | DTS_LFE:
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{ s16[6 * i] = s16[6 * i + 1] = s16[6 * i + 2] = s16[6 * i + 3] =
s16[6*i] = s16[6*i+1] = s16[6*i+2] = s16[6*i+3] = 0; 0;
s16[6 * i + 4] = convert(f[i + 256]); s16[6 * i + 4] = convert(f[i + 256]);
s16[6 * i + 5] = convert(f[i]); s16[6 * i + 5] = convert(f[i]);
} }
@@ -145,8 +140,7 @@ convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
case DTS_CHANNEL | DTS_LFE: case DTS_CHANNEL | DTS_LFE:
case DTS_STEREO | DTS_LFE: case DTS_STEREO | DTS_LFE:
case DTS_DOLBY | DTS_LFE: case DTS_DOLBY | DTS_LFE:
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[6 * i] = convert(f[i + 256]); s16[6 * i] = convert(f[i + 256]);
s16[6 * i + 1] = convert(f[i + 512]); s16[6 * i + 1] = convert(f[i + 512]);
s16[6 * i + 2] = s16[6 * i + 3] = s16[6 * i + 4] = 0; s16[6 * i + 2] = s16[6 * i + 3] = s16[6 * i + 4] = 0;
@@ -154,8 +148,7 @@ convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
} }
break; break;
case DTS_3F | DTS_LFE: case DTS_3F | DTS_LFE:
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[6 * i] = convert(f[i + 256]); s16[6 * i] = convert(f[i + 256]);
s16[6 * i + 1] = convert(f[i + 768]); s16[6 * i + 1] = convert(f[i + 768]);
s16[6 * i + 2] = s16[6 * i + 3] = 0; s16[6 * i + 2] = s16[6 * i + 3] = 0;
@@ -164,8 +157,7 @@ convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
} }
break; break;
case DTS_2F2R | DTS_LFE: case DTS_2F2R | DTS_LFE:
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[6 * i] = convert(f[i + 256]); s16[6 * i] = convert(f[i + 256]);
s16[6 * i + 1] = convert(f[i + 512]); s16[6 * i + 1] = convert(f[i + 512]);
s16[6 * i + 2] = convert(f[i + 768]); s16[6 * i + 2] = convert(f[i + 768]);
@@ -175,8 +167,7 @@ convert2s16_multi (sample_t * _f, int16_t * s16, int flags)
} }
break; break;
case DTS_3F2R | DTS_LFE: case DTS_3F2R | DTS_LFE:
for (i = 0; i < 256; i++) for(i = 0; i < 256; i++) {
{
s16[6 * i] = convert(f[i + 256]); s16[6 * i] = convert(f[i + 256]);
s16[6 * i + 1] = convert(f[i + 768]); s16[6 * i + 1] = convert(f[i + 768]);
s16[6 * i + 2] = convert(f[i + 1024]); s16[6 * i + 2] = convert(f[i + 1024]);
@@ -220,8 +211,7 @@ dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size,
*data_size = 0; *data_size = 0;
while (1) while(1) {
{
len = end - start; len = end - start;
if(!len) if(!len)
break; break;
@@ -238,10 +228,10 @@ dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size,
{ {
int length; int length;
length = dts_syncinfo (state, buf, &flags, &sample_rate, length =
&bit_rate, &frame_length); dts_syncinfo(state, buf, &flags, &sample_rate, &bit_rate,
if (!length) &frame_length);
{ if(!length) {
av_log(NULL, AV_LOG_INFO, "skip\n"); av_log(NULL, AV_LOG_INFO, "skip\n");
for(bufptr = buf; bufptr < buf + HEADER_SIZE - 1; bufptr++) for(bufptr = buf; bufptr < buf + HEADER_SIZE - 1; bufptr++)
bufptr[0] = bufptr[1]; bufptr[0] = bufptr[1];
@@ -266,12 +256,12 @@ dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size,
avctx->sample_rate = sample_rate; avctx->sample_rate = sample_rate;
avctx->channels = channels_multi(flags); avctx->channels = channels_multi(flags);
avctx->bit_rate = bit_rate; avctx->bit_rate = bit_rate;
for (i = 0; i < dts_blocks_num (state); i++) for(i = 0; i < dts_blocks_num(state); i++) {
{
if(dts_block(state)) if(dts_block(state))
goto error; goto error;
{ {
int chans; int chans;
chans = channels_multi(flags); chans = channels_multi(flags);
convert2s16_multi(dts_samples(state), out_samples, convert2s16_multi(dts_samples(state), out_samples,
flags & (DTS_CHANNEL_MASK | DTS_LFE)); flags & (DTS_CHANNEL_MASK | DTS_LFE));