RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 02:04:58 +00:00
Code Issues Projects Releases Wiki Activity

Yet more cosmetics

Browse Source 
Originally committed as revision 9737 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2007-07-18 14:36:30 +00:00
parent 10024d443a
commit 60c4a31c6a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/alac.c
View File

@ -321,9 +321,7 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer,
int32_t val; int32_t val;
val = buffer_out[i] + error_buffer[i+1]; val = buffer_out[i] + error_buffer[i+1];
val = SIGN_EXTENDED32(val, readsamplesize); val = SIGN_EXTENDED32(val, readsamplesize);
buffer_out[i+1] = val; buffer_out[i+1] = val;
} }
@ -342,7 +340,6 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer,
} }
#endif #endif
/* general case */ /* general case */
if (predictor_coef_num > 0) { if (predictor_coef_num > 0) {
for (i = predictor_coef_num + 1; i < output_size; i++) { for (i = predictor_coef_num + 1; i < output_size; i++) {
@ -561,8 +558,8 @@ static int alac_decode_frame(AVCodecContext *avctx,
prediction_quantitization[chan]); prediction_quantitization[chan]);
} else { } else {
av_log(avctx, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type[chan]); av_log(avctx, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type[chan]);
/* i think the only other prediction type (or perhaps this is just a /* I think the only other prediction type (or perhaps this is
* boolean?) runs adaptive fir twice.. like: * just a boolean?) runs adaptive fir twice.. like:
* predictor_decompress_fir_adapt(predictor_error, tempout, ...) * predictor_decompress_fir_adapt(predictor_error, tempout, ...)
* predictor_decompress_fir_adapt(predictor_error, outputsamples ...) * predictor_decompress_fir_adapt(predictor_error, outputsamples ...)
* little strange.. * little strange..
@ -573,7 +570,7 @@ static int alac_decode_frame(AVCodecContext *avctx,
/* not compressed, easy case */ /* not compressed, easy case */
if (alac->setinfo_sample_size <= 16) { if (alac->setinfo_sample_size <= 16) {
int i, chan; int i, chan;
for (chan = 0; chan < channels; chan++) { for (chan = 0; chan < channels; chan++)
for (i = 0; i < outputsamples; i++) { for (i = 0; i < outputsamples; i++) {
int32_t audiobits; int32_t audiobits;
@ -582,10 +579,9 @@ static int alac_decode_frame(AVCodecContext *avctx,
alac->outputsamples_buffer[chan][i] = audiobits; alac->outputsamples_buffer[chan][i] = audiobits;
} }
}
} else { } else {
int i, chan; int i, chan;
for (chan = 0; chan < channels; chan++) { for (chan = 0; chan < channels; chan++)
for (i = 0; i < outputsamples; i++) { for (i = 0; i < outputsamples; i++) {
int32_t audiobits; int32_t audiobits;
@ -598,7 +594,6 @@ static int alac_decode_frame(AVCodecContext *avctx,
alac->outputsamples_buffer[chan][i] = audiobits; alac->outputsamples_buffer[chan][i] = audiobits;
} }
}
} }
/* wasted_bytes = 0; */ /* wasted_bytes = 0; */
interlacing_shift = 0; interlacing_shift = 0;