aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2019-08-29 14:33:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-29 14:33:49 +0000
commit2ddd7ab9c6d4026685f11b38660622083be4a774 (patch)
tree7285657834c04f530ba3fb3dfdf486b815da3b64
parent7e7bc045a7b3712c0648eeb502bd51a4cd709488 (diff)
parentf858162c3918f68464ef12c352212f75d2c79cbd (diff)
downloadplatform_compatibility_cdd-2ddd7ab9c6d4026685f11b38660622083be4a774.tar.gz
platform_compatibility_cdd-2ddd7ab9c6d4026685f11b38660622083be4a774.tar.bz2
platform_compatibility_cdd-2ddd7ab9c6d4026685f11b38660622083be4a774.zip
Merge "Docs: Remove whitespace at end of line" into qt-dev
-rw-r--r--2_device-types/2_3_television-reqs.md14
-rw-r--r--7_hardware-compatibility/7_9_virtual-reality.md2
2 files changed, 8 insertions, 8 deletions
diff --git a/2_device-types/2_3_television-reqs.md b/2_device-types/2_3_television-reqs.md
index 83702104..77d2382c 100644
--- a/2_device-types/2_3_television-reqs.md
+++ b/2_device-types/2_3_television-reqs.md
@@ -98,7 +98,7 @@ and decoding formats and make them available to third-party applications:
Television device implementations MUST support the following video encoding
formats and make them available to third-party applications:
-* [[5.2](#5_2_video_encoding)/T-0-1] H.264
+* [[5.2](#5_2_video_encoding)/T-0-1] H.264
* [[5.2](#5_2_video_encoding)/T-0-2] VP8
Television device implementations:
@@ -179,25 +179,25 @@ Volume and digital audio output volume attenuation on supported outputs,
except for compressed audio passthrough output (where no audio decoding is done
on the device).
-Television device implementaitons which do not have a built in display,
-but instead support an external display connected via HDMI; they:
+Television device implementations which do not have a built in display,
+but instead support an external display connected via HDMI; they:
* [[5.8](#5_8_secure_media)/T-0-1] MUST set the HDMI output mode to
select the maximum resolution that can be supported with either a 50Hz or 60Hz
-refresh rate.
+refresh rate.
* [[5.8](#5_8_secure_media)/T-SR] Are STRONGLY RECOMMENDED to provide a user
configurable HDMI refresh rate selector.
* [[5.8](#5_8_secure_media)] SHOULD set the HDMI output mode refresh rate
to either 50Hz or 60Hz, depending on the video refresh rate for the region the
-device is sold in.
+device is sold in.
-If Television device implementations who do not have a built in display,
+If Television device implementations who do not have a built in display,
but instead support an external display connected via HDMI; they:
* [[5.8](#5_8_secure_media)/T-1-1] MUST support HDCP 2.2.
If Television device implementations which do not support UHD decoding but have
-but instead support an external display connected via HDMI; they:
+but instead support an external display connected via HDMI; they:
* [[5.8](#5_8_secure_media)/T-2-1] MUST support HDCP 1.4
diff --git a/7_hardware-compatibility/7_9_virtual-reality.md b/7_hardware-compatibility/7_9_virtual-reality.md
index 0704d10a..ccc9a758 100644
--- a/7_hardware-compatibility/7_9_virtual-reality.md
+++ b/7_hardware-compatibility/7_9_virtual-reality.md
@@ -73,7 +73,7 @@ If device implementations support VR mode, they:
* [C-SR] Are STRONGLY RECOMMENDED to support the allocation of `AHardwareBuffer`s
with more than one layer and flags and formats specified in C-1-10.
* [C-1-11] MUST support H.264 decoding at least 3840 x 2160 at 30fps,
- compressed to an average of 40Mbps (equivalent to 4 instances of
+ compressed to an average of 40Mbps (equivalent to 4 instances of
1920 x1080 at 30 fps-10 Mbps or 2 instances of 1920 x 1080 at 60 fps-20 Mbps).
* [C-1-12] MUST support HEVC and VP9, MUST be capable of decoding at least
1920 x 1080 at 30 fps compressed to an average of 10 Mbps and SHOULD be