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

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

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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 | « content/browser/DEPS ('k') | content/browser/media/media_source_browsertest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/media/media_browsertest.h" 9 #include "content/browser/media/media_browsertest.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
11 #include "content/public/test/content_browser_test_utils.h" 11 #include "content/public/test/content_browser_test_utils.h"
12 #include "content/shell/browser/shell.h" 12 #include "content/shell/browser/shell.h"
13 #include "media/media_features.h"
13 14
14 #if defined(OS_ANDROID) 15 #if defined(OS_ANDROID)
15 #include "base/android/build_info.h" 16 #include "base/android/build_info.h"
16 #endif 17 #endif
17 18
18 const char kProbably[] = "probably"; 19 const char kProbably[] = "probably";
19 const char kMaybe[] = "maybe"; 20 const char kMaybe[] = "maybe";
20 const char kNot[] = ""; 21 const char kNot[] = "";
21 22
22 #if defined(USE_PROPRIETARY_CODECS) 23 #if defined(USE_PROPRIETARY_CODECS)
(...skipping 17 matching lines...) Expand all
40 const char kOggOpusProbably[] = ""; 41 const char kOggOpusProbably[] = "";
41 const char kMpeg2AacProbably[] = ""; 42 const char kMpeg2AacProbably[] = "";
42 #endif // !OS_ANDROID 43 #endif // !OS_ANDROID
43 44
44 #if defined(ENABLE_HEVC_DEMUXING) 45 #if defined(ENABLE_HEVC_DEMUXING)
45 const char* kHevcSupported = kPropProbably; 46 const char* kHevcSupported = kPropProbably;
46 #else 47 #else
47 const char* kHevcSupported = kNot; 48 const char* kHevcSupported = kNot;
48 #endif 49 #endif
49 50
50 #if defined(ENABLE_MPEG2TS_STREAM_PARSER) 51 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
51 const char* kMp2tsMaybe = kPropMaybe; 52 const char* kMp2tsMaybe = kPropMaybe;
52 const char* kMp2tsProbably = kPropProbably; 53 const char* kMp2tsProbably = kPropProbably;
53 #else 54 #else
54 const char* kMp2tsMaybe = kNot; 55 const char* kMp2tsMaybe = kNot;
55 const char* kMp2tsProbably = kNot; 56 const char* kMp2tsProbably = kNot;
56 #endif 57 #endif
57 58
58 namespace content { 59 namespace content {
59 60
60 class MediaCanPlayTypeTest : public MediaBrowserTest { 61 class MediaCanPlayTypeTest : public MediaBrowserTest {
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 EXPECT_EQ(kMp2tsProbably, 1266 EXPECT_EQ(kMp2tsProbably,
1266 CanPlay("'video/mp2t; codecs=\"avc1.100.40,mp4a.40.2\"'")); 1267 CanPlay("'video/mp2t; codecs=\"avc1.100.40,mp4a.40.2\"'"));
1267 } 1268 }
1268 1269
1269 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Mpeg2TsAudio) { 1270 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Mpeg2TsAudio) {
1270 // audio/mp2t is currently not supported (see also crbug.com/556837). 1271 // audio/mp2t is currently not supported (see also crbug.com/556837).
1271 EXPECT_EQ(kNot, CanPlay("'audio/mp2t; codecs=\"mp4a.40.2\"'")); 1272 EXPECT_EQ(kNot, CanPlay("'audio/mp2t; codecs=\"mp4a.40.2\"'"));
1272 } 1273 }
1273 1274
1274 } // namespace content 1275 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/media/media_source_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698