commit 98898bb887f57d0c4266f10e83bc41499b7532bd
author Tommy Steimel <steimel@chromium.org> Wed Jan 30 23:33:42 2019
committer Tommy Steimel <steimel@chromium.org> Wed Jan 30 23:33:42 2019
tree 9c5f17f05ec1ef0ea0c2d21f8cc23e7138981e3b
parent e7804de16a79ad3541dbbc89eacfcc97eafc00fc

[Media Intent Handler] Add video/3gpp to supported MIME types

This fixes an issue where Chrome will only download a video/3gpp file
instead of playing it when opened with Chrome.

Bug: 910658, 923081
Change-Id: I0fcdfe5952f0020c35fe09a0db85a4e83fe4d37a
Reviewed-on: https://chromium-review.googlesource.com/c/1437720
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#626310}(cherry picked from commit 3b0ab072e430639b63131f14fe3d9c3986b915aa)
Reviewed-on: https://chromium-review.googlesource.com/c/1447253
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/branch-heads/3683@{#78}
Cr-Branched-From: e51029943e0a38dd794b73caaf6373d5496ae783-refs/heads/master@{#625896}

media/base/mime_util_internal.cc

diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
index c546010f..021151f 100644
--- a/media/base/mime_util_internal.cc
+++ b/media/base/mime_util_internal.cc
@@ -352,6 +352,10 @@
   AddContainerWithCodecs("audio/x-m4a", aac);
   AddContainerWithCodecs("video/x-m4v", avc_and_aac);
 
+  CodecSet video_3gpp_codecs(aac);
+  video_3gpp_codecs.emplace(H264);
+  AddContainerWithCodecs("video/3gpp", video_3gpp_codecs);
+
 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
   CodecSet mp2t_codecs{H264, MPEG2_AAC, MPEG4_AAC, MP3};
   AddContainerWithCodecs("video/mp2t", mp2t_codecs);

media/base/mime_util_unittest.cc

diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc
index 8042010..630efa8 100644
--- a/media/base/mime_util_unittest.cc
+++ b/media/base/mime_util_unittest.cc
@@ -184,6 +184,7 @@
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/x-m4a"));
   EXPECT_TRUE(IsSupportedMediaMimeType("video/x-m4v"));
   EXPECT_TRUE(IsSupportedMediaMimeType("audio/aac"));
+  EXPECT_TRUE(IsSupportedMediaMimeType("video/3gpp"));
 
 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
   EXPECT_TRUE(IsSupportedMediaMimeType("video/mp2t"));
@@ -195,6 +196,7 @@
   EXPECT_FALSE(IsSupportedMediaMimeType("audio/x-m4a"));
   EXPECT_FALSE(IsSupportedMediaMimeType("video/x-m4v"));
   EXPECT_FALSE(IsSupportedMediaMimeType("audio/aac"));
+  EXPECT_FALSE(IsSupportedMediaMimeType("video/3gpp"));
 #endif  // USE_PROPRIETARY_CODECS
   EXPECT_FALSE(IsSupportedMediaMimeType("video/mp3"));