diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-18 20:18:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-18 20:18:21 +0000 |
| commit | 72c0d8367bfb09f4a8c7d6ab39063904bdd1d912 (patch) | |
| tree | 1ca17f569d6af4229103414d12b6ea4535abfb62 | |
| parent | 45f899c3d6aee678cebbcba4eceb92e9fe0c0071 (diff) | |
| parent | 7d568fcd874484bee0798134df397b6568e76102 (diff) | |
| download | flac-android11-mainline-cellbroadcast-release.tar.gz | |
Snap for 7218917 from 7d568fcd874484bee0798134df397b6568e76102 to mainline-cellbroadcast-releaseandroid-mainline-11.0.0_r37android-mainline-11.0.0_r26android11-mainline-cellbroadcast-release
Change-Id: Iffb7ef05506646396215e157130e1ac94a17d849
| -rw-r--r-- | libFLAC/libFLAC_blacklist.txt | 6 | ||||
| -rw-r--r-- | libFLAC/stream_encoder.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libFLAC/libFLAC_blacklist.txt b/libFLAC/libFLAC_blacklist.txt index 7dff751e..9b0d7d23 100644 --- a/libFLAC/libFLAC_blacklist.txt +++ b/libFLAC/libFLAC_blacklist.txt @@ -3,6 +3,12 @@ fun:FLAC__lpc_compute_autocorrelation # libFLAC/stream_encoder.c:3982: 4294967292 + 128 cannot be represented in type 'unsigned int' fun:precompute_partition_info_sums_ +# libFLAC/lpc.c:1030:18: -1932902714 + -1376235516 cannot be represented in type 'int' +fun:FLAC__lpc_restore_signal +# libFLAC/fixed.c:390:44: 6 * -358419632 cannot be represented in type 'int' +# libFLAC/fixed.c:378:27: -1023409921 + -1145670695 cannot be represented in type 'int' +fun:FLAC__fixed_restore_signal +fun:FLAC__fixed_compute_residual src:*/libFLAC/crc.c src:*/libFLAC/md5.c diff --git a/libFLAC/stream_encoder.c b/libFLAC/stream_encoder.c index 037b8cb5..b0b26501 100644 --- a/libFLAC/stream_encoder.c +++ b/libFLAC/stream_encoder.c @@ -2578,7 +2578,9 @@ FLAC__bool write_bitbuffer_(FLAC__StreamEncoder *encoder, unsigned samples, FLAC encoder->private_->verify.needs_magic_hack = true; } else { - if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder)) { + if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder) + || (!is_last_block + && (FLAC__stream_encoder_get_verify_decoder_state(encoder) == FLAC__STREAM_DECODER_END_OF_STREAM))) { FLAC__bitwriter_release_buffer(encoder->private_->frame); FLAC__bitwriter_clear(encoder->private_->frame); if(encoder->protected_->state != FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) |