diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 983c799..69ad192 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> @@ -197,7 +197,7 @@ - + diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml index 4cd8de5..35bd857 100644 --- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 1369d85..86c59c0 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf index 6c37fe0..8889f42 100644 Binary files a/audio/oriole/tuning/bluenote/recording.gatf and b/audio/oriole/tuning/bluenote/recording.gatf differ diff --git a/audio/oriole/tuning/bluenote/template.xml b/audio/oriole/tuning/bluenote/template.xml index 8179e3d..0296d68 100644 --- a/audio/oriole/tuning/bluenote/template.xml +++ b/audio/oriole/tuning/bluenote/template.xml @@ -40,6 +40,9 @@ + + + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 983c799..69ad192 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> @@ -197,7 +197,7 @@ - + diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml index 4cd8de5..35bd857 100644 --- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 1369d85..86c59c0 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf index 6c37fe0..f1df4df 100644 Binary files a/audio/raven/tuning/bluenote/recording.gatf and b/audio/raven/tuning/bluenote/recording.gatf differ diff --git a/audio/raven/tuning/bluenote/template.xml b/audio/raven/tuning/bluenote/template.xml index 8179e3d..0296d68 100644 --- a/audio/raven/tuning/bluenote/template.xml +++ b/audio/raven/tuning/bluenote/template.xml @@ -40,6 +40,9 @@ + + + diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml index 983c799..69ad192 100644 --- a/audio/slider/config/audio_policy_configuration.xml +++ b/audio/slider/config/audio_policy_configuration.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> @@ -197,7 +197,7 @@ - + diff --git a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml index 4cd8de5..35bd857 100644 --- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 1369d85..86c59c0 100644 --- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,30 +34,30 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -80,12 +80,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml index 23f9ae0..14631de 100644 --- a/audio/whitefin/config/audio_policy_configuration.xml +++ b/audio/whitefin/config/audio_policy_configuration.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,25 +34,25 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -75,12 +75,12 @@ + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/> + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml index 547af60..2ff6672 100644 --- a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,25 +34,25 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -79,8 +79,8 @@ + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 3a87d2d..70153ac 100644 --- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -25,7 +25,7 @@ Speaker - + @@ -34,25 +34,25 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000 16000 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + - + @@ -79,8 +79,8 @@ + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" + channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc index c3e6976..9a78e5c 100644 --- a/conf/init.oriole.rc +++ b/conf/init.oriole.rc @@ -35,6 +35,9 @@ on fs # FIXME(b/183223359): Only grant write access to SystemUI. chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode +on property:ro.revision=PROTO1.0 + setprop persist.fingerprint.ghbm true + # Toggle glove_mode according to touch_sensitivity_mode on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 write /sys/class/spi_master/spi11/spi11.0/glove_mode 00 diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 7e49991..58a219e 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,9 @@ on init chown system system /d/regmap/6-0036/registers chown system system /sys/bus/nvmem/devices/5-00500/nvmem + # Power Stats HAL + chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats + on early-boot # Wait for insmod_sh to finish all common modules wait_for_prop vendor.common.modules.ready 1 @@ -35,6 +38,9 @@ on fs # FIXME(b/183223359): Only grant write access to SystemUI. chmod 0666 /sys/class/drm/card0/card0-DSI-1/panel/backlight/panel0-backlight/local_hbm_mode +on property:ro.revision=PROTO1.0 + setprop persist.fingerprint.ghbm true + on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd diff --git a/device-oriole.mk b/device-oriole.mk index 353bfac..6476916 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -70,22 +70,22 @@ PRODUCT_PRODUCT_PROPERTIES +=\ # Voice packs for Text-To-Speech PRODUCT_COPY_FILES += \ - device/google/raviole/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\ - device/google/raviole/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\ - device/google/raviole/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\ - device/google/raviole/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\ - device/google/raviole/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\ - device/google/raviole/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice + device/google/raviole/tts/ja-jp/ja-jp-x-htm-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jab-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jac-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jad-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r24.zvoice\ + device/google/raviole/tts/fr-fr/fr-fr-x-multi-r24.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r24.zvoice\ + device/google/raviole/tts/de-de/de-de-x-multi-r24.zvoice:product/tts/google/de-de/de-de-x-multi-r24.zvoice\ + device/google/raviole/tts/it-it/it-it-x-amb-r22.zvoice:product/tts/google/it-it/it-it-x-amb-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-ita-r22.zvoice:product/tts/google/it-it/it-it-x-ita-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-itb-r22.zvoice:product/tts/google/it-it/it-it-x-itb-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-itc-r22.zvoice:product/tts/google/it-it/it-it-x-itc-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-itd-r22.zvoice:product/tts/google/it-it/it-it-x-itd-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-kda-r22.zvoice:product/tts/google/it-it/it-it-x-kda-r22.zvoice\ + device/google/raviole/tts/es-es/es-es-x-ana-r23.zvoice:product/tts/google/es-es/es-es-x-ana-r23.zvoice\ + device/google/raviole/tts/es-es/es-es-x-multi-r23.zvoice:product/tts/google/es-es/es-es-x-multi-r23.zvoice # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/oriole diff --git a/device-raven.mk b/device-raven.mk index 4a40f7e..e9af790 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -71,22 +71,22 @@ PRODUCT_PRODUCT_PROPERTIES +=\ # Voice packs for Text-To-Speech PRODUCT_COPY_FILES += \ - device/google/raviole/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\ - device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\ - device/google/raviole/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\ - device/google/raviole/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\ - device/google/raviole/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\ - device/google/raviole/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\ - device/google/raviole/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\ - device/google/raviole/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice + device/google/raviole/tts/ja-jp/ja-jp-x-htm-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jab-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jac-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-jad-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r24.zvoice\ + device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r24.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r24.zvoice\ + device/google/raviole/tts/fr-fr/fr-fr-x-multi-r24.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r24.zvoice\ + device/google/raviole/tts/de-de/de-de-x-multi-r24.zvoice:product/tts/google/de-de/de-de-x-multi-r24.zvoice\ + device/google/raviole/tts/it-it/it-it-x-amb-r22.zvoice:product/tts/google/it-it/it-it-x-amb-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-ita-r22.zvoice:product/tts/google/it-it/it-it-x-ita-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-itb-r22.zvoice:product/tts/google/it-it/it-it-x-itb-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-itc-r22.zvoice:product/tts/google/it-it/it-it-x-itc-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-itd-r22.zvoice:product/tts/google/it-it/it-it-x-itd-r22.zvoice\ + device/google/raviole/tts/it-it/it-it-x-kda-r22.zvoice:product/tts/google/it-it/it-it-x-kda-r22.zvoice\ + device/google/raviole/tts/es-es/es-es-x-ana-r23.zvoice:product/tts/google/es-es/es-es-x-ana-r23.zvoice\ + device/google/raviole/tts/es-es/es-es-x-multi-r23.zvoice:product/tts/google/es-es/es-es-x-multi-r23.zvoice # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 diff --git a/powerstats/raven/service.cpp b/powerstats/raven/service.cpp index 8ccc616..f1322a9 100644 --- a/powerstats/raven/service.cpp +++ b/powerstats/raven/service.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "android.hardware.power.stats-service.pixel" #include +#include #include #include #include @@ -29,6 +30,7 @@ using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; +using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { @@ -66,6 +68,38 @@ void addDisplay(std::shared_ptr p) { {"HBM: 1440x3120@60", 8}})); } +void addUwb(std::shared_ptr p) { + // A constant to represent the number of nanoseconds in one millisecond. + const int NS_TO_MS = 1000000; + + // ACPM stats are reported in nanoseconds. The transform function + // converts nanoseconds to milliseconds. + std::function uwbNsToMs = [](uint64_t a) { return a / NS_TO_MS; }; + const GenericStateResidencyDataProvider::StateResidencyConfig stateConfig = { + .entryCountSupported = true, + .entryCountPrefix = "count:", + .totalTimeSupported = true, + .totalTimePrefix = "dur ns:", + .totalTimeTransform = uwbNsToMs, + .lastEntrySupported = false, + }; + + const std::vector> stateHeaders = { + std::make_pair("Off", "Off state:"), + std::make_pair("Run", "Run state:"), + std::make_pair("Idle", "Idle state:"), + std::make_pair("Tx", "Tx state:"), + std::make_pair("Rx", "Rx state:"), + }; + + std::vector cfgs; + cfgs.emplace_back(generateGenericStateResidencyConfigs(stateConfig, stateHeaders), + "UWB", ""); + + p->addStateResidencyDataProvider(std::make_unique( + "/sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats", cfgs)); +} + int main() { LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; @@ -76,6 +110,7 @@ int main() { addGs101CommonDataProviders(p); addDisplay(p); + addUwb(p); const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); diff --git a/tts/de-de/de-de-x-multi-r23.zvoice b/tts/de-de/de-de-x-multi-r24.zvoice similarity index 70% rename from tts/de-de/de-de-x-multi-r23.zvoice rename to tts/de-de/de-de-x-multi-r24.zvoice index 57dc1ec..44169eb 100644 Binary files a/tts/de-de/de-de-x-multi-r23.zvoice and b/tts/de-de/de-de-x-multi-r24.zvoice differ diff --git a/tts/es-es/es-es-x-ana-r22.zvoice b/tts/es-es/es-es-x-ana-r23.zvoice similarity index 76% rename from tts/es-es/es-es-x-ana-r22.zvoice rename to tts/es-es/es-es-x-ana-r23.zvoice index bcf4d30..d8d8dcc 100644 Binary files a/tts/es-es/es-es-x-ana-r22.zvoice and b/tts/es-es/es-es-x-ana-r23.zvoice differ diff --git a/tts/es-es/es-es-x-multi-r22.zvoice b/tts/es-es/es-es-x-multi-r23.zvoice similarity index 99% rename from tts/es-es/es-es-x-multi-r22.zvoice rename to tts/es-es/es-es-x-multi-r23.zvoice index 1ab7629..552c5a4 100644 Binary files a/tts/es-es/es-es-x-multi-r22.zvoice and b/tts/es-es/es-es-x-multi-r23.zvoice differ diff --git a/tts/fr-fr/fr-fr-x-multi-r23.zvoice b/tts/fr-fr/fr-fr-x-multi-r24.zvoice similarity index 64% rename from tts/fr-fr/fr-fr-x-multi-r23.zvoice rename to tts/fr-fr/fr-fr-x-multi-r24.zvoice index ac179b5..0c89087 100644 Binary files a/tts/fr-fr/fr-fr-x-multi-r23.zvoice and b/tts/fr-fr/fr-fr-x-multi-r24.zvoice differ diff --git a/tts/it-it/it-it-x-amb-r21.zvoice b/tts/it-it/it-it-x-amb-r21.zvoice deleted file mode 100644 index 3b761b2..0000000 Binary files a/tts/it-it/it-it-x-amb-r21.zvoice and /dev/null differ diff --git a/tts/it-it/it-it-x-amb-r22.zvoice b/tts/it-it/it-it-x-amb-r22.zvoice new file mode 100644 index 0000000..3b9ebe1 Binary files /dev/null and b/tts/it-it/it-it-x-amb-r22.zvoice differ diff --git a/tts/it-it/it-it-x-ita-r21.zvoice b/tts/it-it/it-it-x-ita-r21.zvoice deleted file mode 100644 index 780c938..0000000 Binary files a/tts/it-it/it-it-x-ita-r21.zvoice and /dev/null differ diff --git a/tts/it-it/it-it-x-ita-r22.zvoice b/tts/it-it/it-it-x-ita-r22.zvoice new file mode 100644 index 0000000..59a9215 Binary files /dev/null and b/tts/it-it/it-it-x-ita-r22.zvoice differ diff --git a/tts/it-it/it-it-x-itb-r21.zvoice b/tts/it-it/it-it-x-itb-r21.zvoice deleted file mode 100644 index 0e5b16b..0000000 Binary files a/tts/it-it/it-it-x-itb-r21.zvoice and /dev/null differ diff --git a/tts/it-it/it-it-x-itb-r22.zvoice b/tts/it-it/it-it-x-itb-r22.zvoice new file mode 100644 index 0000000..576677e Binary files /dev/null and b/tts/it-it/it-it-x-itb-r22.zvoice differ diff --git a/tts/it-it/it-it-x-itc-r21.zvoice b/tts/it-it/it-it-x-itc-r21.zvoice deleted file mode 100644 index 5f4cbcc..0000000 Binary files a/tts/it-it/it-it-x-itc-r21.zvoice and /dev/null differ diff --git a/tts/it-it/it-it-x-itc-r22.zvoice b/tts/it-it/it-it-x-itc-r22.zvoice new file mode 100644 index 0000000..6138452 Binary files /dev/null and b/tts/it-it/it-it-x-itc-r22.zvoice differ diff --git a/tts/it-it/it-it-x-itd-r21.zvoice b/tts/it-it/it-it-x-itd-r21.zvoice deleted file mode 100644 index c57cf3f..0000000 Binary files a/tts/it-it/it-it-x-itd-r21.zvoice and /dev/null differ diff --git a/tts/it-it/it-it-x-itd-r22.zvoice b/tts/it-it/it-it-x-itd-r22.zvoice new file mode 100644 index 0000000..3c2a55b Binary files /dev/null and b/tts/it-it/it-it-x-itd-r22.zvoice differ diff --git a/tts/it-it/it-it-x-kda-r21.zvoice b/tts/it-it/it-it-x-kda-r22.zvoice similarity index 55% rename from tts/it-it/it-it-x-kda-r21.zvoice rename to tts/it-it/it-it-x-kda-r22.zvoice index 6679970..f2f1ac6 100644 Binary files a/tts/it-it/it-it-x-kda-r21.zvoice and b/tts/it-it/it-it-x-kda-r22.zvoice differ diff --git a/tts/ja-jp/ja-jp-x-htm-r22.zvoice b/tts/ja-jp/ja-jp-x-htm-r24.zvoice similarity index 83% rename from tts/ja-jp/ja-jp-x-htm-r22.zvoice rename to tts/ja-jp/ja-jp-x-htm-r24.zvoice index 765ceab..ebfb91b 100644 Binary files a/tts/ja-jp/ja-jp-x-htm-r22.zvoice and b/tts/ja-jp/ja-jp-x-htm-r24.zvoice differ diff --git a/tts/ja-jp/ja-jp-x-jaa-r22.zvoice b/tts/ja-jp/ja-jp-x-jaa-r22.zvoice deleted file mode 100644 index 82b0e85..0000000 Binary files a/tts/ja-jp/ja-jp-x-jaa-r22.zvoice and /dev/null differ diff --git a/tts/ja-jp/ja-jp-x-jaa-r24.zvoice b/tts/ja-jp/ja-jp-x-jaa-r24.zvoice new file mode 100644 index 0000000..bf2accc Binary files /dev/null and b/tts/ja-jp/ja-jp-x-jaa-r24.zvoice differ diff --git a/tts/ja-jp/ja-jp-x-jab-r22.zvoice b/tts/ja-jp/ja-jp-x-jab-r24.zvoice similarity index 71% rename from tts/ja-jp/ja-jp-x-jab-r22.zvoice rename to tts/ja-jp/ja-jp-x-jab-r24.zvoice index 35f8e2e..9d1ed20 100644 Binary files a/tts/ja-jp/ja-jp-x-jab-r22.zvoice and b/tts/ja-jp/ja-jp-x-jab-r24.zvoice differ diff --git a/tts/ja-jp/ja-jp-x-jac-r22.zvoice b/tts/ja-jp/ja-jp-x-jac-r22.zvoice deleted file mode 100644 index b10f725..0000000 Binary files a/tts/ja-jp/ja-jp-x-jac-r22.zvoice and /dev/null differ diff --git a/tts/ja-jp/ja-jp-x-jac-r24.zvoice b/tts/ja-jp/ja-jp-x-jac-r24.zvoice new file mode 100644 index 0000000..e445157 Binary files /dev/null and b/tts/ja-jp/ja-jp-x-jac-r24.zvoice differ diff --git a/tts/ja-jp/ja-jp-x-jad-r22.zvoice b/tts/ja-jp/ja-jp-x-jad-r22.zvoice deleted file mode 100644 index 3cf1598..0000000 Binary files a/tts/ja-jp/ja-jp-x-jad-r22.zvoice and /dev/null differ diff --git a/tts/ja-jp/ja-jp-x-jad-r24.zvoice b/tts/ja-jp/ja-jp-x-jad-r24.zvoice new file mode 100644 index 0000000..be3be2a Binary files /dev/null and b/tts/ja-jp/ja-jp-x-jad-r24.zvoice differ diff --git a/tts/ja-jp/ja-jp-x-mfk-r22.zvoice b/tts/ja-jp/ja-jp-x-mfk-r22.zvoice deleted file mode 100644 index 3684110..0000000 Binary files a/tts/ja-jp/ja-jp-x-mfk-r22.zvoice and /dev/null differ diff --git a/tts/ja-jp/ja-jp-x-mfk-r24.zvoice b/tts/ja-jp/ja-jp-x-mfk-r24.zvoice new file mode 100644 index 0000000..e7dca7a Binary files /dev/null and b/tts/ja-jp/ja-jp-x-mfk-r24.zvoice differ