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

Side by Side Diff: content/browser/media/media_source_browsertest.cc

Issue 2543623003: media: Allow config change between clear and encrypted streams (Closed)
Patch Set: comments addressed Created 3 years, 10 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "content/browser/media/media_browsertest.h" 7 #include "content/browser/media/media_browsertest.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "media/media_features.h" 9 #include "media/media_features.h"
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_Opus_WebM) { 71 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_Opus_WebM) {
72 TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, kEnded); 72 TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, kEnded);
73 } 73 }
74 #endif 74 #endif
75 75
76 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) { 76 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) {
77 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded); 77 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded);
78 } 78 }
79 79
80 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { 80 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) {
81 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, kError); 81 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly,
82 kErrorEvent);
82 } 83 }
83 84
84 // Flaky test crbug.com/246308 85 // Flaky test crbug.com/246308
85 // Test changed to skip checks resulting in flakiness. Proper fix still needed. 86 // Test changed to skip checks resulting in flakiness. Proper fix still needed.
86 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { 87 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
87 RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true); 88 RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true);
88 } 89 }
89 90
90 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 91 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
91 92
(...skipping 16 matching lines...) Expand all
108 #endif 109 #endif
109 110
110 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 111 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
111 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) 112 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
112 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) { 113 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) {
113 TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded); 114 TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded);
114 } 115 }
115 #endif 116 #endif
116 #endif 117 #endif
117 } // namespace content 118 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_browsertest.cc ('k') | content/renderer/media/cdm/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698