diff options
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src/band_nrg.c')
-rw-r--r-- | media/libstagefright/codecs/aacenc/src/band_nrg.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/band_nrg.c b/media/libstagefright/codecs/aacenc/src/band_nrg.c index 666c4ca..89c39b6 100644 --- a/media/libstagefright/codecs/aacenc/src/band_nrg.c +++ b/media/libstagefright/codecs/aacenc/src/band_nrg.c @@ -1,35 +1,35 @@ -/*
- ** Copyright 2003-2010, VisualOn, Inc.
- **
- ** Licensed under the Apache License, Version 2.0 (the "License");
- ** you may not use this file except in compliance with the License.
- ** You may obtain a copy of the License at
- **
- ** http://www.apache.org/licenses/LICENSE-2.0
- **
- ** Unless required by applicable law or agreed to in writing, software
- ** distributed under the License is distributed on an "AS IS" BASIS,
- ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ** See the License for the specific language governing permissions and
- ** limitations under the License.
- */
-/*******************************************************************************
- File: band_nrg.c
-
- Content: Band/Line energy calculations functions
-
+/* + ** Copyright 2003-2010, VisualOn, Inc. + ** + ** Licensed under the Apache License, Version 2.0 (the "License"); + ** you may not use this file except in compliance with the License. + ** You may obtain a copy of the License at + ** + ** http://www.apache.org/licenses/LICENSE-2.0 + ** + ** Unless required by applicable law or agreed to in writing, software + ** distributed under the License is distributed on an "AS IS" BASIS, + ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ** See the License for the specific language governing permissions and + ** limitations under the License. + */ +/******************************************************************************* + File: band_nrg.c + + Content: Band/Line energy calculations functions + *******************************************************************************/ -#include "basic_op.h"
+#include "basic_op.h" #include "band_nrg.h" -#ifndef ARMV5E
+#ifndef ARMV5E /******************************************************************************** * * function name: CalcBandEnergy * description: Calc sfb-bandwise mdct-energies for left and right channel * -**********************************************************************************/
+**********************************************************************************/ void CalcBandEnergy(const Word32 *mdctSpectrum, const Word16 *bandOffset, const Word16 numBands, @@ -42,8 +42,8 @@ void CalcBandEnergy(const Word32 *mdctSpectrum, for (i=0; i<numBands; i++) { Word32 accu = 0; for (j=bandOffset[i]; j<bandOffset[i+1]; j++) - accu = L_add(accu, MULHIGH(mdctSpectrum[j], mdctSpectrum[j]));
-
+ accu = L_add(accu, MULHIGH(mdctSpectrum[j], mdctSpectrum[j])); + accu = L_add(accu, accu); accuSum = L_add(accuSum, accu); bandEnergy[i] = accu; @@ -86,9 +86,9 @@ void CalcBandEnergyMS(const Word32 *mdctSpectrumLeft, accuMid = L_add(accuMid, MULHIGH(specm, specm)); accuSide = L_add(accuSide, MULHIGH(specs, specs)); } -
- accuMid = L_add(accuMid, accuMid);
- accuSide = L_add(accuSide, accuSide);
+ + accuMid = L_add(accuMid, accuMid); + accuSide = L_add(accuSide, accuSide); bandEnergyMid[i] = accuMid; accuMidSum = L_add(accuMidSum, accuMid); bandEnergySide[i] = accuSide; |