diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 17:43:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 17:43:33 +0000 |
| commit | 65750eae6583754ea9d84fed41dc12d1fc3d73d0 (patch) | |
| tree | a8dc54ef8dba931c72627e7bbebf1844b81a31f7 /libSBRenc/src/sbr_encoder.cpp | |
| parent | 0713b4acff1a489e7d49725dc7c5e3dad370b5c8 (diff) | |
| parent | e1c78ed73faa51f2c7fcb0c4a17a92be9cc747f5 (diff) | |
| download | fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.tar.gz fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.tar.bz2 fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.zip | |
SBR/AAC encoder updates, code clean up
am: e1c78ed
* commit 'e1c78ed73faa51f2c7fcb0c4a17a92be9cc747f5':
SBR/AAC encoder updates, code clean up
Change-Id: I908adc47823de593c3e258c67f360da9321780f5
Diffstat (limited to 'libSBRenc/src/sbr_encoder.cpp')
| -rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index 221aecd..9bb98c8 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -103,7 +103,7 @@ amm-info@iis.fraunhofer.de #define SBRENCODER_LIB_VL0 3 #define SBRENCODER_LIB_VL1 3 -#define SBRENCODER_LIB_VL2 6 +#define SBRENCODER_LIB_VL2 8 @@ -1552,12 +1552,6 @@ INT FDKsbrEnc_EnvInit ( hSbrElement->sbrConfigData.sbrSyntaxFlags = 0; switch (aot) { - case AOT_DRM_MPEG_PS: - case AOT_DRM_SBR: - hSbrElement->sbrConfigData.sbrSyntaxFlags |= SBR_SYNTAX_SCALABLE; - hSbrElement->sbrConfigData.sbrSyntaxFlags |= SBR_SYNTAX_DRM_CRC; - hSbrElement->sbrConfigData.sbrSyntaxFlags |= SBR_SYNTAX_CRC; - break; case AOT_ER_AAC_ELD: hSbrElement->sbrConfigData.sbrSyntaxFlags |= SBR_SYNTAX_LOW_DELAY; break; @@ -1847,7 +1841,7 @@ INT sbrEncoder_Init( - if ( (aot==AOT_PS) || (aot==AOT_MP2_PS) || (aot==AOT_DABPLUS_PS) || (aot==AOT_DRM_MPEG_PS) ) { + if ( (aot==AOT_PS) ) { usePs = 1; } if ( (aot==AOT_ER_AAC_ELD) ) { |