aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-01-06 08:21:23 -0800
committerGlenn Kasten <gkasten@google.com>2011-01-06 08:42:35 -0800
commitca0d46d9ffb79e3353628ac1ada94b7c75c0cfa1 (patch)
tree4ce96112d9ffc41b78e144398c8b9478756658f9
parente9db711d8b5dd1c816c782afd0b30fb245250418 (diff)
downloadndk-ca0d46d9ffb79e3353628ac1ada94b7c75c0cfa1.tar.gz
Update native audio API levels and trademarks
Add clarification about future API levels. Add trademark symbols at first reference. Change-Id: Iac4437b6c78bfe36f0d2f9857d938afbb98f4894
-rw-r--r--docs/CHANGES.html2
-rw-r--r--docs/STABLE-APIS.html4
-rw-r--r--docs/opensles/index.html4
3 files changed, 7 insertions, 3 deletions
diff --git a/docs/CHANGES.html b/docs/CHANGES.html
index a5d9a4c36..62c6099d6 100644
--- a/docs/CHANGES.html
+++ b/docs/CHANGES.html
@@ -95,7 +95,7 @@ IMPORTANT CHANGES:
- Support for API level 9, (a.k.a. Android 2.3) which adds the following
native features to the platform:
- - Native audio API through the OpenSL ES Standard.
+ - Native audio API based on the Khronos Group OpenSL ES&#0153; 1.0.1 Standard.
New headers &lt;SLES/OpenSLES.h&gt; and &lt;SLES/OpenSLES_Android.h&gt;
are provided to allow applications targetting this API level to perform
audio input, output and processing directly from native code.
diff --git a/docs/STABLE-APIS.html b/docs/STABLE-APIS.html
index 80449fb14..9ccf9ef5e 100644
--- a/docs/STABLE-APIS.html
+++ b/docs/STABLE-APIS.html
@@ -284,6 +284,8 @@ on Android &gt; 2.2 system images and above.
The OpenSL ES native audio Library:
-----------------------------------
+Android native audio is based on Khronos Group OpenSL ES&#0153; 1.0.1.
+
The standard OpenSL ES headers &lt;SLES/OpenSLES.h&gt; and &lt;SLES/OpenSLES_Platform.h&gt;
contain the declarations needed to perform audio input and output from the
native side of Android.
@@ -349,4 +351,4 @@ All the corresponding functions are provided by the "libandroid.so" library
version that comes with API level 9. To use it, use the following:
LOCAL_LDLIBS += -landroid
-</pre></body></html> \ No newline at end of file
+</pre></body></html>
diff --git a/docs/opensles/index.html b/docs/opensles/index.html
index 20e357e1a..3ba399643 100644
--- a/docs/opensles/index.html
+++ b/docs/opensles/index.html
@@ -11,7 +11,7 @@
<h1>OpenSL ES for Android</h1>
This article describes the Android native audio APIs based on the
-Khronos Group OpenSL ES 1.0.1 standard, as of Android API level 9 (Android
+Khronos Group OpenSL ES&#0153; 1.0.1 standard, as of Android API level 9 (Android
version 2.3).
<p>
OpenSL ES provides a C language interface that is also callable from C++, and
@@ -603,6 +603,8 @@ above).
<code>Engine::IsExtensionSupported</code> report these extensions:
<ul>
<li><code>ANDROID_SDK_LEVEL_9</code>
+(platforms that support a higher API level will report an extension of
+<code>ANDROID_SDK_LEVEL_#</code> where # is that API level)
</ul>
<h2>Programming notes</h2>