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

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

Issue 400023002: Fix canPlayType() support for non-RFC compliant mp3 mimetype. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | net/base/mime_util.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 "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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 CanPlay("'application/ogg; codecs=\"opus, vorbis\"'")); 338 CanPlay("'application/ogg; codecs=\"opus, vorbis\"'"));
339 339
340 TestOGGUnacceptableCombinations("application/ogg"); 340 TestOGGUnacceptableCombinations("application/ogg");
341 } 341 }
342 342
343 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) { 343 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) {
344 EXPECT_EQ(kNot, CanPlay("'video/mp3'")); 344 EXPECT_EQ(kNot, CanPlay("'video/mp3'"));
345 EXPECT_EQ(kNot, CanPlay("'video/mpeg'")); 345 EXPECT_EQ(kNot, CanPlay("'video/mpeg'"));
346 EXPECT_EQ(kNot, CanPlay("'video/x-mp3'")); 346 EXPECT_EQ(kNot, CanPlay("'video/x-mp3'"));
347 347
348 // audio/mpeg does not allow any codecs parameter 348 // audio/mpeg without a codecs parameter (RFC 3003 compliant)
349 EXPECT_EQ(kPropProbably, CanPlay("'audio/mpeg'")); 349 EXPECT_EQ(kPropProbably, CanPlay("'audio/mpeg'"));
350 350
351 // audio/mpeg with mp3 in codecs parameter. (Not RFC compliant, but
352 // very common in the wild so it is a defacto standard).
353 EXPECT_EQ(kPropProbably, CanPlay("'audio/mpeg; codecs=\"mp3\"'"));
354
351 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc1\"'")); 355 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc1\"'"));
352 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc3\"'")); 356 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc3\"'"));
353 357
354 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc1.4D401E\"'")); 358 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc1.4D401E\"'"));
355 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc3.64001F\"'")); 359 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"avc3.64001F\"'"));
356 360
357 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"mp4a\"'")); 361 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"mp4a\"'"));
358 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"mp4a.40.2\"'")); 362 EXPECT_EQ(kNot, CanPlay("'audio/mpeg; codecs=\"mp4a.40.2\"'"));
359 363
360 TestMPEGUnacceptableCombinations("audio/mpeg"); 364 TestMPEGUnacceptableCombinations("audio/mpeg");
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'")); 507 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'"));
504 EXPECT_EQ(canPlayHLS, 508 EXPECT_EQ(canPlayHLS,
505 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'")); 509 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'"));
506 EXPECT_EQ(canPlayHLS, 510 EXPECT_EQ(canPlayHLS,
507 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'")); 511 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'"));
508 512
509 TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl"); 513 TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl");
510 } 514 }
511 515
512 } // namespace content 516 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | net/base/mime_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698