media: Move VideoCodecProfileToVideoCodec to video_codecs.h

Bug: None
Test: None
Change-Id: I679ee4f63d096c8d541853abad79ddc8c19617ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460406
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Auto-Submit: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816045}

media/base/video_codecs.cc

@@ -889,4 +889,46 @@ void ParseCodec(const std::string& codec_id,
   codec = kUnknownVideoCodec;
 }
 
+VideoCodec VideoCodecProfileToVideoCodec(VideoCodecProfile profile) {
+  switch (profile) {
+    case VIDEO_CODEC_PROFILE_UNKNOWN:
+      return kUnknownVideoCodec;
+    case H264PROFILE_BASELINE:
+    case H264PROFILE_MAIN:
+    case H264PROFILE_EXTENDED:
+    case H264PROFILE_HIGH:
+    case H264PROFILE_HIGH10PROFILE:
+    case H264PROFILE_HIGH422PROFILE:
+    case H264PROFILE_HIGH444PREDICTIVEPROFILE:
+    case H264PROFILE_SCALABLEBASELINE:
+    case H264PROFILE_SCALABLEHIGH:
+    case H264PROFILE_STEREOHIGH:
+    case H264PROFILE_MULTIVIEWHIGH:
+      return kCodecH264;
+    case HEVCPROFILE_MAIN:
+    case HEVCPROFILE_MAIN10:
+    case HEVCPROFILE_MAIN_STILL_PICTURE:
+      return kCodecHEVC;
+    case VP8PROFILE_ANY:
+      return kCodecVP8;
+    case VP9PROFILE_PROFILE0:
+    case VP9PROFILE_PROFILE1:
+    case VP9PROFILE_PROFILE2:
+    case VP9PROFILE_PROFILE3:
+      return kCodecVP9;
+    case DOLBYVISION_PROFILE0:
+    case DOLBYVISION_PROFILE4:
+    case DOLBYVISION_PROFILE5:
+    case DOLBYVISION_PROFILE7:
+    case DOLBYVISION_PROFILE8:
+    case DOLBYVISION_PROFILE9:
+      return kCodecDolbyVision;
+    case THEORAPROFILE_ANY:
+      return kCodecTheora;
+    case AV1PROFILE_PROFILE_MAIN:
+    case AV1PROFILE_PROFILE_HIGH:
+    case AV1PROFILE_PROFILE_PRO:
+      return kCodecAV1;
+  }
+}
 }  // namespace media

media/base/video_codecs.h

@@ -154,6 +154,9 @@ MEDIA_EXPORT void ParseCodec(const std::string& codec_id,
                              VideoColorSpace& color_space);
 MEDIA_EXPORT VideoCodec StringToVideoCodec(const std::string& codec_id);
 
+MEDIA_EXPORT VideoCodec
+VideoCodecProfileToVideoCodec(VideoCodecProfile profile);
+
 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
 // Translate legacy avc1 codec ids (like avc1.66.30 or avc1.77.31) into a new
 // style standard avc1 codec ids like avc1.4D002F. If the input codec is not

media/base/video_decoder_config.cc

@@ -24,51 +24,6 @@ static bool IsValidSize(const gfx::Size& size) {
          size.height() <= limits::kMaxDimension;
 }
 
-VideoCodec VideoCodecProfileToVideoCodec(VideoCodecProfile profile) {
-  switch (profile) {
-    case VIDEO_CODEC_PROFILE_UNKNOWN:
-      return kUnknownVideoCodec;
-    case H264PROFILE_BASELINE:
-    case H264PROFILE_MAIN:
-    case H264PROFILE_EXTENDED:
-    case H264PROFILE_HIGH:
-    case H264PROFILE_HIGH10PROFILE:
-    case H264PROFILE_HIGH422PROFILE:
-    case H264PROFILE_HIGH444PREDICTIVEPROFILE:
-    case H264PROFILE_SCALABLEBASELINE:
-    case H264PROFILE_SCALABLEHIGH:
-    case H264PROFILE_STEREOHIGH:
-    case H264PROFILE_MULTIVIEWHIGH:
-      return kCodecH264;
-    case HEVCPROFILE_MAIN:
-    case HEVCPROFILE_MAIN10:
-    case HEVCPROFILE_MAIN_STILL_PICTURE:
-      return kCodecHEVC;
-    case VP8PROFILE_ANY:
-      return kCodecVP8;
-    case VP9PROFILE_PROFILE0:
-    case VP9PROFILE_PROFILE1:
-    case VP9PROFILE_PROFILE2:
-    case VP9PROFILE_PROFILE3:
-      return kCodecVP9;
-    case DOLBYVISION_PROFILE0:
-    case DOLBYVISION_PROFILE4:
-    case DOLBYVISION_PROFILE5:
-    case DOLBYVISION_PROFILE7:
-    case DOLBYVISION_PROFILE8:
-    case DOLBYVISION_PROFILE9:
-      return kCodecDolbyVision;
-    case THEORAPROFILE_ANY:
-      return kCodecTheora;
-    case AV1PROFILE_PROFILE_MAIN:
-    case AV1PROFILE_PROFILE_HIGH:
-    case AV1PROFILE_PROFILE_PRO:
-      return kCodecAV1;
-  }
-  NOTREACHED();
-  return kUnknownVideoCodec;
-}
-
 VideoDecoderConfig::VideoDecoderConfig() = default;
 
 VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,

media/base/video_decoder_config.h

@@ -24,9 +24,6 @@
 
 namespace media {
 
-MEDIA_EXPORT VideoCodec
-VideoCodecProfileToVideoCodec(VideoCodecProfile profile);
-
 // Describes the content of a video stream, as described by the media container
 // (or otherwise determined by the demuxer).
 class MEDIA_EXPORT VideoDecoderConfig {

media/gpu/test/video_test_helpers.cc

@@ -15,7 +15,7 @@
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "media/base/format_utils.h"
-#include "media/base/video_decoder_config.h"
+#include "media/base/video_codecs.h"
 #include "media/base/video_frame_layout.h"
 #include "media/filters/vp9_parser.h"
 #include "media/gpu/test/video.h"

media/gpu/v4l2/v4l2_vda_helpers.cc

@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "media/base/color_plane_layout.h"
-#include "media/base/video_decoder_config.h"
+#include "media/base/video_codecs.h"
 #include "media/gpu/chromeos/fourcc.h"
 #include "media/gpu/macros.h"
 #include "media/gpu/v4l2/v4l2_device.h"

media/gpu/video_encode_accelerator_tests.cc

@@ -12,6 +12,7 @@
 #include "media/base/media_util.h"
 #include "media/base/test_data_util.h"
 #include "media/base/video_bitrate_allocation.h"
+#include "media/base/video_codecs.h"
 #include "media/base/video_decoder_config.h"
 #include "media/gpu/buildflags.h"
 #include "media/gpu/test/video.h"

media/video/video_encode_accelerator.h

@@ -19,7 +19,7 @@
 #include "media/base/bitstream_buffer.h"
 #include "media/base/media_export.h"
 #include "media/base/video_bitrate_allocation.h"
-#include "media/base/video_decoder_config.h"
+#include "media/base/video_codecs.h"
 #include "media/base/video_frame.h"
 #include "media/video/h264_parser.h"
 #include "media/video/video_encoder_info.h"