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/aacenc_lib.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/aacenc_lib.cpp')
-rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 34028c5..6b77155 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1083,7 +1083,6 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, /* Verify settings and update: config -> heAacEncoder */ if ( (err=FDKaacEnc_AdjustEncSettings(hAacEncoder, config)) != AACENC_OK ) { - printf("Fail 1.1\n"); return err; } frameLength = hAacConfig->framelength; /* adapt temporal framelength */ @@ -1122,13 +1121,11 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, hAacConfig->channelOrder, &channelMapping) != AAC_ENC_OK ) { - printf("Fail 1.2\n"); return AACENC_INIT_ERROR; } /* Check return value and if the SBR encoder can handle enough elements */ if (channelMapping.nElements > (8)) { - printf("Fail 1.3\n"); return AACENC_INIT_ERROR; } @@ -1158,7 +1155,6 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, /* Suppress AOT reconfiguration and check error status. */ if (sbrError) { - printf("Fail 1.4\n"); return AACENC_INIT_SBR_ERROR; } @@ -1199,7 +1195,6 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, /* Initialize Bitstream encoder */ if ( transportEnc_Init(hAacEncoder->hTpEnc, hAacEncoder->outBuffer, hAacEncoder->outBufferInBytes, config->userTpType, &hAacEncoder->coderConfig, flags) != 0) { - printf("Fail 1.5\n"); return AACENC_INIT_TP_ERROR; } @@ -1218,7 +1213,6 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, (InitFlags & AACENC_INIT_STATES) ? 1 : 0); if (err != AAC_ENC_OK) { - printf("Fail 1.6\n"); return AACENC_INIT_AAC_ERROR; } @@ -1246,7 +1240,6 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, config->userChannelMode, hAacConfig->channelOrder) != 0) { - printf("Fail 1.7\n"); return AACENC_INIT_META_ERROR; } @@ -1495,7 +1488,6 @@ AACENC_ERROR aacEncEncode( if (err!=AACENC_OK) { /* keep init flags alive! */ - printf("Fail 1\n"); goto bail; } hAacEncoder->InitFlags = AACENC_INIT_NONE; @@ -1517,7 +1509,6 @@ AACENC_ERROR aacEncEncode( * If only encoder handle given, independent (re)initialization can be triggered. */ if ( (hAacEncoder!=NULL) & (inBufDesc==NULL) && (outBufDesc==NULL) && (inargs==NULL) && (outargs==NULL) ) { - printf("Fail 2\n"); goto bail; } @@ -1581,7 +1572,6 @@ AACENC_ERROR aacEncEncode( } } else { /* inargs->numInSamples!= -1 */ - printf("Fail 3\n"); goto bail; /* not enough samples in input buffer and no flushing enabled */ } } @@ -1654,7 +1644,6 @@ AACENC_ERROR aacEncEncode( )) { err = AACENC_ENCODE_ERROR; - printf("Fail 4\n"); goto bail; } else { @@ -1696,7 +1685,6 @@ AACENC_ERROR aacEncEncode( ) != AAC_ENC_OK ) { err = AACENC_ENCODE_ERROR; - printf("Fail 5\n"); goto bail; } @@ -1737,7 +1725,6 @@ AACENC_ERROR aacEncEncode( else { /* output buffer too small, can't write valid bitstream */ err = AACENC_ENCODE_ERROR; - printf("Fail 6\n"); goto bail; } } |