Remove workaound in webm_colour_parser.cc

b/338100595
youtube · May 21, 2024 · 97cadca · 97cadca
1 parent c2864b5
commit 97cadca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/media/BUILD.gn b/media/BUILD.gn
@@ -13,7 +13,10 @@
 # limitations under the License.
 
 config("media_config") {
-  include_dirs = [ "//third_party/abseil-cpp" ]
+  include_dirs = [
+    "//third_party/abseil-cpp",
+    "//third_party/libwebm/source",
+  ]
   if (is_win) {
     cflags = [
       "/wd4267",  # Conversion from 'size_t' to 'type', possible loss of data.
@@ -37,15 +40,17 @@ config("media_config_public") {
   # TODO: Make include_dirs other than the first one private.
   include_dirs = [
     "//third_party/abseil-cpp",
+    "//third_party/libwebm/source",
+    "//third_party/skia",
     "..",
     "cobalt",
-    "//third_party/skia",
   ]
 }
 
 config("external_config") {
   include_dirs = [
     "//third_party/abseil-cpp",
+    "//third_party/libwebm/source",
     "..",
     "cobalt",
     "../../skia",
@@ -263,4 +268,4 @@ target(gtest_target_type, "chromium_media_test") {
     "//testing/gmock",
     "//testing/gtest",
   ]
-}
+}
diff --git a/media/formats/webm/webm_colour_parser.cc b/media/formats/webm/webm_colour_parser.cc
@@ -7,27 +7,7 @@
 #include "base/check.h"
 #include "base/logging.h"
 #include "media/formats/webm/webm_constants.h"
-
-#if defined(STARBOARD)
-
-// Taken from mkvmuxer.h as is to avoid introducing the whole libwebm library.
-namespace mkvmuxer {
-
-class Colour {
- public:
-  enum Range {
-    kUnspecifiedCr = 0,
-    kBroadcastRange = 1,
-    kFullRange = 2,
-    kMcTcDefined = 3,  // Defined by MatrixCoefficients/TransferCharacteristics.
-  };
-};
-
-}  // namespace mkvmuxer
-
-#else // defined(STARBOARD)
 #include "third_party/libwebm/source/mkvmuxer/mkvmuxer.h"
-#endif // defined(STARBOARD)
 
 namespace media {