aboutsummaryrefslogtreecommitdiff
path: root/en/devices/tech/display/hdr.html
diff options
context:
space:
mode:
authorClay Murphy <claym@google.com>2017-07-05 18:21:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-05 18:21:51 +0000
commit6890bab6d9343c1a47a7e83c4d0e012c5f3dd564 (patch)
tree75df30f7e981ff8ffb65a4e1a5f443c2fd5c5aa7 /en/devices/tech/display/hdr.html
parentf51ce4101185686a65dbe91027eec09c50b8c73e (diff)
parent3a7443d79d27dbe8faea6700c7ea11687a612dd5 (diff)
downloadsource.android.com-6890bab6d9343c1a47a7e83c4d0e012c5f3dd564.tar.gz
resolve merge conflicts of 4a5bcd6f to stage-aosp-master
am: 3a7443d79d Change-Id: I7b91055881cd04cff6b97402242e08d525f5a551
Diffstat (limited to 'en/devices/tech/display/hdr.html')
-rw-r--r--en/devices/tech/display/hdr.html19
1 files changed, 12 insertions, 7 deletions
diff --git a/en/devices/tech/display/hdr.html b/en/devices/tech/display/hdr.html
index f85ff1da..53e4ae8f 100644
--- a/en/devices/tech/display/hdr.html
+++ b/en/devices/tech/display/hdr.html
@@ -167,9 +167,9 @@ array if HDR is not supported by the display.</li>
<h3 id="decoder">Decoder</h3>
-<p>Applications shall use the existing
+<p>Applications shall use the existing
<a href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#profileLevels">
-<code>CodecCapabilities.profileLevels</code></a> API to verify support for the
+<code>CodecCapabilities.profileLevels</code></a> API to verify support for the
new HDR capable profiles:</p>
<h4>Dolby-Vision</h4>
@@ -385,10 +385,12 @@ that matches the display's color volume.</li>
<li>Determine the color, mastering, and potential dynamic metadata for the
blended scene.</li>
<li>Convert the resulting blended scene to the derived color
-space/volume.</ol></li>
+space/volume.</li>
+</ol>
+</li>
<li>If displaying directly to the display, convert the resulting blended
scene to the required display signals to produce that scene.
-</ol></li>
+</li>
</ol>
<h4>Display discovery</h4>
@@ -407,16 +409,19 @@ its HDR capability through HDMI EDID as defined in
<a href="https://standards.cta.tech/kwspub/published_docs/CTA-861.3-Preview.pdf">
CTA-861.3</a>
section 4.2.</li>
-<li>The following EOTF mapping shall be used:<ul>
+<li>The following EOTF mapping shall be used:
+<ul>
<li>ET_0 Traditional gamma - SDR Luminance Range: not mapped to any HDR
type</li>
<li>ET_1 Traditional gamma - HDR Luminance Range: not mapped to any HDR
type</li>
-<li>ET_2 SMPTE ST 2084 - mapped to HDR type HDR10</ul></li>
+<li>ET_2 SMPTE ST 2084 - mapped to HDR type HDR10</li>
+</ul>
+</li>
<li>The signaling of Dolby Vision or HLG support over HDMI is done as defined
by their relevant bodies.</li>
<li>Note that the HWC2 API uses float desired luminance values, so the 8-bit
-EDID values must be translated in a suitable fashion.</ul></li>
+EDID values must be translated in a suitable fashion.</li>
</ul>
<h3 id="decoders">Decoders</h3>