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

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

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added browser tests for AC3/EAC3 Created 5 years, 9 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 | « build/common.gypi ('k') | media/base/audio_decoder_config.h » ('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 "content/browser/media/media_browsertest.h" 7 #include "content/browser/media/media_browsertest.h"
8 #include "content/public/test/browser_test_utils.h" 8 #include "content/public/test/browser_test_utils.h"
9 #include "content/public/test/content_browser_test_utils.h" 9 #include "content/public/test/content_browser_test_utils.h"
10 #include "content/shell/browser/shell.h" 10 #include "content/shell/browser/shell.h"
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 EXPECT_EQ(maybeCanPlayHLS, 1034 EXPECT_EQ(maybeCanPlayHLS,
1035 CanPlay("'application/vnd.apple.mpegurl; " 1035 CanPlay("'application/vnd.apple.mpegurl; "
1036 "codecs=\"avc1.42E01E, mp4a.40\"'")); 1036 "codecs=\"avc1.42E01E, mp4a.40\"'"));
1037 EXPECT_EQ(maybeCanPlayHLS, 1037 EXPECT_EQ(maybeCanPlayHLS,
1038 CanPlay("'application/vnd.apple.mpegurl; " 1038 CanPlay("'application/vnd.apple.mpegurl; "
1039 "codecs=\"avc3.42E01E, mp4a.40\"'")); 1039 "codecs=\"avc3.42E01E, mp4a.40\"'"));
1040 1040
1041 TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl"); 1041 TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl");
1042 } 1042 }
1043 1043
1044 #if defined(ENABLE_AC3_EAC3_DEMUXING)
ddorwin 2015/02/27 01:44:13 We should always run the tests, but the expected r
servolk 2015/02/27 02:19:07 Done.
1045 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_ac3_eac3) {
1046 // AC3
1047 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"ac-3\"'"));
ddorwin 2015/02/27 01:44:13 Please also test invalid variants, such as: ac-2 a
servolk 2015/02/27 02:19:07 Ok, I've added a few variants, should be enough fo
1048 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.a5\"'"));
1049 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"ac-3\"'"));
1050 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.a5\"'"));
1051 // EAC3 aka DD+ aka Dolby Digital Plus
1052 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"ec-3\"'"));
1053 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.a6\"'"));
1054 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"ec-3\"'"));
1055 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.a6\"'"));
ddorwin 2015/02/27 01:44:13 There are many more test scenarios. For example, x
servolk 2015/02/27 02:19:07 What do you mean? I've basically taken one of the
ddorwin 2015/03/02 19:35:38 The tests are broken up by container, not codec. I
1056 }
1057 #endif
1058 }
1059
1044 } // namespace content 1060 } // namespace content
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | media/base/audio_decoder_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698