summaryrefslogtreecommitdiffstats
path: root/libMpegTPDec/include/tpdec_lib.h
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2013-11-01 10:46:40 +0200
committerMartin Storsjo <martin@martin.st>2013-11-01 10:46:40 +0200
commit321233ee92e138f44294c7bb9a375eadad9d24fa (patch)
tree1de928ad26325302f64c56603157f50095dcf2b1 /libMpegTPDec/include/tpdec_lib.h
parentfcb5f1b692cb8343de35e69f9084328c652cf690 (diff)
parentfa3eba16446cc8f2f5e2dfc20d86a49dbd37299e (diff)
downloadODR-AudioEnc-321233ee92e138f44294c7bb9a375eadad9d24fa.tar.gz
ODR-AudioEnc-321233ee92e138f44294c7bb9a375eadad9d24fa.tar.bz2
ODR-AudioEnc-321233ee92e138f44294c7bb9a375eadad9d24fa.zip
Merge remote-tracking branch 'aosp/kitkat-release' into kitkat-merge
Conflicts: libAACenc/src/quantize.cpp
Diffstat (limited to 'libMpegTPDec/include/tpdec_lib.h')
-rw-r--r--libMpegTPDec/include/tpdec_lib.h25
1 files changed, 23 insertions, 2 deletions
diff --git a/libMpegTPDec/include/tpdec_lib.h b/libMpegTPDec/include/tpdec_lib.h
index 7317204..fb4c41d 100644
--- a/libMpegTPDec/include/tpdec_lib.h
+++ b/libMpegTPDec/include/tpdec_lib.h
@@ -2,7 +2,7 @@
/* -----------------------------------------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2012 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
All rights reserved.
1. INTRODUCTION
@@ -186,6 +186,27 @@ int CProgramConfig_IsValid ( const CProgramConfig *pPce );
void CProgramConfig_Read ( CProgramConfig *pPce,
HANDLE_FDK_BITSTREAM bs,
UINT alignAnchor );
+
+/*!
+ \brief Compare two Program Config Elements.
+ \param pPce1 Pointer to first Program Config Element structure.
+ \param pPce2 Pointer to second Program Config Element structure.
+ \return -1 if PCEs are completely different,
+ 0 if PCEs are completely equal,
+ 1 if PCEs are different but have the same channel config,
+ 2 if PCEs have different channel config but same number of channels.
+*/
+int CProgramConfig_Compare ( const CProgramConfig * const pPce1,
+ const CProgramConfig * const pPce2 );
+
+/*!
+ \brief Get a Program Config Element that matches the predefined MPEG-4 channel configurations 1-14.
+ \param pPce Program Config Element structure.
+ \param channelConfig MPEG-4 channel configuration.
+ \return void
+*/
+void CProgramConfig_GetDefault ( CProgramConfig *pPce,
+ const UINT channelConfig );
#endif /* TP_PCE_ENABLE */
/**
@@ -206,7 +227,7 @@ void CProgramConfig_Read ( CProgramConfig *pPce,
*/
int CProgramConfig_LookupElement(
CProgramConfig *pPce,
- const UINT channelConfig,
+ UINT channelConfig,
const UINT tag,
const UINT channelIdx,
UCHAR chMapping[],