mirrors/flac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in constant-detection.

Browse Source
This commit is contained in:
Josh Coalson 2000-12-17 19:07:46 +00:00
parent 288c9dea5c
commit d44feb11d9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libFLAC/encoder.c
View File

@ -627,10 +627,20 @@ bool encoder_process_subframes_(FLAC__Encoder *encoder, bool is_last_frame, cons
/* check for constant subframe */ /* check for constant subframe */
guess_fixed_order = FLAC__fixed_compute_best_predictor(integer_signal[channel]+FLAC__MAX_FIXED_ORDER, frame_header->blocksize-FLAC__MAX_FIXED_ORDER, fixed_residual_bits_per_sample); guess_fixed_order = FLAC__fixed_compute_best_predictor(integer_signal[channel]+FLAC__MAX_FIXED_ORDER, frame_header->blocksize-FLAC__MAX_FIXED_ORDER, fixed_residual_bits_per_sample);
if(fixed_residual_bits_per_sample[1] == 0.0) { if(fixed_residual_bits_per_sample[1] == 0.0) {
candidate_bits = encoder_evaluate_constant_subframe_(integer_signal[channel][0], frame_header->bits_per_sample, &(encoder->guts->candidate_subframe)); /* the above means integer_signal[channel]+FLAC__MAX_FIXED_ORDER is constant, now we just have to check the warmup samples */
if(candidate_bits < best_bits) { unsigned i, signal_is_constant = true;
encoder_promote_candidate_subframe_(encoder); for(i = 1; i <= FLAC__MAX_FIXED_ORDER; i++) {
best_bits = candidate_bits; if(integer_signal[channel][0] != integer_signal[channel][i]) {
signal_is_constant = false;
break;
}
}
if(signal_is_constant) {
candidate_bits = encoder_evaluate_constant_subframe_(integer_signal[channel][0], frame_header->bits_per_sample, &(encoder->guts->candidate_subframe));
if(candidate_bits < best_bits) {
encoder_promote_candidate_subframe_(encoder);
best_bits = candidate_bits;
}
} }
} }
else { else {