diff options
| author | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
| commit | 6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f (patch) | |
| tree | da3cf1b27c50bd6d81be8b0183f494d15539027a /libAACdec/src/aac_ram.cpp | |
| parent | ce1863444a9e1d825c53bb3929f0b8fe664a6464 (diff) | |
| parent | d149516e1a3a63549d2c654b1398544d5de46a3e (diff) | |
| download | fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.gz fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.bz2 fdk-aac-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libAACdec/src/aac_ram.cpp')
| -rw-r--r-- | libAACdec/src/aac_ram.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libAACdec/src/aac_ram.cpp b/libAACdec/src/aac_ram.cpp index a38f57c..1ff289b 100644 --- a/libAACdec/src/aac_ram.cpp +++ b/libAACdec/src/aac_ram.cpp @@ -108,15 +108,15 @@ C_ALLOC_MEM(AacDecoder, AAC_DECODER_INSTANCE, 1) /*! The structure CAacDecoderStaticChannelInfo contains the static sideinfo which is needed for the decoding of one aac channel. <br> Dimension: #AacDecoderChannels */ -C_ALLOC_MEM2(AacDecoderStaticChannelInfo, CAacDecoderStaticChannelInfo, 1, (6)) +C_ALLOC_MEM2(AacDecoderStaticChannelInfo, CAacDecoderStaticChannelInfo, 1, (8)) /*! The structure CAacDecoderChannelInfo contains the dynamic sideinfo which is needed for the decoding of one aac channel. <br> Dimension: #AacDecoderChannels */ -C_ALLOC_MEM2(AacDecoderChannelInfo, CAacDecoderChannelInfo, 1, (6)) +C_AALLOC_MEM2(AacDecoderChannelInfo, CAacDecoderChannelInfo, 1, (8)) /*! Overlap buffer */ -C_ALLOC_MEM2(OverlapBuffer, FIXP_DBL, OverlapBufferSize, (6)) +C_ALLOC_MEM2(OverlapBuffer, FIXP_DBL, OverlapBufferSize, (8)) C_ALLOC_MEM(DrcInfo, CDrcInfo, 1) @@ -128,7 +128,7 @@ C_ALLOC_MEM(DrcInfo, CDrcInfo, 1) Dynamic memory areas, might be reused in other algorithm sections, e.g. the sbr decoder */ -C_ALLOC_MEM_OVERLAY(WorkBufferCore2, FIXP_DBL, ((6)*1024), SECT_DATA_L2, WORKBUFFER2_TAG) +C_ALLOC_MEM_OVERLAY(WorkBufferCore2, FIXP_DBL, ((8)*1024), SECT_DATA_L2, WORKBUFFER2_TAG) C_ALLOC_MEM_OVERLAY(WorkBufferCore1, CWorkBufferCore1, 1, SECT_DATA_L1, WORKBUFFER1_TAG) |