diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 19:32:00 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 19:32:00 +0000 |
| commit | f231cddb76e3e8fc1e7fc35fc0cc1be4ce4aef5a (patch) | |
| tree | f4d4ca589566dc69aa6897ab8dc8120750cad97b /media/base/channel_layout.h | |
| parent | 69c5845f97c6c3710aa154ae0f81dfc40c14ea66 (diff) | |
| download | chromium_src-f231cddb76e3e8fc1e7fc35fc0cc1be4ce4aef5a.zip chromium_src-f231cddb76e3e8fc1e7fc35fc0cc1be4ce4aef5a.tar.gz chromium_src-f231cddb76e3e8fc1e7fc35fc0cc1be4ce4aef5a.tar.bz2 | |
Dead code elimination: scythe.chrome_functions:segment.path %media% edition, round 1.
Internal-only site: http://go/videostack/engineering/dead-code-elimination
Review URL: https://chromiumcodereview.appspot.com/10837118
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/channel_layout.h')
| -rw-r--r-- | media/base/channel_layout.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/base/channel_layout.h b/media/base/channel_layout.h index 6a7d1ad..ac10661 100644 --- a/media/base/channel_layout.h +++ b/media/base/channel_layout.h @@ -5,6 +5,7 @@ #ifndef MEDIA_BASE_CHANNEL_LAYOUT_H_ #define MEDIA_BASE_CHANNEL_LAYOUT_H_ +#include "build/build_config.h" #include "media/base/media_export.h" enum ChannelLayout { @@ -77,6 +78,7 @@ enum Channels { CHANNELS_MAX }; +#if defined(OS_MACOSX) || defined(USE_PULSEAUDIO) // The channel orderings for each layout as specified by FFmpeg. // Values represent the index of each channel in each layout. For example, the // left side surround sound channel in FFmpeg's 5.1 layout is in the 5th @@ -84,6 +86,7 @@ enum Channels { // kChannelOrderings[CHANNEL_LAYOUT_5POINT1][SIDE_LEFT] = 4; // Values of -1 mean the channel at that index is not used for that layout. extern const int kChannelOrderings[CHANNEL_LAYOUT_MAX][CHANNELS_MAX]; +#endif // Returns the number of channels in a given ChannelLayout. MEDIA_EXPORT int ChannelLayoutToChannelCount(ChannelLayout layout); |