diff options
| author | Xin Li <delphij@google.com> | 2019-07-01 20:59:18 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-07-01 20:59:18 +0000 |
| commit | 4d56b880e2d129757bd0855859da83cad0399965 (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libSBRdec/src/sbrdecoder.cpp | |
| parent | c10b5daa8da7e059eeaebbe7ac22c9635a6af26d (diff) | |
| parent | 058d1295f4d9e3418eafb1fd7c92602000ff5c53 (diff) | |
| download | fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.tar.gz fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.tar.bz2 fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.zip | |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I30ab93ed5c2fa3c47306058d1a0f749b8101b01e
Diffstat (limited to 'libSBRdec/src/sbrdecoder.cpp')
| -rw-r--r-- | libSBRdec/src/sbrdecoder.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libSBRdec/src/sbrdecoder.cpp b/libSBRdec/src/sbrdecoder.cpp index 4bc6f69..c827ced 100644 --- a/libSBRdec/src/sbrdecoder.cpp +++ b/libSBRdec/src/sbrdecoder.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -871,11 +871,10 @@ INT sbrDecoder_Header(HANDLE_SBRDECODER self, HANDLE_FDK_BITSTREAM hBs, if (sbrError == SBRDEC_OK) { hSbrHeader->syncState = SBR_HEADER; hSbrHeader->status |= SBRDEC_HDR_STAT_UPDATE; + } else { + hSbrHeader->syncState = SBR_NOT_INITIALIZED; + hSbrHeader->status = HEADER_ERROR; } - /* else { - Since we already have overwritten the old SBR header the only way out - is UPSAMPLING! This will be prepared in the next step. - } */ } } } |