summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGil Dobjanschi <virgild@google.com>2010-11-17 16:20:34 -0800
committerGil Dobjanschi <virgild@google.com>2010-11-17 16:20:34 -0800
commit0f76d9b1c2d93a19b436dcbfef9fc46a2712d195 (patch)
treebe8e8f52670a5e2489e8a064cb03b2a415d40e49 /media
parent751073ac2d3d8971b7fd3d48b1c0a7ef34ad740c (diff)
downloadframeworks_base-0f76d9b1c2d93a19b436dcbfef9fc46a2712d195.zip
frameworks_base-0f76d9b1c2d93a19b436dcbfef9fc46a2712d195.tar.gz
frameworks_base-0f76d9b1c2d93a19b436dcbfef9fc46a2712d195.tar.bz2
Disable ducking by default. Changed ducking threshold parameter range.
Change-Id: I66a73b270466ced2ace9e3b10f82cfab1a1306bb
Diffstat (limited to 'media')
-rwxr-xr-xmedia/java/android/media/videoeditor/AudioTrack.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/media/java/android/media/videoeditor/AudioTrack.java b/media/java/android/media/videoeditor/AudioTrack.java
index d02709e..32ff553 100755
--- a/media/java/android/media/videoeditor/AudioTrack.java
+++ b/media/java/android/media/videoeditor/AudioTrack.java
@@ -102,7 +102,7 @@ public class AudioTrack {
// Ducking is enabled by default
mDuckingThreshold = 0;
mDuckedTrackVolume = 0;
- mIsDuckingEnabled = true;
+ mIsDuckingEnabled = false;
// The audio waveform file is generated later
mAudioWaveformFilename = null;
@@ -369,14 +369,15 @@ public class AudioTrack {
/**
* Enable ducking by specifying the required parameters
*
- * @param threshold Ducking will be activated when the relative energy in
+ * @param threshold Ducking will be activated when the energy in
* the media items audio signal goes above this value. The valid
- * range of values is 0 to 100.
+ * range of values is 0db to 90dB. 0dB is equivalent to disabling
+ * ducking.
* @param duckedTrackVolume The relative volume of the audio track when ducking
* is active. The valid range of values is 0 to 100.
*/
public void enableDucking(int threshold, int duckedTrackVolume) {
- if (threshold < 0 || threshold > 100) {
+ if (threshold < 0 || threshold > 90) {
throw new IllegalArgumentException("Invalid threshold value: " + threshold);
}