[Android] Replace enum HDRTypes with Display.HdrCapabilities constants

[joseluismarti]

Description

Avoid using the value of the constants directly in the code.

Depends on xbmc/libandroidjni#48

Types of change

• Bug fix (non-breaking change which fixes an issue)
• Clean up (non-breaking change which removes non-working, unmaintained functionality)
• Improvement (non-breaking change which improves existing functionality)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that will cause existing functionality to change)
• Cosmetic change (non-breaking change that doesn't touch code)
• Student submission (PR was done for educational purposes and will be treated as such)
• None of the above (please explain below)

Checklist:

• My code follows the Code Guidelines of this project
• My change requires a change to the documentation, either Doxygen or wiki
• I have updated the documentation accordingly
• I have read the Contributing document
• I have added tests to cover my change
• All new and existing tests passed

[quietvoid]

Is the SDK version dependent on the device's Android? Or is it something set at compile time depending on the SDK used when building?

If it's dependent on the device, then I think this could break HDR10+ detection on some devices.

[joseluismarti]

The availability of methods and constants depend on the API level of the device.

HDR_TYPE_HDR10_PLUS constant was added at level 29.

[quietvoid]

The availability of methods and constants depend on the API level of the device.

HDR_TYPE_HDR10_PLUS constant was added at level 29.

Okay.
Here my Amazon FireTV Stick 4K Max says API level 28, yet it supports HDR10+.
I think then that the changes would make it not detect properly.

I should try testing on an actual HDR10+ display.

[joseluismarti]

Please check in that device in System info > Video the value of Display Supported HDR types

[quietvoid]

Alright, connected to a HDR10+ display, I don't think it showed HDR10+ (for some reason I don't remember exactly, maybe I should look again).
But the log says:

debug <general>: CAndroidUtils: Display supported HDR types: Unknown Unknown

On Alpha 3 build:

debug <general>: CAndroidUtils: Display supported HDR types: HDR10 HLG

So even the current code doesn't seem to detect HDR10+.
In the device settings, the video diagnostics do show HDR10+/HLG.

And on Dolby Vision display:

 debug <general>: CAndroidUtils: Display supported HDR types: Unknown Unknown Unknown

But the system info does show properly all of them: HDR10, Dolby Vision, HLG.
So clearly the logging is broken with the changes, at least.

[joseluismarti]

As expected, the getHdrCapabilities() method, both with the previous code and with this PR, does not return the HDR10+ type because it's a device with API level < 29.

This PR should not affect the detection of supported HDR types.

The Amazon FireTV Stick 4K Max device will have some codec tweaks to play HDR10+.

[quietvoid]

As expected, the getHdrCapabilities() method, both with the previous code and with this PR, does not return the HDR10+ type because it's a device with API level < 29.

FWIW I just wanted to confirm since FireOS doesn't always strictly adhere to the API.
For example in #23595, using the constant value as a fallback still works.

[joseluismarti]

I've checked with FireTV and Chromecast that this PR does not modify the behaviour and would be safe to merge

[quietvoid]

LGTM.

I'll revisit testing HDR10+ detection when I get the new 4K Max next week, since it'll be API level 30.

[fuzzard]

Have merged the libandroidjni. If you can update to that and squash/cleanup the extra commits thatd be great.