[Android] Ignore obsolete DOVI profiles from codec selection

When the AVDOVIDecoderConfigurationRecord is not valid, the fields are zeroed and profile is set to 1, which is incorrect. It should default to profile 0. Fixes xbmc#24171
heitbaum · Dec 28, 2023 · dd02ce8 · dd02ce8
1 parent 9e1f204
commit dd02ce8
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
@@ -540,26 +540,19 @@ bool CDVDVideoCodecAndroidMediaCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptio
             switch (m_hints.dovi.dv_profile)
             {
               case 0:
-                profile = CJNIMediaCodecInfoCodecProfileLevel::DolbyVisionProfileDvavPer;
-                break;
               case 1:
-                profile = CJNIMediaCodecInfoCodecProfileLevel::DolbyVisionProfileDvavPen;
-                break;
               case 2:
-                profile = CJNIMediaCodecInfoCodecProfileLevel::DolbyVisionProfileDvheDer;
-                break;
               case 3:
-                profile = CJNIMediaCodecInfoCodecProfileLevel::DolbyVisionProfileDvheDen;
+              case 6:
+                // obsolete profiles that are not supported in current applications.
+                // 0 is ignored in case the AVDOVIDecoderConfigurationRecord hint is unset.
                 break;
               case 4:
                 profile = CJNIMediaCodecInfoCodecProfileLevel::DolbyVisionProfileDvheDtr;
                 break;
               case 5:
                 profile = CJNIMediaCodecInfoCodecProfileLevel::DolbyVisionProfileDvheStn;
                 break;
-              case 6:
-                profile = CJNIMediaCodecInfoCodecProfileLevel::DolbyVisionProfileDvheDth;
-                break;
               case 7:
                 // set profile 8 when converting
                 if (convertDovi && CJNIBase::GetSDKVersion() >= 27)