Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(796)

Unified Diff: media/base/channel_layout.h

Issue 10826296: Introduce shared_memory_support media target for PPAPI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/shared_memory_util.cc ('k') | media/base/channel_layout.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/channel_layout.h
diff --git a/media/base/channel_layout.h b/media/base/channel_layout.h
index ac10661daf90ebb4d223a73ba1ff56d6169a5a6f..9e884204177b92336ec0dda96093144d001d98f6 100644
--- a/media/base/channel_layout.h
+++ b/media/base/channel_layout.h
@@ -5,7 +5,6 @@
#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 {
@@ -78,15 +77,14 @@ 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
// position (because the order is L, R, C, LFE, LS, RS), so
// 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
+MEDIA_EXPORT extern const int
+kChannelOrderings[CHANNEL_LAYOUT_MAX][CHANNELS_MAX];
// Returns the number of channels in a given ChannelLayout.
MEDIA_EXPORT int ChannelLayoutToChannelCount(ChannelLayout layout);
« no previous file with comments | « media/audio/shared_memory_util.cc ('k') | media/base/channel_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698