From 79b3d184d36d88854c0fe526714226a87d855f7d Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Thu, 1 Mar 2018 12:27:19 -0800
Subject: [PATCH] Recognize m4s as a valid extension for mp4

Closes #331.

Change-Id: Ic4aaa02245b31a0aa4fdfe08212fa3b242cd9262
---
 packager/media/base/container_names.cc        | 46 ++++++-------------
 .../media/base/container_names_unittest.cc    |  2 +
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/packager/media/base/container_names.cc b/packager/media/base/container_names.cc
index b679756b86..2521bf2427 100644
--- a/packager/media/base/container_names.cc
+++ b/packager/media/base/container_names.cc
@@ -1730,49 +1730,33 @@ MediaContainerName DetermineContainerFromFormatName(
     return CONTAINER_WEBM;
   } else if (base::EqualsCaseInsensitiveASCII(format_name, "m4a") ||
              base::EqualsCaseInsensitiveASCII(format_name, "m4v") ||
+             base::EqualsCaseInsensitiveASCII(format_name, "m4s") ||
              base::EqualsCaseInsensitiveASCII(format_name, "mp4") ||
              base::EqualsCaseInsensitiveASCII(format_name, "mov")) {
     return CONTAINER_MOV;
   } else if (base::EqualsCaseInsensitiveASCII(format_name, "ts") ||
              base::EqualsCaseInsensitiveASCII(format_name, "mpeg2ts")) {
     return CONTAINER_MPEG2TS;
+  } else if (base::EqualsCaseInsensitiveASCII(format_name, "wvm")) {
+    return CONTAINER_WVM;
+  } else if (base::EqualsCaseInsensitiveASCII(format_name, "vtt") ||
+             base::EqualsCaseInsensitiveASCII(format_name, "webvtt")) {
+    return CONTAINER_WEBVTT;
+  } else if (base::EqualsCaseInsensitiveASCII(format_name, "ttml") ||
+             // Treat xml as ttml.
+             base::EqualsCaseInsensitiveASCII(format_name, "xml")) {
+    return CONTAINER_TTML;
   }
   return CONTAINER_UNKNOWN;
 }
 
 MediaContainerName DetermineContainerFromFileName(
     const std::string& file_name) {
-  if (base::EndsWith(file_name, ".webm",
-                     base::CompareCase::INSENSITIVE_ASCII)) {
-    return CONTAINER_WEBM;
-  } else if (base::EndsWith(file_name, ".mp4",
-                            base::CompareCase::INSENSITIVE_ASCII) ||
-             base::EndsWith(file_name, ".m4a",
-                            base::CompareCase::INSENSITIVE_ASCII) ||
-             base::EndsWith(file_name, ".m4v",
-                            base::CompareCase::INSENSITIVE_ASCII)) {
-    return CONTAINER_MOV;
-  } else if (base::EndsWith(file_name, ".ts",
-                            base::CompareCase::INSENSITIVE_ASCII)) {
-    return CONTAINER_MPEG2TS;
-  } else if (base::EndsWith(file_name, ".wvm",
-                            base::CompareCase::INSENSITIVE_ASCII)) {
-    return CONTAINER_WVM;
-  } else if (base::EndsWith(file_name, ".vtt",
-                            base::CompareCase::INSENSITIVE_ASCII)) {
-    return CONTAINER_WEBVTT;
-  } else if (base::EndsWith(file_name, ".webvtt",
-                            base::CompareCase::INSENSITIVE_ASCII)) {
-    return CONTAINER_WEBVTT;
-  } else if (base::EndsWith(file_name, ".ttml",
-                            base::CompareCase::INSENSITIVE_ASCII)) {
-    return CONTAINER_TTML;
-  } else if (base::EndsWith(file_name, ".xml",
-                            base::CompareCase::INSENSITIVE_ASCII)) {
-    // In our supported containers, only ttml is in xml format.
-    return CONTAINER_TTML;
-  }
-  return CONTAINER_UNKNOWN;
+  const size_t pos = file_name.rfind('.');
+  if (pos == std::string::npos)
+    return CONTAINER_UNKNOWN;
+  const std::string& file_extension = file_name.substr(pos + 1);
+  return DetermineContainerFromFormatName(file_extension);
 }
 
 }  // namespace media
diff --git a/packager/media/base/container_names_unittest.cc b/packager/media/base/container_names_unittest.cc
index dc0e2d01e3..f4d065fda5 100644
--- a/packager/media/base/container_names_unittest.cc
+++ b/packager/media/base/container_names_unittest.cc
@@ -88,6 +88,7 @@ TEST(ContainerNamesTest, FromFormatName) {
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFormatName("m4a"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFormatName("m4v"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFormatName("M4v"));
+  EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFormatName("m4s"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFormatName("mov"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFormatName("mp4"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFormatName("Mp4"));
@@ -105,6 +106,7 @@ TEST(ContainerNamesTest, FromFileName) {
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFileName("test.m4a"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFileName("file.m4v"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFileName("a file .m4V"));
+  EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFileName("segment.m4s"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFileName("2_more-files.mp4"));
   EXPECT_EQ(CONTAINER_MOV, DetermineContainerFromFileName("foo.bar.MP4"));
   EXPECT_EQ(CONTAINER_MPEG2TS, DetermineContainerFromFileName("a.ts"));