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

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

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix tests Created 8 years 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') | media/filters/ffmpeg_video_decoder.cc » ('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 "media/base/media_switches.h" 5 #include "media/base/media_switches.h"
6 6
7 namespace switches { 7 namespace switches {
8 8
9 // Allow users to specify a custom buffer size for debugging purpose. 9 // Allow users to specify a custom buffer size for debugging purpose.
10 const char kAudioBufferSize[] = "audio-buffer-size"; 10 const char kAudioBufferSize[] = "audio-buffer-size";
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 // Enable browser-side audio mixer. 51 // Enable browser-side audio mixer.
52 const char kEnableAudioMixer[] = "enable-audio-mixer"; 52 const char kEnableAudioMixer[] = "enable-audio-mixer";
53 53
54 // Enable live audio input with getUserMedia() and the Web Audio API. 54 // Enable live audio input with getUserMedia() and the Web Audio API.
55 const char kEnableWebAudioInput[] = "enable-webaudio-input"; 55 const char kEnableWebAudioInput[] = "enable-webaudio-input";
56 56
57 // Set number of threads to use for video decoding. 57 // Set number of threads to use for video decoding.
58 const char kVideoThreads[] = "video-threads"; 58 const char kVideoThreads[] = "video-threads";
59 59
60 // Enables support for encrypted media. Current implementation is
61 // incomplete and this flag is used for development and testing.
62 const char kEnableEncryptedMedia[] = "enable-encrypted-media";
63
60 } // namespace switches 64 } // namespace switches
OLDNEW
« no previous file with comments | « media/base/media_switches.h ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698