fixes to audio doc
Change-Id: Ifc2d1aff4fb56a77d08e4f60faa53cd679a0c413
diff --git a/src/devices/audio.jd b/src/devices/audio.jd
index a160782..aaf8fd4 100644
--- a/src/devices/audio.jd
+++ b/src/devices/audio.jd
@@ -250,13 +250,27 @@
</ol>
<h2>Audio preprocessing effects</h2>
-<p>You can expose audio preprocessing effects to application developers through your
-audio HAL so they can take advantage of platform features. Preprocessing effects
-are always paired with the use case mode in which the preprocessing is requested. In Android
+The Android platform supports audio effects on supported devices in the audiofx package, which app developers have access to. Devices turn on effects by de
+<p>
+The Android platform supports audio effects on supported devices in the
+<a href="http://developer.android.com/reference/android/media/audiofx/package-summary.html">audiofx</a>
+package, which is available for developers to access. For example, on the Nexus 10, the following pre-processing effects are supported: </p>
+<ul>
+ <li><a href="http://developer.android.com/reference/android/media/AcousticEchoCanceller">Acoustic Echo
+ Cancellation</a></li>
+ <li><a href="http://developer.android.com/reference/android/media/AutomaticGainControl">Automatic Gain
+ Control</a></li>
+ <li><a href="http://developer.android.com/reference/android/media/NoiseSuppressor">Noise
+ Suppression</a></li>
+</ul>
+</p>
+
+
+<p>Pre-processing effects are always paired with the use case mode in which the pre-processing is requested. In Android
app development, a use case is referred to as an <code>AudioSource</code>, and app developers
request to use the <code>AudioSource</code> abstraction instead of the actual audio hardware device to use.
-The following list shows the different
-<code>AudioSource</code> options available that an app developer can choose.
+The Android Audio Policy Manager maps an <code>AudioSource</code> to the actual hardware with <code>AudioPolicyManagerBase::getDeviceForInputSource(int
+inputSource)</code>. In Android 4.2, the following sources are exposed to developers:
</p>
<ul>
<code><li>android.media.MediaRecorder.AudioSource.CAMCORDER</li></code>
@@ -269,26 +283,23 @@
<code><li>android.media.MediaRecorder.AudioSource.DEFAULT</li></code>
</ul>
-<p>The default preprocessing effects to be applied for each of the <code>AudioSource</code> is
+<p>The default pre-processing effects that are applied for each <code>AudioSource</code> is
specified in the <code>/system/etc/audio_effects.conf</code> file. To specify
-your own effects, create a <code>/system/vendor/etc/audio_effects.conf</code> file
-and specify any preprocessing effects that you need to turn on for every <code>AudioSource</code> type.
+your own default effects for every <code>AudioSource</code>, create a <code>/system/vendor/etc/audio_effects.conf</code> file
+and specify any pre-processing effects that you need to turn on. For an example,
+see the implementation for the Nexus 10 in <code>device/samsung/manta/audio_effects.conf</code>
-<p class="note"><strong>Note:</strong> Voice recognition does not have any preprocessing
-effects by default</p>
+<p class="warning"><strong>Warning:</strong> For the <code>VOICE_RECOGNITION</code> use case, do not enable
+the noise supression pre-processing effect. This effect is already turned off by default, but if you enable
+it in your own <code>audio_effects.conf</code> file, it is ignored by all of the
+Google Apps that use voice recognition..</p>
-The following example for Nexus 10 enables preprocessing for the VOIP <code>AudioSource</code> and Camcorder <code>AudioSource</code>.
+The following example enables pre-processing for the VOIP <code>AudioSource</code> and Camcorder <code>AudioSource</code>.
+If you turn these on, then the app developer does not need to explicilty request
+to use these effects when they are requesting the particular <code>AudioSource</code>.
</p>
<pre>
-effects {
- agc {
- library audience_pre_processing
- uuid e9e87eb0-0b55-11e2-892e-0800200c9a66
- }
- ...
-}
-
pre_processing {
voice_communication {
aec {}
@@ -301,28 +312,9 @@
</pre>
<h3>Source tuning</h3>
-<p>For source tuning, there are no explicit requirements on audio gain or audio processing
+<p>For <code>AudioSource</code> tuning, there are no explicit requirements on audio gain or audio processing
with the exception of voice recognition (<code>VOICE_RECOGNITION</code>).</p>
-<p>The Android Audio Policy Manager maps sources to devices with <code>AudioPolicyManagerBase::getDeviceForInputSource(int
-inputSource)</code>. In Android 4.2, the following sources are exposed to developers:
-</p>
-
-<pre>
-android.media.AcousticEchoCanceller
-android.media.AutomaticGainControl
-android.media.NoiseSuppressor
-</pre>
-
-<p>
-The audio preprocessing effects are developer facing APIs for platform effects that you
-can tune on a use case basis. For example, you can tune noise suppressor and wind noise suppressor for <code>CAMCORDER</code>
-or stationary noise suppressor for <code>VOICE_COMMUNICATION</code>.
-Similarly, you can tune Automatic Gain Control (<code>agc</code>) for close-talk for
-<code>VOICE_COMMUNICATION</code> and main phone mic for far-talk for <code>CAMCORDER</code>.
-</p>
-
-<h3>Voice recognition configuration and requirements</h3>
<p>The following are the requirements for voice recognition:</p>
<ul>
@@ -334,13 +326,29 @@
<li>Effects / pre-processing must be disabled by default</li>
</ul>
-<h3>Implementing audio preprocessing effects</h3>
+For other sources, you could tune sources with the following effects:
+
+<ul>
+ <li>Noise Supressor
+ <ul>
+ <li>Tunes for wind noise supressor for <code>CAMCORDER</code></li>
+ <li>Tuned for stationary noise supressor for <code>VOICE_COMMUNICATION</code></li>
+ </ul>
+ </li>
+ <li>Automatic Gain Control
+ <ul>
+ <li>Tuned for close-talk for <code>VOICE_COMMUNICATION</code> and main phone mic</li>
+ <li>Tuned for far-talk for <code>CAMCORDER</code></li>
+ </ul>
+ </li>
+</ul>
<h3>More information</h3>
<p>For more information, see:</p>
<ul>
-<li>Android Open Source Project documentation for
-<a href="http://developer.android.com/reference/android/media/audiofx/packagesummary.html">audio effects</a>.</li>
-<li>Android Open Source project documentation for <a href="http://developer.android.com/reference/android/media/audiofx/NoiseSuppressor.
-html">Noise Suppression audio effect</a></li>
+<li>Android documentation for <a href="http://developer.android.com/reference/android/media/audiofx/package-summary.html">audiofx
+package</a>
+
+<li>Android documentation for <a href="http://developer.android.com/reference/android/media/audiofx/NoiseSuppressor.html">Noise Suppression audio effect</a></li>
+<li><code>device/samsung/manta/audio_effects.conf</code> file for the Nexus 10</li>
</ul>
diff --git a/src/legal.jd b/src/legal.jd
new file mode 100644
index 0000000..652c303
--- /dev/null
+++ b/src/legal.jd
@@ -0,0 +1,79 @@
+fullpage=true
+landing.page=true
+page.metaDescription=Legal Notice for source.android.com
+header.hide=1
+@jd:body
+
+<!--
+ Copyright 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<div class="wrap">
+
+ <div class="landing-banner">
+ <h1 itemprop="name" style="margin-bottom:0;">Legal Notice</h1>
+
+ <p>Android is developed by Google Inc. and the <a
+ href="http://www.openhandsetalliance.com/">Open Handset Alliance</a>. We've made it available to you
+ as a development platform pursuant to our commitment to openness, freedom, and innovation in
+ mobile.</p>
+
+ </div>
+
+<h2 id="Brands">Android Brands</h2>
+
+<p>The "Android" name, the <img src="{@docRoot}assets/images/sac-logo.png" alt="Android"
+style="margin:0;padding:0 2px;vertical-align:baseline" /> logo, and
+<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google Inc.
+You may not use the logo or the logo's custom typeface.</p>
+
+<p>You may use the word "Android" in a product name only as a descriptor, such as "for Android"
+and the first instance should be followed by a TM symbol, "for Android™." In other
+messaging, the word "Android" may be used in text as a descriptor, as long as it is followed by a
+proper generic term (for example, "Android™ application"). Any use of the Android name
+must include footer attribution in your communications: "Android is a trademark of Google Inc."</p>
+
+<p>The Android Robot logo <img src="http://developer.android.com/images/robot-tiny.png" alt=""
+style="margin:0;padding:0;vertical-align:baseline" /> can be used, reproduced, and modified freely
+in marketing communications. Our standard color value for print is PMS 376C. Our online hex color is
+#A4C639. The Android Robot logo is licensed under the terms of the <a
+href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution</a> license and any
+use of it must be attributed as such.</p>
+
+<p>For more information about Android brands, see the <a
+href="http://developer.android.com/distribute/googleplay/promote/brand.html">Brand Guidelines</a>.</p>
+
+<p>All other trademarks are the property of their respective owners.</p>
+
+<h2 id="WebSite">Web Site Content</h2>
+
+<p>We are pleased to license the Android documentation and sample code on this web site under terms
+that encourage you to take, modify, reuse, re-purpose, and remix the content as you see fit. The
+documentation content on this web site is made available to you as part of the <a
+href="http://source.android.com">Android Open Source Project</a>. This documentation, including any
+code shown in it, is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+2.0 license</a>. All other content on this site, except the license documents themselves and as
+otherwise noted, is licensed under the <a
+href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5</a> license.
+</p>
+
+<p>For more information about licenses provided for the content of this web site and the
+restrictions for re-use, read the complete <a href="license.html">Content License</a>.</p>
+
+<p>Your use of this site is subject to <a href="http://www.google.com/policies/">Google's Privacy
+Policy & Terms of Service</a>.</p>
+
+
+<div>
\ No newline at end of file