diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-03-11 21:27:57 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-03-11 21:27:57 +0100 |
| commit | 58bdd4198eb5b7029d515340307c754108ab8b11 (patch) | |
| tree | df16e70225672ea19fb1df01f2af40aaae67dfaa /libAACenc/src/bitenc.cpp | |
| parent | b46963cc7e82dcb8c6509139f9176458db7c9d91 (diff) | |
| download | fdk-aac-58bdd4198eb5b7029d515340307c754108ab8b11.tar.gz fdk-aac-58bdd4198eb5b7029d515340307c754108ab8b11.tar.bz2 fdk-aac-58bdd4198eb5b7029d515340307c754108ab8b11.zip | |
Revert useless changes
This reverts commit b46963cc7e82dcb8c6509139f9176458db7c9d91.
Diffstat (limited to 'libAACenc/src/bitenc.cpp')
| -rw-r--r-- | libAACenc/src/bitenc.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libAACenc/src/bitenc.cpp b/libAACenc/src/bitenc.cpp index fd2697e..4552457 100644 --- a/libAACenc/src/bitenc.cpp +++ b/libAACenc/src/bitenc.cpp @@ -1302,6 +1302,7 @@ AAC_ENCODER_ERROR FDKaacEnc_WriteBitstream(HANDLE_TRANSPORTENC hTpEnc, frameBits = bitMarkUp = alignAnchor; + /* Write DSEs first in case of DAB */ for (n = 0; (n < qcOut->nExtensions) && (n < (2+2)); n++) { @@ -1342,7 +1343,6 @@ AAC_ENCODER_ERROR FDKaacEnc_WriteBitstream(HANDLE_TRANSPORTENC hTpEnc, NULL, 0 )) ) { - printf("Fail 2.4.1\n"); return ErrorStatus; } @@ -1364,7 +1364,6 @@ AAC_ENCODER_ERROR FDKaacEnc_WriteBitstream(HANDLE_TRANSPORTENC hTpEnc, /* In FDK, DSE signalling explicit done in elDSE. See channel_map.cpp */ default: - printf("Fail 2.4.2\n"); return AAC_ENC_INVALID_ELEMENTINFO_TYPE; } /* switch */ @@ -1440,7 +1439,6 @@ AAC_ENCODER_ERROR FDKaacEnc_WriteBitstream(HANDLE_TRANSPORTENC hTpEnc, /* Do byte alignment after AAC (+ MPS) payload. Assure that MPS has been written as channel assigned extension payload! */ if (((FDKgetValidBits(hBs)-alignAnchor+(UINT)qcOut->totFillBits)&0x7)!=(UINT)qcOut->alignBits) { - printf("Fail 2.4.3\n"); return AAC_ENC_WRITTEN_BITS_ERROR; } FDKaacEnc_ByteAlignment(hBs, qcOut->alignBits); @@ -1488,7 +1486,6 @@ AAC_ENCODER_ERROR FDKaacEnc_WriteBitstream(HANDLE_TRANSPORTENC hTpEnc, if (doByteAlign) { /* Assure byte alignment*/ if (((alignAnchor-FDKgetValidBits(hBs))&0x7)!=(UINT)qcOut->alignBits) { - printf("Fail 2.4.4, %d != %d\n", (alignAnchor-FDKgetValidBits(hBs))&0x7, (UINT)qcOut->alignBits ); return AAC_ENC_WRITTEN_BITS_ERROR; } |