summaryrefslogtreecommitdiffstats
path: root/data/sounds
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-10-23 10:33:15 -0700
committerGlenn Kasten <gkasten@google.com>2012-10-23 16:34:21 -0700
commitee5668cf50dbd49f1ee25fd0a767d711eb5ab69d (patch)
tree844c3c0d69e315019324febab1ddca04fb006ad6 /data/sounds
parent16a5ad8345f2518947bbd47f072a02fd97dd1c67 (diff)
downloadframeworks_base-ee5668cf50dbd49f1ee25fd0a767d711eb5ab69d.zip
frameworks_base-ee5668cf50dbd49f1ee25fd0a767d711eb5ab69d.tar.gz
frameworks_base-ee5668cf50dbd49f1ee25fd0a767d711eb5ab69d.tar.bz2
Audio assets at 48000 Hz
Bug: 7397767 Change-Id: If62c2219adf61f0c1b2115a83b7394d76829c028
Diffstat (limited to 'data/sounds')
-rwxr-xr-xdata/sounds/AudioPackage10.mk14
-rw-r--r--data/sounds/README.txt33
-rw-r--r--data/sounds/effects/ogg/Effect_Tick_48k.oggbin0 -> 4077 bytes
-rw-r--r--data/sounds/effects/ogg/KeypressDelete_120_48k.oggbin0 -> 5832 bytes
-rw-r--r--data/sounds/effects/ogg/KeypressReturn_120_48k.oggbin0 -> 6246 bytes
-rw-r--r--data/sounds/effects/ogg/KeypressSpacebar_120_48k.oggbin0 -> 5952 bytes
-rw-r--r--data/sounds/effects/ogg/KeypressStandard_120_48k.oggbin0 -> 5837 bytes
7 files changed, 40 insertions, 7 deletions
diff --git a/data/sounds/AudioPackage10.mk b/data/sounds/AudioPackage10.mk
index cb55bba..a930a54 100755
--- a/data/sounds/AudioPackage10.mk
+++ b/data/sounds/AudioPackage10.mk
@@ -16,13 +16,13 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/alarms/ogg/Oxygen.ogg:system/media/audio/alarms/Oxygen.ogg \
$(LOCAL_PATH)/alarms/ogg/Osmium.ogg:system/media/audio/alarms/Osmium.ogg \
$(LOCAL_PATH)/alarms/ogg/Platinum.ogg:system/media/audio/alarms/Platinum.ogg \
- $(LOCAL_PATH)/effects/ogg/Effect_Tick.ogg:system/media/audio/ui/Effect_Tick.ogg \
- $(LOCAL_PATH)/effects/ogg/KeypressStandard_120.ogg:system/media/audio/ui/KeypressStandard.ogg \
- $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120.ogg:system/media/audio/ui/KeypressSpacebar.ogg \
- $(LOCAL_PATH)/effects/ogg/KeypressDelete_120.ogg:system/media/audio/ui/KeypressDelete.ogg \
- $(LOCAL_PATH)/effects/ogg/KeypressReturn_120.ogg:system/media/audio/ui/KeypressReturn.ogg \
- $(LOCAL_PATH)/effects/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
- $(LOCAL_PATH)/effects/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
+ $(LOCAL_PATH)/effects/ogg/Effect_Tick_48k.ogg:system/media/audio/ui/Effect_Tick.ogg \
+ $(LOCAL_PATH)/effects/ogg/KeypressStandard_120_48k.ogg:system/media/audio/ui/KeypressStandard.ogg \
+ $(LOCAL_PATH)/effects/ogg/KeypressSpacebar_120_48k.ogg:system/media/audio/ui/KeypressSpacebar.ogg \
+ $(LOCAL_PATH)/effects/ogg/KeypressDelete_120_48k.ogg:system/media/audio/ui/KeypressDelete.ogg \
+ $(LOCAL_PATH)/effects/ogg/KeypressReturn_120_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \
+ $(LOCAL_PATH)/effects/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
$(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \
diff --git a/data/sounds/README.txt b/data/sounds/README.txt
new file mode 100644
index 0000000..193fd71
--- /dev/null
+++ b/data/sounds/README.txt
@@ -0,0 +1,33 @@
+This README describes the audio assets, and how they relate to each other.
+
+The product .mk references one of the AudioPackage*.mk,
+which installs the appropriate assets into the destination directory.
+
+For UI sound effects,
+frameworks/base/media/java/android/media/AudioService.java array
+SOUND_EFFECT_FILES contains a hard-coded list of asset filenames, stored
+in directory SOUND_EFFECTS_PATH.
+
+Touch sounds
+------------
+
+effects/Effect_Tick.ogg
+ old, referenced by AudioPackage[2345].mk OriginalAudio.mk
+
+effects/ogg/Effect_Tick.ogg
+ new, referenced by AudioPackage[6789].mk AudioPackage7alt.mk AudioPackage10.mk
+
+effects/ogg/Effect_Tick_48k.ogg
+ oggdec -o temp.wav ogg/Effect_Tick.ogg
+ sox temp.wav -r 48000 temp48k.wav
+ oggenc -b 80 -o ogg/Effect_Tick_48k.ogg temp48k.wav
+
+effects/wav/Effect_Tick.wav
+ does not appear to be related to the other files in any obvious way
+
+Video recording
+---------------
+
+./effects/ogg/VideoStop_48k.ogg
+ unused
+
diff --git a/data/sounds/effects/ogg/Effect_Tick_48k.ogg b/data/sounds/effects/ogg/Effect_Tick_48k.ogg
new file mode 100644
index 0000000..e1f53d7
--- /dev/null
+++ b/data/sounds/effects/ogg/Effect_Tick_48k.ogg
Binary files differ
diff --git a/data/sounds/effects/ogg/KeypressDelete_120_48k.ogg b/data/sounds/effects/ogg/KeypressDelete_120_48k.ogg
new file mode 100644
index 0000000..e218215
--- /dev/null
+++ b/data/sounds/effects/ogg/KeypressDelete_120_48k.ogg
Binary files differ
diff --git a/data/sounds/effects/ogg/KeypressReturn_120_48k.ogg b/data/sounds/effects/ogg/KeypressReturn_120_48k.ogg
new file mode 100644
index 0000000..37a6d34
--- /dev/null
+++ b/data/sounds/effects/ogg/KeypressReturn_120_48k.ogg
Binary files differ
diff --git a/data/sounds/effects/ogg/KeypressSpacebar_120_48k.ogg b/data/sounds/effects/ogg/KeypressSpacebar_120_48k.ogg
new file mode 100644
index 0000000..69ee792
--- /dev/null
+++ b/data/sounds/effects/ogg/KeypressSpacebar_120_48k.ogg
Binary files differ
diff --git a/data/sounds/effects/ogg/KeypressStandard_120_48k.ogg b/data/sounds/effects/ogg/KeypressStandard_120_48k.ogg
new file mode 100644
index 0000000..1598c24
--- /dev/null
+++ b/data/sounds/effects/ogg/KeypressStandard_120_48k.ogg
Binary files differ