diff options
| author | Xin Li <delphij@google.com> | 2021-10-07 23:50:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-07 23:50:17 +0000 |
| commit | 2e68054f9cfa1a55d8a42b2880d95ddcf4678168 (patch) | |
| tree | 1562a2338a355405228db7d81b19b0f87dd880e3 | |
| parent | 7f77aa665027d563805950fd0d53a0c98d7f97d4 (diff) | |
| parent | e5e25fe981ed863a2962695e9e1e34fa4e0d1373 (diff) | |
| download | flac-2e68054f9cfa1a55d8a42b2880d95ddcf4678168.tar.gz | |
Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
| -rw-r--r-- | PREUPLOAD.cfg | 2 | ||||
| -rw-r--r-- | src/libFLAC/stream_encoder.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 00000000..ecf8b8ef --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Hook Scripts] +mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_project.sh diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 74387ec3..8bb0ef30 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -2610,7 +2610,9 @@ FLAC__bool write_bitbuffer_(FLAC__StreamEncoder *encoder, uint32_t 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) |