diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 18:12:25 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 18:12:25 +0000 |
| commit | 5c05b40cf995fe0bf0d60bcdb282f3d0d28ec1d9 (patch) | |
| tree | 7721f62e5a16975a46a17f15272edd403310b2ae /media/audio/audio_util.cc | |
| parent | 021052dbd3619f6ea8a248dab8f7bea35521048f (diff) | |
| download | chromium_src-5c05b40cf995fe0bf0d60bcdb282f3d0d28ec1d9.zip chromium_src-5c05b40cf995fe0bf0d60bcdb282f3d0d28ec1d9.tar.gz chromium_src-5c05b40cf995fe0bf0d60bcdb282f3d0d28ec1d9.tar.bz2 | |
Fix folding code to respect new AAC channel order caused by ffmpeg roll. Also tested for OGG.
BUG=43094
TEST=play a movie with 5.1 sound. ie startrek-sbspot_h720p.mov. The voices should be centered.
Review URL: http://codereview.chromium.org/2095007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_util.cc')
| -rw-r--r-- | media/audio/audio_util.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/media/audio/audio_util.cc b/media/audio/audio_util.cc index 8774a72..9f4e6da 100644 --- a/media/audio/audio_util.cc +++ b/media/audio/audio_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -33,12 +33,9 @@ void AdjustVolume(Format* buf_out, } } -// Channel order for AAC -// From http://www.hydrogenaudio.org/forums/lofiversion/index.php/t40046.html - -static const int kChannel_C = 0; -static const int kChannel_L = 1; -static const int kChannel_R = 2; +static const int kChannel_L = 0; +static const int kChannel_R = 1; +static const int kChannel_C = 2; template<class Fixed, int min_value, int max_value> static int AddChannel(int val, |