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

Side by Side Diff: media/base/media_switches.cc

Issue 2871583004: Rename --enable-default-media-session to --enable-audio-focus. (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « media/base/media_switches.h ('k') | tools/metrics/histograms/enums.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 #include "media/base/media_switches.h" 6 #include "media/base/media_switches.h"
7 #include "ppapi/features/features.h" 7 #include "ppapi/features/features.h"
8 8
9 namespace switches { 9 namespace switches {
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // Number of buffers to use for WaveOut. 61 // Number of buffers to use for WaveOut.
62 const char kWaveOutBuffers[] = "waveout-buffers"; 62 const char kWaveOutBuffers[] = "waveout-buffers";
63 #endif 63 #endif
64 64
65 #if defined(USE_CRAS) 65 #if defined(USE_CRAS)
66 // Use CRAS, the ChromeOS audio server. 66 // Use CRAS, the ChromeOS audio server.
67 const char kUseCras[] = "use-cras"; 67 const char kUseCras[] = "use-cras";
68 #endif 68 #endif
69 69
70 #if !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) 70 #if !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS)
71 // Use a media session for each tabs in a way that two tabs can't play on top of 71 // Enable a internal audio focus management between tabs in such a way that two
72 // each other. This is different from the Media Session API as it is enabling a 72 // tabs can't play on top of each other.
73 // default behaviour for the browser. The allowed values are: "" (empty), 73 // The allowed values are: "" (empty) or |kEnableAudioFocusDuckFlash|.
74 // |kEnableDefaultMediaSessionDuckFlash|. 74 const char kEnableAudioFocus[] = "enable-audio-focus";
75 const char kEnableDefaultMediaSession[] = "enable-default-media-session";
76 #endif // !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS) 75 #endif // !defined(OS_ANDROID) || BUILDFLAG(ENABLE_PLUGINS)
77 76
78 #if BUILDFLAG(ENABLE_PLUGINS) 77 #if BUILDFLAG(ENABLE_PLUGINS)
79 // This value is used as an option for |kEnableDefaultMediaSession|. Flash will 78 // This value is used as an option for |kEnableAudioFocus|. Flash will
80 // be ducked when losing audio focus. 79 // be ducked when losing audio focus.
81 const char kEnableDefaultMediaSessionDuckFlash[] = "duck-flash"; 80 const char kEnableAudioFocusDuckFlash[] = "duck-flash";
82 #endif // BUILDFLAG(ENABLE_PLUGINS) 81 #endif // BUILDFLAG(ENABLE_PLUGINS)
83 82
84 #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) 83 #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
85 // Rather than use the renderer hosted remotely in the media service, fall back 84 // Rather than use the renderer hosted remotely in the media service, fall back
86 // to the default renderer within content_renderer. Does not change the behavior 85 // to the default renderer within content_renderer. Does not change the behavior
87 // of the media service. 86 // of the media service.
88 const char kDisableMojoRenderer[] = "disable-mojo-renderer"; 87 const char kDisableMojoRenderer[] = "disable-mojo-renderer";
89 #endif // BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION) 88 #endif // BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
90 89
91 // Use fake device for Media Stream to replace actual camera and microphone. 90 // Use fake device for Media Stream to replace actual camera and microphone.
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 // This is completely insecure - DO NOT USE except for testing. 243 // This is completely insecure - DO NOT USE except for testing.
245 const base::Feature kD3D11VideoDecoding{"D3D11VideoDecoding", 244 const base::Feature kD3D11VideoDecoding{"D3D11VideoDecoding",
246 base::FEATURE_DISABLED_BY_DEFAULT}; 245 base::FEATURE_DISABLED_BY_DEFAULT};
247 246
248 // Enables H264 HW encode acceleration using Media Foundation for Windows. 247 // Enables H264 HW encode acceleration using Media Foundation for Windows.
249 const base::Feature kMediaFoundationH264Encoding{ 248 const base::Feature kMediaFoundationH264Encoding{
250 "MediaFoundationH264Encoding", base::FEATURE_ENABLED_BY_DEFAULT}; 249 "MediaFoundationH264Encoding", base::FEATURE_ENABLED_BY_DEFAULT};
251 #endif // defined(OS_WIN) 250 #endif // defined(OS_WIN)
252 251
253 } // namespace media 252 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media_switches.h ('k') | tools/metrics/histograms/enums.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698