Audio assets at 48000 Hz

Bug: 7397767
Change-Id: If62c2219adf61f0c1b2115a83b7394d76829c028

CleanSpec.mk

@@ -137,6 +137,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing2_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ui/*.ogg)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

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 \

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
+