summaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/include/tp_data.h
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2014-11-07 09:32:48 +0200
committerMartin Storsjo <martin@martin.st>2014-11-07 09:32:48 +0200
commit6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f (patch)
treeda3cf1b27c50bd6d81be8b0183f494d15539027a /libMpegTPEnc/include/tp_data.h
parentce1863444a9e1d825c53bb3929f0b8fe664a6464 (diff)
parentd149516e1a3a63549d2c654b1398544d5de46a3e (diff)
downloadfdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.gz
fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.bz2
fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.zip
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libMpegTPEnc/include/tp_data.h')
-rw-r--r--libMpegTPEnc/include/tp_data.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/libMpegTPEnc/include/tp_data.h b/libMpegTPEnc/include/tp_data.h
index 5269858..c6e89b5 100644
--- a/libMpegTPEnc/include/tp_data.h
+++ b/libMpegTPEnc/include/tp_data.h
@@ -146,12 +146,15 @@ typedef struct
UCHAR FrontElementIsCpe[PC_FSB_CHANNELS_MAX];
UCHAR FrontElementTagSelect[PC_FSB_CHANNELS_MAX];
+ UCHAR FrontElementHeightInfo[PC_FSB_CHANNELS_MAX];
UCHAR SideElementIsCpe[PC_FSB_CHANNELS_MAX];
UCHAR SideElementTagSelect[PC_FSB_CHANNELS_MAX];
+ UCHAR SideElementHeightInfo[PC_FSB_CHANNELS_MAX];
UCHAR BackElementIsCpe[PC_FSB_CHANNELS_MAX];
UCHAR BackElementTagSelect[PC_FSB_CHANNELS_MAX];
+ UCHAR BackElementHeightInfo[PC_FSB_CHANNELS_MAX];
UCHAR LfeElementTagSelect[PC_LFE_CHANNELS_MAX];
@@ -324,16 +327,23 @@ int getSamplingRateIndex( UINT samplingRate )
*/
static inline int getNumberOfTotalChannels(int channelConfig)
{
- if (channelConfig > 0 && channelConfig < 8)
- return (channelConfig == 7)?8:channelConfig;
- else
+ switch (channelConfig) {
+ case 1: case 2: case 3:
+ case 4: case 5: case 6:
+ return channelConfig;
+ case 7: case 12: case 14:
+ return 8;
+ case 11:
+ return 7;
+ default:
return 0;
+ }
}
static inline
int getNumberOfEffectiveChannels(const int channelConfig)
-{
- const int n[] = {0,1,2,3,4,5,5,7};
+{ /* index: 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 */
+ const int n[] = {0,1,2,3,4,5,5,7,0,0, 0, 6, 7, 0, 7, 0};
return n[channelConfig];
}