Mercurial > libavcodec.hg
comparison alac.c @ 5298:e00f7048c50c libavcodec
Make "channels" variable mean the number of channels, not the number of
channels minus one
author | vitor |
---|---|
date | Fri, 13 Jul 2007 00:06:46 +0000 |
parents | d2a7fc14345c |
children | 07c6fa478918 |
comparison
equal
deleted
inserted
replaced
5297:fc46b3f5de1a | 5298:e00f7048c50c |
---|---|
485 alac->context_initialized = 1; | 485 alac->context_initialized = 1; |
486 } | 486 } |
487 | 487 |
488 init_get_bits(&alac->gb, inbuffer, input_buffer_size * 8); | 488 init_get_bits(&alac->gb, inbuffer, input_buffer_size * 8); |
489 | 489 |
490 channels = get_bits(&alac->gb, 3); | 490 channels = get_bits(&alac->gb, 3) + 1; |
491 | 491 |
492 /* 2^result = something to do with output waiting. | 492 /* 2^result = something to do with output waiting. |
493 * perhaps matters if we read > 1 frame in a pass? | 493 * perhaps matters if we read > 1 frame in a pass? |
494 */ | 494 */ |
495 get_bits(&alac->gb, 4); | 495 get_bits(&alac->gb, 4); |
508 outputsamples = get_bits(&alac->gb, 32); | 508 outputsamples = get_bits(&alac->gb, 32); |
509 } else | 509 } else |
510 outputsamples = alac->setinfo_max_samples_per_frame; | 510 outputsamples = alac->setinfo_max_samples_per_frame; |
511 | 511 |
512 *outputsize = outputsamples * alac->bytespersample; | 512 *outputsize = outputsamples * alac->bytespersample; |
513 readsamplesize = alac->setinfo_sample_size - (wasted_bytes * 8) + channels; | 513 readsamplesize = alac->setinfo_sample_size - (wasted_bytes * 8) + channels - 1; |
514 | 514 |
515 switch(channels) { | 515 switch(channels) { |
516 case 0: { /* 1 channel */ | 516 case 1: { /* 1 channel */ |
517 int ricemodifier; | 517 int ricemodifier; |
518 | 518 |
519 if (!isnotcompressed) { | 519 if (!isnotcompressed) { |
520 /* so it is compressed */ | 520 /* so it is compressed */ |
521 int16_t predictor_coef_table[32]; | 521 int16_t predictor_coef_table[32]; |
622 default: | 622 default: |
623 break; | 623 break; |
624 } | 624 } |
625 break; | 625 break; |
626 } | 626 } |
627 case 1: { /* 2 channels */ | 627 case 2: { /* 2 channels */ |
628 uint8_t interlacing_shift; | 628 uint8_t interlacing_shift; |
629 uint8_t interlacing_leftweight; | 629 uint8_t interlacing_leftweight; |
630 | 630 |
631 if (!isnotcompressed) { | 631 if (!isnotcompressed) { |
632 /* compressed */ | 632 /* compressed */ |