diff options
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src/ms_stereo.c')
-rw-r--r-- | media/libstagefright/codecs/aacenc/src/ms_stereo.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/ms_stereo.c b/media/libstagefright/codecs/aacenc/src/ms_stereo.c index c83d07b..44d45cc 100644 --- a/media/libstagefright/codecs/aacenc/src/ms_stereo.c +++ b/media/libstagefright/codecs/aacenc/src/ms_stereo.c @@ -1,26 +1,26 @@ -/*
- ** 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: ms_stereo.c
-
- Content: MS stereo processing function
-
+/* + ** 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: ms_stereo.c + + Content: MS stereo processing function + *******************************************************************************/ -#include "basic_op.h"
+#include "basic_op.h" #include "oper_32b.h" #include "psy_const.h" #include "ms_stereo.h" @@ -74,10 +74,10 @@ void MsStereoProcessing(Word32 *sfbEnergyLeft, minThreshold = min(thrL, thrR); nrgL = max(nrgL,thrL) + 1; - shift = norm_l(nrgL);
+ shift = norm_l(nrgL); nrgL = Div_32(thrL << shift, nrgL << shift); nrgR = max(nrgR,thrR) + 1; - shift = norm_l(nrgR);
+ shift = norm_l(nrgR); nrgR = Div_32(thrR << shift, nrgR << shift); pnlr = fixmul(nrgL, nrgR); @@ -86,11 +86,11 @@ void MsStereoProcessing(Word32 *sfbEnergyLeft, nrgR = sfbEnergySide[idx]; nrgL = max(nrgL,minThreshold) + 1; - shift = norm_l(nrgL);
+ shift = norm_l(nrgL); nrgL = Div_32(minThreshold << shift, nrgL << shift); nrgR = max(nrgR,minThreshold) + 1; - shift = norm_l(nrgR);
+ shift = norm_l(nrgR); nrgR = Div_32(minThreshold << shift, nrgR << shift); pnms = fixmul(nrgL, nrgR); |