Misc fixes to allow HDR video profiles on ATV

Bug:internal b/68950223
Test:none

Change-Id: I200bb5cd32b7ae1962a0f6b07ef90916e2b3f352
Reviewed-on: https://chromium-review.googlesource.com/756371
Commit-Queue: Sandeep Vijayasekar <sandv@chromium.org>
Reviewed-by: Sergey Volk <servolk@chromium.org>
Reviewed-by: Fredrik Hubinette <hubbe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520794}

media/base/android/java/src/org/chromium/media/CodecProfileLevelList.java

@@ -117,8 +117,10 @@ class CodecProfileLevelList {
                     case CodecProfileLevel.VP9Profile1:
                         return VideoCodecProfile.VP9PROFILE_PROFILE1;
                     case CodecProfileLevel.VP9Profile2:
+                    case CodecProfileLevel.VP9Profile2HDR:
                         return VideoCodecProfile.VP9PROFILE_PROFILE2;
                     case CodecProfileLevel.VP9Profile3:
+                    case CodecProfileLevel.VP9Profile3HDR:
                         return VideoCodecProfile.VP9PROFILE_PROFILE3;
                     default:
                         throw new UnsupportedCodecProfileException();
@@ -128,9 +130,8 @@ class CodecProfileLevelList {
                     case CodecProfileLevel.HEVCProfileMain:
                         return VideoCodecProfile.HEVCPROFILE_MAIN;
                     case CodecProfileLevel.HEVCProfileMain10:
-                        return VideoCodecProfile.HEVCPROFILE_MAIN10;
                     case CodecProfileLevel.HEVCProfileMain10HDR10:
-                        return VideoCodecProfile.HEVCPROFILE_MAIN_STILL_PICTURE;
+                        return VideoCodecProfile.HEVCPROFILE_MAIN10;
                     default:
                         throw new UnsupportedCodecProfileException();
                 }

media/ffmpeg/ffmpeg_common.cc

@@ -502,6 +502,11 @@ bool AVStreamToVideoDecoderConfig(const AVStream* stream,
       format = PIXEL_FORMAT_I420;
       profile = AV1PROFILE_PROFILE0;
       break;
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+    case kCodecHEVC:
+      profile = HEVCPROFILE_MAIN;
+      break;
+#endif
     case kCodecTheora:
       profile = THEORAPROFILE_ANY;
       break;

media/filters/gpu_video_decoder.cc

@@ -207,7 +207,8 @@ void GpuVideoDecoder::Initialize(const VideoDecoderConfig& config,
   needs_all_picture_buffers_to_decode_ =
       capabilities.flags &
       VideoDecodeAccelerator::Capabilities::NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE;
-  needs_bitstream_conversion_ = (config.codec() == kCodecH264);
+  needs_bitstream_conversion_ =
+      (config.codec() == kCodecH264) || (config.codec() == kCodecHEVC);
   requires_texture_copy_ =
       !!(capabilities.flags &
          VideoDecodeAccelerator::Capabilities::REQUIRES_TEXTURE_COPY);