Promotion of audio-userspace.lnx.3.0-00016.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
2032490 Icc27d5319ac3273c34f1c32d8fcbbd4b57255fda visualizer: update PCM device id for sdm660 target
2041046 I4953c8bddbe839479e5ece16223097b989838908 hal: Add support to send playback events to sound trigge
2014832 I8df3703dc84f7f277258b036bd6df87946af6efb hal: audio-test: Move omx tests mm-audio-internal
1074929 I6d4135eeb550796148f0fd159a4724f2fc302358 hal: Add support for channel map in asm
2014366 Ieed8bf7421536f9ec398ea4ad7b316db11fda413 hal: fix voice call mute during video recording
2035597 I8914323d6fb20498a96a0a6fe6fa5b5adbd5906b hal: avoid using voip sound device with different backen
2028627 I57657cbfe6f50d8bfe6591f598364cec6299d89d qahw: test: fix qact issue during pcm playback
2037414 Icd1e6a84d295245b44de971af7b3025ce117b042 qahw: test: Fix variable overflow issue
2015526 I841307442e2e8a2229d6a861838e9334c2fd8e8e hal: configs: Modify deprecated perf lock values
2014040 I053faff32661f5e2db6f0e3b5ac190aeb3d83d24 configs: sdm660: add default mixer controls
2041046 I89a42780be677a42d20d8738f51e80e453fab199 configs: Add flag to support playback transitions.
2033673 I9d46525234af742772a1cc0e70d3baeedda57698 hal: Fix memory leakage in audio HAL
1098974 I9fbf249707b4e4abf0708937d423e5fc41eeb9d5 hal: unload the modem image based on IS_ONLINE event
2036640 I1601857fef41a9b8665eeaf136be838036ba623e hal: On external display disconnect reset backend mixers
2010556 I1b937020793c7c0909e4e5265afc62224fde97e7 configs: Add Speaker mixer controls for RAS test device
1037562 If277223b70b952243f6634ac4285f425fa736c9c hal: add support for 8909 QSIP SKUQ
2037698 I4bcd8f1862b008623dfff0636a39351aa59f27d1 configs: Add hotword support to platform xml
2038355 Iac5b5ffb7c71dfeabd29bff9978dfc62f69ec7db visualizer: fix warnings due to uninitialized return val
2035512 Ie8be5d6d9de65249122de497d8689ad4c78698e5 hal: Update active input stream when voip input is close
2018775 Ibb72d31ff7cc373a8d301efb5c7b52596a15e3ed audio: usb: add support for additional sample rate
2028982 I91bd8060660efa0ab163c70112eae59b9a594377 hal: Use cached value of bt encoder format for encoder l
2021778 I5e5452de3886f19a7f5b3d0482080f0cb188708a hal: Add support for fluence in HFP call
1072628 I74c07de91d4eae5312b9ef609d218bdf45d61dc5 audio: add parameter for device shutdown notification
2008883 If9e25693e44589a0a2f6d15f8b352801afcfbb37 hal: Fix no audio during voice call with concurrent comb
1074931 I2209307e01abd49b7639b760f91e2f436d21035f hal: Add ACDB support for 8x09 tasha lite
2019861 I01dbc585013e4943257873bc8650397c92de4842 hal: Derive snd_device properly while sending app_type_c
2022539 I436c6d5a1d83ed76bf948223ffdbeea586ffe92f config: sdm660: update playback path entry for handset
2013749 Ic3c5d46b5de4f9b914a9fc880726d7658ce3ca8b hal: send audio calibration for VI capture path
2022593 Ibfcad0446ca2dd12f4167aa4ae91ea8e0cfc8e61 hal: Avoid derive playback snd device for capture usecas
2008883 Id6ee9b61352274df02081563430a858246a6d2f1 sdm660: Add hw interface entries for voice combo devices
2010556 I020aacd48d06adfb041f43bd25dcb35b269ed46f configs: sdm660: Add Speaker mixer controls for RAS tes
2019871 Ib4a63abc1ad2c41ee53c434b4cccb16c415899ea hal: Add API to set & get audio calibration
2013236 I0e1f75ea307088b92e87b99f8b614afbcd0f1c82 aenc-aac: bounds checking
2029050 I470cd40da1a73b9daf05f133a6669d4db2e82a64 configs: Support Dual MIC fluence for ADSP SVA
853275 I8e267dd0533f0dcfb8227e5a43dfe51d886e98cb hal: add support for 8909 TMO
Change-Id: I72b4da882c19ee8d8d99333697f998c4f7478682
CRs-Fixed: 2035597, 1074931, 2041046, 2014040, 2013236, 2036640, 2019871, 2015526, 2018775, 2037414, 2035512, 2037698, 2038355, 2022539, 1037562, 1072628, 2033673, 1074929, 2013749, 2022593, 2028627, 2008883, 1098974, 2032490, 2028982, 2029050, 2019861, 2014366, 2021778, 2014832, 853275, 2010556
diff --git a/configs/msm8937/aanc_tuning_mixer.txt b/configs/msm8937/audio_tuning_mixer.txt
similarity index 100%
rename from configs/msm8937/aanc_tuning_mixer.txt
rename to configs/msm8937/audio_tuning_mixer.txt
diff --git a/configs/msm8937/msm8937.mk b/configs/msm8937/msm8937.mk
index 6204998..d2aab65 100644
--- a/configs/msm8937/msm8937.mk
+++ b/configs/msm8937/msm8937.mk
@@ -93,7 +93,7 @@
hardware/qcom/audio/configs/msm8937/mixer_paths_qrd_sku2.xml:system/etc/mixer_paths_qrd_sku2.xml \
hardware/qcom/audio/configs/msm8937/audio_platform_info.xml:system/etc/audio_platform_info.xml \
hardware/qcom/audio/configs/msm8937/audio_platform_info_extcodec.xml:system/etc/audio_platform_info_extcodec.xml \
-hardware/qcom/audio/configs/msm8937/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt
+hardware/qcom/audio/configs/msm8937/audio_tuning_mixer.txt:system/etc/audio_tuning_mixer.txt
#XML Audio configuration files
ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
diff --git a/configs/msm8953/aanc_tuning_mixer.txt b/configs/msm8953/audio_tuning_mixer.txt
similarity index 100%
rename from configs/msm8953/aanc_tuning_mixer.txt
rename to configs/msm8953/audio_tuning_mixer.txt
diff --git a/configs/msm8953/msm8953.mk b/configs/msm8953/msm8953.mk
index 42bead6..cd1b62e 100644
--- a/configs/msm8953/msm8953.mk
+++ b/configs/msm8953/msm8953.mk
@@ -92,7 +92,7 @@
hardware/qcom/audio/configs/msm8953/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \
hardware/qcom/audio/configs/msm8953/audio_platform_info.xml:system/etc/audio_platform_info.xml \
hardware/qcom/audio/configs/msm8953/audio_platform_info_extcodec.xml:system/etc/audio_platform_info_extcodec.xml \
-hardware/qcom/audio/configs/msm8953/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt
+hardware/qcom/audio/configs/msm8953/audio_tuning_mixer.txt:system/etc/audio_tuning_mixer.txt
#XML Audio configuration files
ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
diff --git a/configs/msm8996/aanc_tuning_mixer.txt b/configs/msm8996/audio_tuning_mixer.txt
similarity index 100%
rename from configs/msm8996/aanc_tuning_mixer.txt
rename to configs/msm8996/audio_tuning_mixer.txt
diff --git a/configs/msm8996/msm8996.mk b/configs/msm8996/msm8996.mk
index 68b13d4..7591168 100644
--- a/configs/msm8996/msm8996.mk
+++ b/configs/msm8996/msm8996.mk
@@ -75,7 +75,7 @@
hardware/qcom/audio/configs/msm8996/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \
hardware/qcom/audio/configs/msm8996/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
hardware/qcom/audio/configs/msm8996/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
- hardware/qcom/audio/configs/msm8996/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
+ hardware/qcom/audio/configs/msm8996/audio_tuning_mixer.txt:system/etc/audio_tuning_mixer.txt \
hardware/qcom/audio/configs/msm8996/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
hardware/qcom/audio/configs/msm8996/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \
hardware/qcom/audio/configs/msm8996/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \
diff --git a/configs/msm8998/audio_platform_info.xml b/configs/msm8998/audio_platform_info.xml
index d6ac0d5..56ac9bb 100644
--- a/configs/msm8998/audio_platform_info.xml
+++ b/configs/msm8998/audio_platform_info.xml
@@ -74,7 +74,7 @@
<param key="mono_speaker" value="right"/>
<!-- In the below value string, first parameter indicates size -->
<!-- followed by perf lock options -->
- <param key="perf_lock_opts" value="4, 0x101, 0x704, 0x20F, 0x1E01"/>
+ <param key="perf_lock_opts" value="4, 0x40400000, 0x1, 0x40C00000, 0x1"/>
<param key="native_audio_mode" value="src"/>
<param key="input_mic_max_count" value="4"/>
<param key="true_32_bit" value="true"/>
diff --git a/configs/msm8998/aanc_tuning_mixer.txt b/configs/msm8998/audio_tuning_mixer.txt
similarity index 77%
rename from configs/msm8998/aanc_tuning_mixer.txt
rename to configs/msm8998/audio_tuning_mixer.txt
index 5639bd2..5f46bc7 100644
--- a/configs/msm8998/aanc_tuning_mixer.txt
+++ b/configs/msm8998/audio_tuning_mixer.txt
@@ -149,3 +149,43 @@
SLIM RX0 MUX:ZERO
RX INT7_1 MIX1 INP0:ZERO
ANC Function:OFF
+
+#RAS_TEST_SPKR_PHONE_SPKR_STEREO
+acdb_dev_id:136
+!Playback
+Rxdevice:0
+
+enable
+SLIM RX0 MUX:AIF_MIX1_PB
+SLIM RX1 MUX:AIF_MIX1_PB
+SLIM_0_RX Channels:Two
+RX INT7_1 MIX1 INP0:RX0
+RX INT8_1 MIX1 INP0:RX1
+COMP7 Switch:1
+COMP8 Switch:1
+SpkrLeft COMP Switch:1
+SpkrRight COMP Switch:1
+SpkrLeft BOOST Switch:1
+SpkrRight BOOST Switch:1
+SpkrLeft VISENSE Switch:1
+SpkrRight VISENSE Switch:1
+SpkrLeft SWR DAC_Port Switch:1
+SpkrRight SWR DAC_Port Switch:1
+SLIMBUS_0_RX Audio Mixer MultiMedia1:1
+
+disable
+SLIM RX0 MUX:ZERO
+SLIM RX1 MUX:ZERO
+RX INT7_1 MIX1 INP0:ZERO
+RX INT8_1 MIX1 INP0:ZERO
+COMP7 Switch:0
+COMP8 Switch:0
+SpkrLeft COMP Switch:0
+SpkrRight COMP Switch:0
+SpkrLeft BOOST Switch:0
+SpkrRight BOOST Switch:0
+SpkrLeft VISENSE Switch:0
+SpkrRight VISENSE Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+SpkrRight SWR DAC_Port Switch:0
+SLIMBUS_0_RX Audio Mixer MultiMedia1:0
diff --git a/configs/msm8998/aanc_tuning_mixer_tavil.txt b/configs/msm8998/audio_tuning_mixer_tavil.txt
similarity index 76%
rename from configs/msm8998/aanc_tuning_mixer_tavil.txt
rename to configs/msm8998/audio_tuning_mixer_tavil.txt
index 78156d3..6c1c864 100644
--- a/configs/msm8998/aanc_tuning_mixer_tavil.txt
+++ b/configs/msm8998/audio_tuning_mixer_tavil.txt
@@ -149,3 +149,45 @@
SLIM RX0 MUX:ZERO
RX INT7_1 MIX1 INP0:ZERO
ANC Function:OFF
+
+#RAS_TEST_SPKR_PHONE_SPKR_STEREO
+acdb_dev_id:136
+!Playback
+Rxdevice:0
+
+enable
+SLIM RX0 MUX:AIF1_PB
+SLIM RX1 MUX:AIF1_PB
+CDC_IF RX0 MUX:SLIM RX0
+CDC_IF RX1 MUX:SLIM RX1
+SLIM_0_RX Channels:Two
+RX INT7_1 MIX1 INP0:RX0
+RX INT8_1 MIX1 INP0:RX1
+COMP7 Switch:1
+COMP8 Switch:1
+SpkrLeft COMP Switch:1
+SpkrRight COMP Switch:1
+SpkrLeft BOOST Switch:1
+SpkrRight BOOST Switch:1
+SpkrLeft VISENSE Switch:1
+SpkrRight VISENSE Switch:1
+SpkrLeft SWR DAC_Port Switch:1
+SpkrRight SWR DAC_Port Switch:1
+SLIMBUS_0_RX Audio Mixer MultiMedia1:1
+
+disable
+SLIM RX0 MUX:ZERO
+SLIM RX1 MUX:ZERO
+RX INT7_1 MIX1 INP0:ZERO
+RX INT8_1 MIX1 INP0:ZERO
+COMP7 Switch:0
+COMP8 Switch:0
+SpkrLeft COMP Switch:0
+SpkrRight COMP Switch:0
+SpkrLeft BOOST Switch:0
+SpkrRight BOOST Switch:0
+SpkrLeft VISENSE Switch:0
+SpkrRight VISENSE Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+SpkrRight SWR DAC_Port Switch:0
+SLIMBUS_0_RX Audio Mixer MultiMedia1:0
diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index 07a4bff..90dfc0f 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -86,8 +86,8 @@
hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:system/etc/mixer_paths_qvr.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
- hardware/qcom/audio/configs/msm8998/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
- hardware/qcom/audio/configs/msm8998/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \
+ hardware/qcom/audio/configs/msm8998/audio_tuning_mixer.txt:system/etc/audio_tuning_mixer.txt \
+ hardware/qcom/audio/configs/msm8998/audio_tuning_mixer_tavil.txt:system/etc/audio_tuning_mixer_tavil.txt \
hardware/qcom/audio/configs/msm8998/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \
hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \
diff --git a/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml b/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
index e2f68ed..2e75a8c 100644
--- a/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
+++ b/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
@@ -217,6 +217,18 @@
<ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>
+ <path name="listen-ape-handset-dmic">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC1" />
+ <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+ <ctl name="ADC MUX8" value="DMIC" />
+ <ctl name="DMIC MUX8" value="DMIC5" />
+ <ctl name="SLIM_0_TX Channels" value="Two" />
+ </path>
+
<path name="listen-ape-handset-qmic">
<ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
diff --git a/configs/msm8998/sound_trigger_platform_info.xml b/configs/msm8998/sound_trigger_platform_info.xml
index c9b7ef6..5a0dbea 100644
--- a/configs/msm8998/sound_trigger_platform_info.xml
+++ b/configs/msm8998/sound_trigger_platform_info.xml
@@ -33,6 +33,8 @@
<param max_ape_sessions="8" />
<param enable_failure_detection="false" />
<param support_device_switch="false" />
+ <!-- Transition will only occur if execution_type="DYNAMIC" -->
+ <param transit_to_adsp_on_playback="false" />
<!-- Below backend params must match with port used in mixer path file -->
<!-- param used to configure backend sample rate, format and channels -->
<param backend_port_name="SLIM_0_TX" />
@@ -46,6 +48,7 @@
<param DEVICE_HANDSET_MIC_PP_APE="135" />
<param DEVICE_HANDSET_QMIC_APE="137" />
<param DEVICE_HEADSET_MIC_CPE="139" />
+ <param DEVICE_HANDSET_DMIC_APE="149" />
</acdb_ids>
<!-- Multiple sound_model_config tags can be listed, each with unique -->
<!-- vendor_uuid. The below tag represents QTI SVA engine sound model -->
@@ -117,6 +120,64 @@
<param client_capture_read_delay="2000" />
</sound_model_config>
+ <!-- Sound model config for Hotword !-->
+ <sound_model_config>
+ <param vendor_uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" />
+ <param execution_type="WDSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
+ <param app_type="3" /> <!-- app type used in ACDB -->
+ <param library="none" />
+ <param max_cpe_phrases="1" />
+ <param max_cpe_users="1" />
+ <param max_ape_phrases="1" />
+ <param max_ape_users="1" />
+ <!-- Profile specific data which the algorithm can support -->
+ <param sample_rate="16000" />
+ <param bit_width="16" />
+ <param channel_count="1"/>
+ <!-- adm_cfg_profile should match with the one defined under adm_config -->
+ <!-- Set it to NONE if LSM directly connects to AFE -->
+ <param adm_cfg_profile="NONE" />
+ <!-- fluence_type: "FLUENCE", FLUENCE_DMIC", FLUENCE_QMIC" -->
+ <!-- param value is valid when adm_cfg_profile="FLUENCE" -->
+ <param fluence_type="FLUENCE_QMIC" />
+ <gcs_usecase>
+ <param uid="0x3" />
+ <param load_sound_model_ids="0x18000001, 0x4, 0x00012C14" />
+ <param confidence_levels_ids="0x18000001, 0x4, 0x00012C28" />
+ <param detection_event_ids="0x18000001, 0x4, 0x00012C29" />
+ <param read_cmd_ids="0x00020013, 0x4, 0x00020015" />
+ <param read_rsp_ids="0x00020013, 0x4, 0x00020016" />
+ <param custom_config_ids="0x18000001, 0x4, 0x00012C20" />
+ </gcs_usecase>
+ <!-- Module and param ids with which the algorithm is integrated
+ in non-graphite firmware (note these must come after gcs params)
+ Extends flexibility to have different ids based on execution type.
+ valid execution_type values: "WDSP" "ADSP" -->
+ <lsm_usecase>
+ <param execution_mode="ADSP" />
+ <param load_sound_model_ids="0x18000001, 0x00012C14" />
+ <param unload_sound_model_ids="0x18000001, 0x00012C15" />
+ <param confidence_levels_ids="0x18000001, 0x00012C07" />
+ <param operation_mode_ids="0x18000001, 0x00012C02" />
+ <param polling_enable_ids="0x18000001, 0x00012C1B" />
+ </lsm_usecase>
+
+ <lsm_usecase>
+ <param execution_mode="WDSP" />
+ <param load_sound_model_ids="0x18000001, 0x00012C14" />
+ <param unload_sound_model_ids="0x18000001, 0x00012C15" />
+ <param confidence_levels_ids="0x18000001, 0x00012C07" />
+ <param operation_mode_ids="0x18000001, 0x00012C02" />
+ </lsm_usecase>
+
+ <!-- format: "ADPCM_packet" or "PCM_packet" !-->
+ <!-- transfer_mode: "FTRT" or "RT" -->
+ <!-- kw_duration is in milli seconds. It is valid only for FTRT
+ transfer mode -->
+ <param capture_keyword="PCM_packet, RT, 2000" />
+ <param client_capture_read_delay="2000" />
+ </sound_model_config>
+
<!-- Multiple adm_config tags can be listed, each with unique profile name. -->
<!-- app_type to match corresponding value from ACDB -->
<adm_config>
diff --git a/configs/sdm660/aanc_tuning_mixer.txt b/configs/sdm660/aanc_tuning_mixer.txt
deleted file mode 100644
index 5639bd2..0000000
--- a/configs/sdm660/aanc_tuning_mixer.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-#ANC_TEST_P_PATH_MIC_STEREO Capture
-acdb_dev_id:85
-!Capture
-Txdevice:0
-
-enable
-AIF1_CAP Mixer SLIM TX7:1
-AIF1_CAP Mixer SLIM TX8:1
-SLIM TX7 MUX:DEC7
-ADC MUX7:DMIC
-DMIC MUX7:DMIC4
-SLIM TX8 MUX:DEC8
-ADC MUX8:DMIC
-DMIC MUX8:DMIC0
-SLIM_0_TX Channels:Two
-MultiMedia1 Mixer SLIM_0_TX:1
-
-disable
-MultiMedia1 Mixer SLIM_0_TX:0
-AIF1_CAP Mixer SLIM TX7:0
-AIF1_CAP Mixer SLIM TX8:0
-SLIM TX7 MUX:ZERO
-SLIM TX8 MUX:ZERO
-DMIC MUX7:ZERO
-DMIC MUX8:ZERO
-
-#ANC_TEST_S_PATH_MIC_STEREO Capture
-acdb_dev_id:88
-!Capture
-Txdevice:0
-
-enable
-AIF1_CAP Mixer SLIM TX7:1
-AIF1_CAP Mixer SLIM TX8:1
-SLIM TX7 MUX:DEC7
-ADC MUX7:ANC_FB_TUNE1
-ADC MUX10:DMIC
-DMIC MUX10:DMIC0
-SLIM TX8 MUX:DEC8
-ADC MUX8:ANC_FB_TUNE2
-ADC MUX12:DMIC
-DMIC MUX12:DMIC0
-ANC0 FB MUX:ANC_IN_EAR_SPKR
-ANC OUT EAR SPKR Enable Switch:1
-SLIM_0_TX Channels:Two
-MultiMedia1 Mixer SLIM_0_TX:1
-
-disable
-MultiMedia1 Mixer SLIM_0_TX:0
-AIF1_CAP Mixer SLIM TX7:0
-AIF1_CAP Mixer SLIM TX8:0
-SLIM TX7 MUX:ZERO
-SLIM TX8 MUX:ZERO
-ADC MUX7:DMIC
-ADC MUX8:DMIC
-DMIC MUX10:ZERO
-DMIC MUX12:ZERO
-ANC0 FB MUX:ZERO
-ANC OUT EAR SPKR Enable Switch:0
-
-
-#ANC_TEST_E_PATH_MIC_STEREO Capture
-acdb_dev_id:91
-!Capture
-Txdevice:0
-
-enable
-AIF1_CAP Mixer SLIM TX7:1
-AIF1_CAP Mixer SLIM TX8:1
-SLIM TX7 MUX:DEC7
-ADC MUX7:ANC_FB_TUNE1
-ADC MUX10:DMIC
-DMIC MUX10:DMIC4
-SLIM TX8 MUX:DEC8
-ADC MUX8:ANC_FB_TUNE2
-ADC MUX12:DMIC
-DMIC MUX12:DMIC4
-ANC0 FB MUX:ANC_IN_EAR_SPKR
-ANC OUT EAR SPKR Enable Switch:1
-SLIM_0_TX Channels:Two
-MultiMedia1 Mixer SLIM_0_TX:1
-
-disable
-MultiMedia1 Mixer SLIM_0_TX:0
-AIF1_CAP Mixer SLIM TX7:0
-AIF1_CAP Mixer SLIM TX8:0
-SLIM TX7 MUX:ZERO
-SLIM TX8 MUX:ZERO
-ADC MUX7:DMIC
-ADC MUX8:DMIC
-DMIC MUX10:ZERO
-DMIC MUX12:ZERO
-ANC0 FB MUX:ZERO
-ANC OUT EAR SPKR Enable Switch:0
-
-
-#ANC_TEST_S_PATH_HANDSET_SPKR_ANC_MONO
-acdb_dev_id:86
-!Playback
-Rxdevice:0
-
-enable
-ANC Function:ON
-SLIM RX0 MUX:AIF_MIX1_PB
-SLIM_0_RX Channels:One
-RX INT7_1 MIX1 INP0:RX0
-SpkrLeft SWR DAC_Port Switch:1
-ANC Slot:7
-ANC OUT EAR SPKR Enable Switch:1
-ANC SPKR PA Enable Switch:1
-SpkrLeft WSA PA Gain:G_6_DB
-SLIMBUS_0_RX Audio Mixer MultiMedia1:1
-
-disable
-SLIMBUS_0_RX Audio Mixer MultiMedia1:0
-SpkrLeft WSA PA Gain:G_0_DB
-ANC SPKR PA Enable Switch:0
-ANC OUT EAR SPKR Enable Switch:0
-SpkrLeft SWR DAC_Port Switch:0
-ANC Slot:0
-SLIM RX0 MUX:ZERO
-RX INT7_1 MIX1 INP0:ZERO
-ANC Function:OFF
-
-#ANC_TEST_E_PATH_HANDSET_SPKR_ANC_MONO
-acdb_dev_id:89
-!Playback
-Rxdevice:0
-
-enable
-ANC Function:ON
-SLIM RX0 MUX:AIF_MIX1_PB
-SLIM_0_RX Channels:One
-RX INT7_1 MIX1 INP0:RX0
-SpkrLeft SWR DAC_Port Switch:1
-ANC Slot:8
-ANC OUT EAR SPKR Enable Switch:1
-ANC SPKR PA Enable Switch:1
-SpkrLeft WSA PA Gain:G_6_DB
-SLIMBUS_0_RX Audio Mixer MultiMedia1:1
-
-disable
-SLIMBUS_0_RX Audio Mixer MultiMedia1:0
-SpkrLeft WSA PA Gain:G_0_DB
-ANC SPKR PA Enable Switch:0
-ANC OUT EAR SPKR Enable Switch:0
-SpkrLeft SWR DAC_Port Switch:0
-ANC Slot:0
-SLIM RX0 MUX:ZERO
-RX INT7_1 MIX1 INP0:ZERO
-ANC Function:OFF
diff --git a/configs/sdm660/audio_platform_info.xml b/configs/sdm660/audio_platform_info.xml
index 8b31fb1..dd0d974 100644
--- a/configs/sdm660/audio_platform_info.xml
+++ b/configs/sdm660/audio_platform_info.xml
@@ -192,6 +192,8 @@
<device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" interface="INT3_MI2S_TX"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="INT4_MI2S_RX-and-INT0_MI2S_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="INT4_MI2S_RX-and-INT0_MI2S_RX"/>
</backend_names>
</audio_platform_info>
diff --git a/configs/sdm660/audio_tuning_mixer.txt b/configs/sdm660/audio_tuning_mixer.txt
new file mode 100644
index 0000000..fd48369
--- /dev/null
+++ b/configs/sdm660/audio_tuning_mixer.txt
@@ -0,0 +1,41 @@
+#RAS_TEST_SPKR_PHONE_SPKR_STEREO
+acdb_dev_id:136
+!Playback
+Rxdevice:0
+
+enable
+INT4_MI2S_RX Channels:Two
+RX4 MIX1 INP1:RX4
+RX5 MIX1 INP1:RX5
+COMP1 Switch:1
+COMP2 Switch:1
+SpkrLeft COMP Switch:1
+SpkrLeft BOOST Switch:1
+SpkrLeft VISENSE Switch:1
+SpkrLeft SWR DAC_Port Switch:1
+SpkrRight COMP Switch:1
+SpkrRight BOOST Switch:1
+SpkrRight VISENSE Switch:1
+SpkrRight SWR DAC_Port Switch:1
+SpkrLeft WSA PA Mute:0
+SpkrRight WSA PA Mute:0
+INT4_MI2S_RX Audio Mixer MultiMedia1:1
+
+disable
+INT4_MI2S_RX Channels:One
+RX4 MIX1 INP1:ZERO
+RX5 MIX1 INP1:ZERO
+COMP1 Switch:0
+COMP2 Switch:0
+SpkrLeft COMP Switch:0
+SpkrLeft BOOST Switch:0
+SpkrLeft VISENSE Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+SpkrRight COMP Switch:0
+SpkrRight BOOST Switch:0
+SpkrRight VISENSE Switch:0
+SpkrRight SWR DAC_Port Switch:0
+SpkrLeft WSA PA Mute:0
+SpkrRight WSA PA Mute:0
+INT4_MI2S_RX Audio Mixer MultiMedia1:0
+
diff --git a/configs/msm8998/aanc_tuning_mixer.txt b/configs/sdm660/audio_tuning_mixer_tasha.txt
similarity index 76%
copy from configs/msm8998/aanc_tuning_mixer.txt
copy to configs/sdm660/audio_tuning_mixer_tasha.txt
index 5639bd2..e992c76 100644
--- a/configs/msm8998/aanc_tuning_mixer.txt
+++ b/configs/sdm660/audio_tuning_mixer_tasha.txt
@@ -149,3 +149,44 @@
SLIM RX0 MUX:ZERO
RX INT7_1 MIX1 INP0:ZERO
ANC Function:OFF
+
+#RAS_TEST_SPKR_PHONE_SPKR_STEREO
+acdb_dev_id:136
+!Playback
+Rxdevice:0
+
+enable
+SLIM RX0 MUX:AIF_MIX1_PB
+SLIM RX1 MUX:AIF_MIX1_PB
+SLIM_0_RX Channels:Two
+RX INT7_1 MIX1 INP0:RX0
+RX INT8_1 MIX1 INP0:RX1
+COMP7 Switch:1
+COMP8 Switch:1
+SpkrLeft COMP Switch:1
+SpkrRight COMP Switch:1
+SpkrLeft BOOST Switch:1
+SpkrRight BOOST Switch:1
+SpkrLeft VISENSE Switch:1
+SpkrRight VISENSE Switch:1
+SpkrLeft SWR DAC_Port Switch:1
+SpkrRight SWR DAC_Port Switch:1
+SLIMBUS_0_RX Audio Mixer MultiMedia1:1
+
+disable
+SLIM RX0 MUX:ZERO
+SLIM RX1 MUX:ZERO
+RX INT7_1 MIX1 INP0:ZERO
+RX INT8_1 MIX1 INP0:ZERO
+COMP7 Switch:0
+COMP8 Switch:0
+SpkrLeft COMP Switch:0
+SpkrRight COMP Switch:0
+SpkrLeft BOOST Switch:0
+SpkrRight BOOST Switch:0
+SpkrLeft VISENSE Switch:0
+SpkrRight VISENSE Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+SpkrRight SWR DAC_Port Switch:0
+SLIMBUS_0_RX Audio Mixer MultiMedia1:0
+
diff --git a/configs/sdm660/aanc_tuning_mixer_tavil.txt b/configs/sdm660/audio_tuning_mixer_tavil.txt
similarity index 76%
rename from configs/sdm660/aanc_tuning_mixer_tavil.txt
rename to configs/sdm660/audio_tuning_mixer_tavil.txt
index 78156d3..58f2d4f 100644
--- a/configs/sdm660/aanc_tuning_mixer_tavil.txt
+++ b/configs/sdm660/audio_tuning_mixer_tavil.txt
@@ -149,3 +149,46 @@
SLIM RX0 MUX:ZERO
RX INT7_1 MIX1 INP0:ZERO
ANC Function:OFF
+
+#RAS_TEST_SPKR_PHONE_SPKR_STEREO
+acdb_dev_id:136
+!Playback
+Rxdevice:0
+
+enable
+SLIM RX0 MUX:AIF1_PB
+SLIM RX1 MUX:AIF1_PB
+CDC_IF RX0 MUX:SLIM RX0
+CDC_IF RX1 MUX:SLIM RX1
+SLIM_0_RX Channels:Two
+RX INT7_1 MIX1 INP0:RX0
+RX INT8_1 MIX1 INP0:RX1
+COMP7 Switch:1
+COMP8 Switch:1
+SpkrLeft COMP Switch:1
+SpkrRight COMP Switch:1
+SpkrLeft BOOST Switch:1
+SpkrRight BOOST Switch:1
+SpkrLeft VISENSE Switch:1
+SpkrRight VISENSE Switch:1
+SpkrLeft SWR DAC_Port Switch:1
+SpkrRight SWR DAC_Port Switch:1
+SLIMBUS_0_RX Audio Mixer MultiMedia1:1
+
+disable
+SLIM RX0 MUX:ZERO
+SLIM RX1 MUX:ZERO
+RX INT7_1 MIX1 INP0:ZERO
+RX INT8_1 MIX1 INP0:ZERO
+COMP7 Switch:0
+COMP8 Switch:0
+SpkrLeft COMP Switch:0
+SpkrRight COMP Switch:0
+SpkrLeft BOOST Switch:0
+SpkrRight BOOST Switch:0
+SpkrLeft VISENSE Switch:0
+SpkrRight VISENSE Switch:0
+SpkrLeft SWR DAC_Port Switch:0
+SpkrRight SWR DAC_Port Switch:0
+SLIMBUS_0_RX Audio Mixer MultiMedia1:0
+
diff --git a/configs/sdm660/mixer_paths.xml b/configs/sdm660/mixer_paths.xml
index 7aea7b3..bf8b134 100644
--- a/configs/sdm660/mixer_paths.xml
+++ b/configs/sdm660/mixer_paths.xml
@@ -97,6 +97,9 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="Display Port RX Bit Format" value="S16_LE" />
+ <ctl name="Display Port RX SampleRate" value="KHZ_48" />
+ <ctl name="Display Port RX Channels" value="Two" />
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INT0_MI2S_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia2" value="0" />
@@ -139,9 +142,15 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_TX Channels" value="One" />
<ctl name="MultiMedia6 Mixer INT3_MI2S_TX" value="0" />
<ctl name="INT4_MI2S_RX Channels" value="One" />
<ctl name="INT0_MI2S_RX Channels" value="One" />
diff --git a/configs/sdm660/mixer_paths_mtp.xml b/configs/sdm660/mixer_paths_mtp.xml
index a11d843..8aa5396 100644
--- a/configs/sdm660/mixer_paths_mtp.xml
+++ b/configs/sdm660/mixer_paths_mtp.xml
@@ -97,6 +97,9 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="Display Port RX Bit Format" value="S16_LE" />
+ <ctl name="Display Port RX SampleRate" value="KHZ_48" />
+ <ctl name="Display Port RX Channels" value="Two" />
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INT0_MI2S_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia2" value="0" />
@@ -139,9 +142,15 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_TX Channels" value="One" />
<ctl name="MultiMedia6 Mixer INT3_MI2S_TX" value="0" />
<ctl name="INT4_MI2S_RX Channels" value="One" />
<ctl name="INT0_MI2S_RX Channels" value="One" />
diff --git a/configs/sdm660/mixer_paths_skuk.xml b/configs/sdm660/mixer_paths_skuk.xml
index 81bd534..30d6809 100644
--- a/configs/sdm660/mixer_paths_skuk.xml
+++ b/configs/sdm660/mixer_paths_skuk.xml
@@ -102,6 +102,9 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="Display Port RX Bit Format" value="S16_LE" />
+ <ctl name="Display Port RX SampleRate" value="KHZ_48" />
+ <ctl name="Display Port RX Channels" value="Two" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -167,7 +170,7 @@
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
- <ctl name="USB_AUDIO_RX Channels" value="One" />
+ <ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
<ctl name="USB_AUDIO_RX Format" value="S16_LE" />
<ctl name="USB_AUDIO_TX Channels" value="One" />
diff --git a/configs/sdm660/mixer_paths_skus.xml b/configs/sdm660/mixer_paths_skus.xml
index c143e56..c7bab10 100644
--- a/configs/sdm660/mixer_paths_skus.xml
+++ b/configs/sdm660/mixer_paths_skus.xml
@@ -155,6 +155,9 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="Display Port RX Bit Format" value="S16_LE" />
+ <ctl name="Display Port RX SampleRate" value="KHZ_48" />
+ <ctl name="Display Port RX Channels" value="Two" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -203,9 +206,15 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_TX Channels" value="One" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
diff --git a/configs/sdm660/mixer_paths_skush.xml b/configs/sdm660/mixer_paths_skush.xml
index 67ef5e1..546a9c4 100644
--- a/configs/sdm660/mixer_paths_skush.xml
+++ b/configs/sdm660/mixer_paths_skush.xml
@@ -414,6 +414,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback speaker-protected">
<path name="deep-buffer-playback" />
</path>
@@ -475,6 +479,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback speaker-protected">
<path name="low-latency-playback" />
</path>
@@ -536,6 +544,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia8" value="1" />
</path>
+ <path name="audio-ull-playback handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia8" value="1" />
+ </path>
+
<path name="audio-ull-playback speaker-protected">
<path name="audio-ull-playback" />
</path>
@@ -604,6 +616,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="compress-offload-playback speaker-protected">
<path name="compress-offload-playback" />
</path>
@@ -680,6 +696,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia7" value="1" />
+ </path>
+
<path name="compress-offload-playback2 hdmi">
<ctl name="HDMI Mixer MultiMedia7" value="1" />
</path>
@@ -744,6 +764,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="compress-offload-playback3 hdmi">
<ctl name="HDMI Mixer MultiMedia10" value="1" />
</path>
@@ -808,6 +832,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia11" value="1" />
+ </path>
+
<path name="compress-offload-playback4 hdmi">
<ctl name="HDMI Mixer MultiMedia11" value="1" />
</path>
@@ -873,6 +901,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia12" value="1" />
+ </path>
+
<path name="compress-offload-playback5 hdmi">
<ctl name="HDMI Mixer MultiMedia12" value="1" />
</path>
@@ -937,6 +969,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia13" value="1" />
+ </path>
+
<path name="compress-offload-playback6 hdmi">
<ctl name="HDMI Mixer MultiMedia13" value="1" />
</path>
@@ -1001,6 +1037,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia14" value="1" />
+ </path>
+
<path name="compress-offload-playback7 hdmi">
<ctl name="HDMI Mixer MultiMedia14" value="1" />
</path>
@@ -1065,6 +1105,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia15" value="1" />
+ </path>
+
<path name="compress-offload-playback8 hdmi">
<ctl name="HDMI Mixer MultiMedia15" value="1" />
</path>
@@ -1129,6 +1173,10 @@
<ctl name="INT4_MI2S_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 handset">
+ <ctl name="INT0_MI2S_RX Audio Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="compress-offload-playback9 hdmi">
<ctl name="HDMI Mixer MultiMedia16" value="1" />
</path>
diff --git a/configs/sdm660/mixer_paths_wcd9326.xml b/configs/sdm660/mixer_paths_wcd9326.xml
index e7a52f4..236510b 100644
--- a/configs/sdm660/mixer_paths_wcd9326.xml
+++ b/configs/sdm660/mixer_paths_wcd9326.xml
@@ -154,6 +154,9 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="Display Port RX Bit Format" value="S16_LE" />
+ <ctl name="Display Port RX SampleRate" value="KHZ_48" />
+ <ctl name="Display Port RX Channels" value="Two" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -202,9 +205,15 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_TX Channels" value="One" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
diff --git a/configs/sdm660/mixer_paths_wcd9335.xml b/configs/sdm660/mixer_paths_wcd9335.xml
index 1e038fe..49b9ea0 100644
--- a/configs/sdm660/mixer_paths_wcd9335.xml
+++ b/configs/sdm660/mixer_paths_wcd9335.xml
@@ -154,6 +154,9 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="Display Port RX Bit Format" value="S16_LE" />
+ <ctl name="Display Port RX SampleRate" value="KHZ_48" />
+ <ctl name="Display Port RX Channels" value="Two" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -202,9 +205,15 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_TX Channels" value="One" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
diff --git a/configs/sdm660/mixer_paths_wcd9340.xml b/configs/sdm660/mixer_paths_wcd9340.xml
index 6160cb3..4d44d4d 100644
--- a/configs/sdm660/mixer_paths_wcd9340.xml
+++ b/configs/sdm660/mixer_paths_wcd9340.xml
@@ -101,6 +101,9 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="Display Port RX Bit Format" value="S16_LE" />
+ <ctl name="Display Port RX SampleRate" value="KHZ_48" />
+ <ctl name="Display Port RX Channels" value="Two" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -163,9 +166,15 @@
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="USB_AUDIO_RX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_RX Channels" value="Two" />
<ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
+ <ctl name="USB_AUDIO_TX Format" value="S16_LE" />
+ <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />
+ <ctl name="USB_AUDIO_TX Channels" value="One" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="SLIM_2_RX Format" value="UNPACKED" />
<ctl name="SLIM_2_RX SampleRate" value="KHZ_48" />
diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk
index ba0e20f..c0bbd86 100644
--- a/configs/sdm660/sdm660.mk
+++ b/configs/sdm660/sdm660.mk
@@ -87,8 +87,9 @@
hardware/qcom/audio/configs/sdm660/mixer_paths_skus.xml:system/etc/mixer_paths_skus.xml \
hardware/qcom/audio/configs/sdm660/mixer_paths_skush.xml:system/etc/mixer_paths_skush.xml \
hardware/qcom/audio/configs/sdm660/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
- hardware/qcom/audio/configs/sdm660/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
- hardware/qcom/audio/configs/sdm660/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \
+ hardware/qcom/audio/configs/sdm660/audio_tuning_mixer.txt:system/etc/audio_tuning_mixer.txt \
+ hardware/qcom/audio/configs/sdm660/audio_tuning_mixer_tavil.txt:system/etc/audio_tuning_mixer_tavil.txt \
+ hardware/qcom/audio/configs/sdm660/audio_tuning_mixer_tasha.txt:system/etc/audio_tuning_mixer_tasha.txt \
hardware/qcom/audio/configs/sdm660/audio_platform_info_extcodec.xml:system/etc/audio_platform_info_extcodec.xml \
hardware/qcom/audio/configs/sdm660/audio_platform_info.xml:system/etc/audio_platform_info.xml \
hardware/qcom/audio/configs/sdm660/audio_platform_info_skush.xml:system/etc/audio_platform_info_skush.xml \
diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index 659d72c..fba7e6c 100644
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -832,23 +832,11 @@
uint32_t audio_extn_a2dp_get_encoder_latency()
{
- void *codec_info = NULL;
- uint8_t multi_cast = 0, num_dev = 1;
- audio_format_t codec_type = AUDIO_FORMAT_INVALID;
uint32_t latency = 0;
int avsync_runtime_prop = 0;
int sbc_offset = 0, aptx_offset = 0, aptxhd_offset = 0, aac_offset = 0;
char value[PROPERTY_VALUE_MAX];
- if (!a2dp.audio_get_codec_config) {
- ALOGE(" a2dp handle is not identified");
- return latency;
- }
-
- if (a2dp.a2dp_started)
- codec_info = a2dp.audio_get_codec_config(&multi_cast, &num_dev,
- &codec_type);
-
memset(value, '\0', sizeof(char)*PROPERTY_VALUE_MAX);
avsync_runtime_prop = property_get("audio.a2dp.codec.latency", value, NULL);
if (avsync_runtime_prop > 0) {
@@ -859,7 +847,7 @@
}
}
- switch(codec_type) {
+ switch(a2dp.bt_encoder_format) {
case AUDIO_FORMAT_SBC:
latency = (avsync_runtime_prop > 0) ? sbc_offset : 150;
break;
diff --git a/hal/audio_extn/pm.c b/hal/audio_extn/pm.c
index 7b76f60..c52508e 100644
--- a/hal/audio_extn/pm.c
+++ b/hal/audio_extn/pm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014, 2017 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -33,15 +33,15 @@
#include "pm.h"
#include <cutils/log.h>
+/* Device state*/
+#define AUDIO_PARAMETER_KEY_DEV_SHUTDOWN "dev_shutdown"
+
static s_audio_subsys audio_ss;
int audio_extn_pm_vote(void)
{
- int err, intfd, ret;
- FILE *fd;
+ int ret;
enum pm_event subsys_state;
- char halPropVal[PROPERTY_VALUE_MAX];
- bool prop_unload_image = false;
bool pm_reg = false;
bool pm_supp = false;
@@ -71,26 +71,6 @@
pm_reg == true) {
ALOGD("%s: Voting for subsystem power up", __func__);
pm_client_connect(audio_ss.pm_handle);
-
- if (property_get("sys.audio.init", halPropVal, NULL)) {
- prop_unload_image = !(strncmp("false", halPropVal, sizeof("false")));
- }
- /*
- * adsp-loader loads modem/adsp image at boot up to play boot tone,
- * before peripheral manager service is up. Once PM is up, vote to PM
- * and unload the image to give control to PM to load/unload image
- */
- if (prop_unload_image) {
- intfd = open(BOOT_IMG_SYSFS_PATH, O_WRONLY);
- if (intfd == -1) {
- ALOGE("failed to open fd in write mode, %d", errno);
- } else {
- ALOGD("%s: write to sysfs to unload image", __func__);
- err = write(intfd, UNLOAD_IMAGE, 1);
- close(intfd);
- property_set("sys.audio.init", "true");
- }
- }
}
return 0;
}
@@ -120,6 +100,11 @@
void audio_extn_pm_event_notifier(void *client_data, enum pm_event event)
{
+
+ int err, intfd;
+ char halPropVal[PROPERTY_VALUE_MAX];
+ bool prop_unload_image = false;
+
pm_client_event_acknowledge(audio_ss.pm_handle, event);
/* Closing and re-opening of session is done based on snd card status given
@@ -140,6 +125,26 @@
case EVENT_PERIPH_IS_ONLINE:
ALOGV("%s: %s is online", __func__, audio_ss.img_name);
+
+ if (property_get("sys.audio.init", halPropVal, NULL)) {
+ prop_unload_image = !(strncmp("false", halPropVal, sizeof("false")));
+ }
+ /*
+ * adsp-loader loads modem/adsp image at boot up to play boot tone,
+ * before peripheral manager service is up. Once PM is up, vote to PM
+ * and unload the image to give control to PM to load/unload image
+ */
+ if (prop_unload_image) {
+ intfd = open(BOOT_IMG_SYSFS_PATH, O_WRONLY);
+ if (intfd == -1) {
+ ALOGE("failed to open fd in write mode, %d", errno);
+ } else {
+ ALOGD("%s: write to sysfs to unload image", __func__);
+ err = write(intfd, UNLOAD_IMAGE, 1);
+ close(intfd);
+ property_set("sys.audio.init", "true");
+ }
+ }
break;
default:
diff --git a/hal/audio_extn/usb.c b/hal/audio_extn/usb.c
index 7416e92..456382e 100644
--- a/hal/audio_extn/usb.c
+++ b/hal/audio_extn/usb.c
@@ -47,7 +47,7 @@
#define SAMPLE_RATE_11025 11025
// Supported sample rates for USB
static uint32_t supported_sample_rates[] =
- {44100, 48000, 64000, 88200, 96000, 176400, 192000, 384000};
+ {44100, 48000, 64000, 88200, 96000, 176400, 192000, 352800, 384000};
#define MAX_SAMPLE_RATE_SIZE sizeof(supported_sample_rates)/sizeof(supported_sample_rates[0])
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index caa177a..ad67881 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -468,6 +468,7 @@
streams_output_cfg_list,
streams_input_cfg_list);
ALOGE("%s: could not load io policy config!", __func__);
+ free(root);
return;
}
}
@@ -480,6 +481,7 @@
streams_input_cfg_list);
config_free(root);
+ free(root);
free(data);
}
@@ -838,8 +840,7 @@
rc = -EINVAL;
goto exit_send_app_type_cfg;
}
- snd_device = (snd_device == SND_DEVICE_OUT_SPEAKER) ?
- platform_get_spkr_prot_snd_device(snd_device) : snd_device;
+ snd_device = platform_get_spkr_prot_snd_device(snd_device);
acdb_dev_id = platform_get_snd_device_acdb_id(snd_device);
if (acdb_dev_id <= 0) {
@@ -1268,7 +1269,7 @@
platform_send_audio_calibration(adev->platform, usecase,
usecase->stream.in->app_type_cfg.app_type,
usecase->stream.in->app_type_cfg.sample_rate);
- } else if (type == PCM_HFP_CALL) {
+ } else if (type == PCM_HFP_CALL || type == PCM_CAPTURE) {
/* when app type is default. the sample rate is not used to send cal */
platform_send_audio_calibration(adev->platform, usecase,
platform_get_default_app_type_v2(adev->platform, usecase->type),
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a42158e..cc150b2 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1087,19 +1087,17 @@
platform_get_snd_device_name(snd_device),
platform_get_snd_device_name(usecase->out_snd_device),
platform_check_backends_match(snd_device, usecase->out_snd_device));
- uc_derive_snd_device = derive_playback_snd_device(adev->platform,
- usecase, uc_info, snd_device);
- if (usecase->type != PCM_CAPTURE &&
- usecase != uc_info &&
- ((uc_derive_snd_device != usecase->out_snd_device) || force_routing) &&
- ((usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||
- (usecase->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) ||
- (usecase->devices & AUDIO_DEVICE_OUT_USB_DEVICE) ||
- (usecase->devices & AUDIO_DEVICE_OUT_ALL_A2DP) ||
- (usecase->devices & AUDIO_DEVICE_OUT_ALL_SCO)) &&
- ((force_restart_session) ||
- (platform_check_backends_match(snd_device, usecase->out_snd_device)))) {
-
+ if ((usecase->type != PCM_CAPTURE) && (usecase != uc_info)) {
+ uc_derive_snd_device = derive_playback_snd_device(adev->platform,
+ usecase, uc_info, snd_device);
+ if (((uc_derive_snd_device != usecase->out_snd_device) || force_routing) &&
+ ((usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||
+ (usecase->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) ||
+ (usecase->devices & AUDIO_DEVICE_OUT_USB_DEVICE) ||
+ (usecase->devices & AUDIO_DEVICE_OUT_ALL_A2DP) ||
+ (usecase->devices & AUDIO_DEVICE_OUT_ALL_SCO)) &&
+ ((force_restart_session) ||
+ (platform_check_backends_match(snd_device, usecase->out_snd_device)))) {
ALOGD("%s:becf: check_usecases (%s) is active on (%s) - disabling ..",
__func__, use_case_table[usecase->id],
platform_get_snd_device_name(usecase->out_snd_device));
@@ -1108,6 +1106,7 @@
/* Enable existing usecase on derived playback device */
derive_snd_device[usecase->id] = uc_derive_snd_device;
num_uc_to_switch++;
+ }
}
}
@@ -1201,7 +1200,7 @@
(usecase->in_snd_device != snd_device || force_routing) &&
((uc_info->devices & backend_check_cond) &&
(((usecase->devices & ~AUDIO_DEVICE_BIT_IN) & AUDIO_DEVICE_IN_ALL_CODEC_BACKEND) ||
- (usecase->type == VOICE_CALL) || (usecase->type == VOIP_CALL))) &&
+ (usecase->type == VOIP_CALL))) &&
(usecase->id != USECASE_AUDIO_SPKR_CALIB_TX)) {
ALOGV("%s: Usecase (%s) is active on (%s) - disabling ..",
__func__, use_case_table[usecase->id],
@@ -1522,10 +1521,19 @@
out_snd_device = vc_usecase->out_snd_device;
}
} else if (voice_extn_compress_voip_is_active(adev)) {
+ bool out_snd_device_backend_match = true;
+ if (usecase->stream.out != NULL) {
+ out_snd_device_backend_match = platform_check_backends_match(
+ voip_usecase->out_snd_device,
+ platform_get_output_snd_device(
+ adev->platform,
+ usecase->stream.out));
+ }
voip_usecase = get_usecase_from_list(adev, USECASE_COMPRESS_VOIP_CALL);
if ((voip_usecase) && ((voip_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) &&
((usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||
((usecase->devices & ~AUDIO_DEVICE_BIT_IN) & AUDIO_DEVICE_IN_ALL_CODEC_BACKEND)) &&
+ out_snd_device_backend_match &&
(voip_usecase->stream.out != adev->primary_output))) {
in_snd_device = voip_usecase->in_snd_device;
out_snd_device = voip_usecase->out_snd_device;
@@ -2327,6 +2335,8 @@
goto error_open;
}
}
+ platform_set_stream_channel_map(adev->platform, out->channel_mask,
+ out->pcm_device_id);
} else {
platform_set_stream_channel_map(adev->platform, out->channel_mask,
out->pcm_device_id);
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 8f2ac98..28ae060 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -446,6 +446,8 @@
struct audio_usecase *get_usecase_from_list(const struct audio_device *adev,
audio_usecase_t uc_id);
+struct stream_in *get_next_active_input(const struct audio_device *adev);
+
bool is_offload_usecase(audio_usecase_t uc_id);
bool audio_is_true_native_stream_active(struct audio_device *adev);
diff --git a/hal/msm8916/hw_info.c b/hal/msm8916/hw_info.c
index b2290b7..5060c77 100644
--- a/hal/msm8916/hw_info.c
+++ b/hal/msm8916/hw_info.c
@@ -103,6 +103,9 @@
} else if (!strcmp(snd_card_name, "msm8909-skue-snd-card")) {
strlcpy(hw_info->type, "skue", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8909", sizeof(hw_info->name));
+ } else if (!strcmp(snd_card_name, "msm8909-skut-snd-card")) {
+ strlcpy(hw_info->type, "skut", sizeof(hw_info->type));
+ strlcpy(hw_info->name, "msm8909", sizeof(hw_info->name));
} else if (!strcmp(snd_card_name, "msm8939-snd-card-skul")) {
strlcpy(hw_info->type, "skul", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8939", sizeof(hw_info->name));
@@ -167,6 +170,9 @@
strlcpy(hw_info->name, "apq8009", sizeof(hw_info->name));
} else if (!strcmp(snd_card_name, "mdm9607-tomtom-i2s-snd-card")) {
strlcpy(hw_info->name, "mdm9607", sizeof(hw_info->name));
+ } else if (!strcmp(snd_card_name, "msm8909-skuq-snd-card")) {
+ strlcpy(hw_info->type, "skuq", sizeof(hw_info->type));
+ strlcpy(hw_info->name, "msm8909", sizeof(hw_info->name));
} else {
ALOGW("%s: Not an 8x16/8909/8917/8920/8937/8939/8940/8952/8953/660 device", __func__);
}
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 73689eb..dfb896c 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -52,6 +52,7 @@
#define MIXER_XML_PATH_SKUL "/system/etc/mixer_paths_skul.xml"
#define MIXER_XML_PATH_SKUS "/system/etc/mixer_paths_skus.xml"
#define MIXER_XML_PATH_SKUSH "/system/etc/mixer_paths_skush.xml"
+#define MIXER_XML_PATH_QRD_SKUT "/system/etc/mixer_paths_qrd_skut.xml"
#define MIXER_XML_PATH_SKUM "/system/etc/mixer_paths_qrd_skum.xml"
#define MIXER_XML_PATH_SKU1 "/system/etc/mixer_paths_qrd_sku1.xml"
#define MIXER_XML_PATH_SKUN_CAJON "/system/etc/mixer_paths_qrd_skun_cajon.xml"
@@ -260,6 +261,7 @@
bool fluence_in_voice_call;
bool fluence_in_voice_rec;
bool fluence_in_audio_rec;
+ bool fluence_in_hfp_call;
bool external_spk_1;
bool external_spk_2;
bool external_mic;
@@ -434,6 +436,8 @@
[SND_DEVICE_OUT_ANC_FB_HEADSET] = "anc-fb-headphones",
[SND_DEVICE_OUT_VOICE_ANC_HEADSET] = "voice-anc-headphones",
[SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET] = "voice-anc-fb-headphones",
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = "voice-speaker-and-voice-headphones",
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = "voice-speaker-and-voice-anc-headphones",
[SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET] = "speaker-and-anc-headphones",
[SND_DEVICE_OUT_ANC_HANDSET] = "anc-handset",
[SND_DEVICE_OUT_SPEAKER_PROTECTED] = "speaker-protected",
@@ -548,6 +552,8 @@
[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = 135,
[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = 135,
[SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = 10,
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = 10,
[SND_DEVICE_OUT_HDMI] = 18,
[SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 14,
[SND_DEVICE_OUT_DISPLAY_PORT] = 18,
@@ -1081,7 +1087,21 @@
msm_device_to_be_id = msm_device_to_be_id_internal_codec;
msm_be_id_array_len =
sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
+ } else if (!strncmp(snd_card_name, "msm8909-skut-snd-card",
+ sizeof("msm8909-skut-snd-card"))) {
+ strlcpy(mixer_xml_path, MIXER_XML_PATH_QRD_SKUT,
+ sizeof(MIXER_XML_PATH_QRD_SKUT));
+ msm_device_to_be_id = msm_device_to_be_id_internal_codec;
+ msm_be_id_array_len =
+ sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
+ } else if (!strncmp(snd_card_name, "msm8909-skuq-snd-card",
+ sizeof("msm8909-skuq-snd-card"))) {
+ strlcpy(mixer_xml_path, MIXER_XML_PATH_QRD_SKUT,
+ sizeof(MIXER_XML_PATH_QRD_SKUT));
+ msm_device_to_be_id = msm_device_to_be_id_internal_codec;
+ msm_be_id_array_len =
+ sizeof(msm_device_to_be_id_internal_codec) / sizeof(msm_device_to_be_id_internal_codec[0]);
} else if (!strncmp(snd_card_name, "msm8909-pm8916-snd-card",
sizeof("msm8909-pm8916-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_MSM8909_PM8916,
@@ -1413,6 +1433,8 @@
backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = strdup("vbat-voice-speaker-2");
backend_tag_table[SND_DEVICE_OUT_BT_A2DP] = strdup("bt-a2dp");
backend_tag_table[SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP] = strdup("speaker-and-bt-a2dp");
+ backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = strdup("speaker-and-headphones");
+ backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = strdup("speaker-and-headphones");
hw_interface_table[SND_DEVICE_OUT_HANDSET] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER] = strdup("SLIMBUS_0_RX");
@@ -1425,6 +1447,8 @@
hw_interface_table[SND_DEVICE_OUT_HEADPHONES_DSD] = strdup("SLIMBUS_2_RX");
hw_interface_table[SND_DEVICE_OUT_HEADPHONES_44_1] = strdup("SLIMBUS_5_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_LINE] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
@@ -1458,12 +1482,12 @@
hw_interface_table[SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET] = strdup("SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_ANC_HANDSET] = strdup("SLIMBUS_0_RX");
- hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = strdup("SLIMBUS_4_TX");
+ hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_WSA] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA] = strdup("SLIMBUS_0_RX");
@@ -1763,6 +1787,15 @@
ALOGD("using tasha ACDB files for tasha-lite");
return "sdm660-tasha-snd-card";
}
+
+ // Both tasha & tasha-lite uses tasha ACDB files
+ // simulate sound card name for tasha lite, so that
+ // ACDB module loads tasha ACDB files for tasha lite
+ if(!strncmp(snd_card_name, "msm8x09-tasha9326-snd-card",
+ sizeof("msm8x09-tasha9326-snd-card"))) {
+ ALOGD("using tasha ACDB files for tasha-lite");
+ return "msm8x09-tasha-snd-card";
+ }
return snd_card_name;
}
@@ -2094,6 +2127,7 @@
my_data->fluence_in_voice_call = false;
my_data->fluence_in_voice_rec = false;
my_data->fluence_in_audio_rec = false;
+ my_data->fluence_in_hfp_call = false;
my_data->external_spk_1 = false;
my_data->external_spk_2 = false;
my_data->external_mic = false;
@@ -2143,6 +2177,11 @@
if (!strncmp("broadside", value, sizeof("broadside"))) {
my_data->fluence_mode = FLUENCE_BROADSIDE;
}
+
+ property_get("persist.audio.fluence.hfpcall",value,"");
+ if (!strncmp("true", value, sizeof("true"))) {
+ my_data->fluence_in_hfp_call = true;
+ }
}
if (check_and_get_wsa_info((char *)snd_card_name, &wsaCount, &is_wsa_combo_supported)) {
@@ -2330,10 +2369,10 @@
/* obtain source mic type from max mic count*/
get_source_mic_type(my_data);
ALOGD("%s: Fluence_Type(%d) max_mic_count(%d) mic_type(0x%x) fluence_in_voice_call(%d)"
- " fluence_in_voice_rec(%d) fluence_in_spkr_mode(%d) ",
+ " fluence_in_voice_rec(%d) fluence_in_spkr_mode(%d) fluence_in_hfp_call(%d) ",
__func__, my_data->fluence_type, my_data->max_mic_count, my_data->source_mic_type,
my_data->fluence_in_voice_call, my_data->fluence_in_voice_rec,
- my_data->fluence_in_spkr_mode);
+ my_data->fluence_in_spkr_mode, my_data->fluence_in_hfp_call);
/* init usb */
audio_extn_usb_init(adev);
@@ -3438,6 +3477,24 @@
new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET &&
+ !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_ANC_HEADSET)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
+ ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES &&
+ !platform_check_backends_match(SND_DEVICE_OUT_VOICE_SPEAKER, SND_DEVICE_OUT_VOICE_HEADPHONES)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_VOICE_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_VOICE_HEADPHONES;
+ ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET &&
+ !platform_check_backends_match(SND_DEVICE_OUT_VOICE_SPEAKER, SND_DEVICE_OUT_VOICE_ANC_HEADSET)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_VOICE_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_VOICE_ANC_HEADSET;
+ ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_HDMI &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_HDMI)) {
*num_devices = 2;
@@ -3553,12 +3610,26 @@
}
if (popcount(devices) == 2) {
+ bool is_active_voice_call = false;
+
+ /*
+ * This is special case handling for combo device use case during
+ * voice call. APM route use case to combo device if stream type is
+ * enforced audible (e.g. Camera shutter sound).
+ */
+ if ((mode == AUDIO_MODE_IN_CALL) ||
+ voice_is_in_call(adev) ||
+ voice_extn_compress_voip_is_active(adev))
+ is_active_voice_call = true;
+
if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
AUDIO_DEVICE_OUT_SPEAKER)) {
if (my_data->external_spk_1)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1;
else if (my_data->external_spk_2)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2;
+ else if (is_active_voice_call)
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES;
else
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
} else if (devices == (AUDIO_DEVICE_OUT_LINE |
@@ -3566,14 +3637,21 @@
snd_device = SND_DEVICE_OUT_SPEAKER_AND_LINE;
} else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET |
AUDIO_DEVICE_OUT_SPEAKER)) {
- if (audio_extn_get_anc_enabled())
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET;
- else if (my_data->external_spk_1)
+ if (audio_extn_get_anc_enabled()) {
+ if (is_active_voice_call)
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET;
+ else
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET;
+ } else if (my_data->external_spk_1)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1;
else if (my_data->external_spk_2)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
+ else {
+ if (is_active_voice_call)
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES;
+ else
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
+ }
} else if (devices == (AUDIO_DEVICE_OUT_AUX_DIGITAL |
AUDIO_DEVICE_OUT_SPEAKER)) {
switch(my_data->ext_disp_type) {
@@ -3875,7 +3953,8 @@
snd_device = SND_DEVICE_IN_AANC_HANDSET_MIC;
adev->acdb_settings |= ANC_FLAG;
} else if (my_data->fluence_type == FLUENCE_NONE ||
- my_data->fluence_in_voice_call == false) {
+ my_data->fluence_in_voice_call == false ||
+ my_data->fluence_in_hfp_call == false) {
snd_device = SND_DEVICE_IN_HANDSET_MIC;
if (audio_extn_hfp_is_active(adev))
platform_set_echo_reference(adev, true, out_device);
@@ -3901,7 +3980,8 @@
}
} else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {
if (my_data->fluence_type != FLUENCE_NONE &&
- my_data->fluence_in_voice_call &&
+ (my_data->fluence_in_voice_call ||
+ my_data->fluence_in_hfp_call) &&
my_data->fluence_in_spkr_mode) {
if((my_data->fluence_type & FLUENCE_QUAD_MIC) &&
(my_data->source_mic_type & SOURCE_QUAD_MIC)) {
@@ -4342,6 +4422,132 @@
return ret;
}
+static int parse_audiocal_cfg(struct str_parms *parms, acdb_audio_cal_cfg_t *cal)
+{
+ int err;
+ char value[64];
+ int ret = 0;
+
+ if(parms == NULL || cal == NULL)
+ return ret;
+
+ err = str_parms_get_str(parms, "cal_persist", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_persist");
+ cal->persist = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x1;
+ }
+ err = str_parms_get_str(parms, "cal_apptype", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_apptype");
+ cal->app_type = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x2;
+ }
+ err = str_parms_get_str(parms, "cal_caltype", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_caltype");
+ cal->cal_type = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x4;
+ }
+ err = str_parms_get_str(parms, "cal_samplerate", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_samplerate");
+ cal->sampling_rate = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x8;
+ }
+ err = str_parms_get_str(parms, "cal_devid", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_devid");
+ cal->dev_id = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x10;
+ }
+ err = str_parms_get_str(parms, "cal_snddevid", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_snddevid");
+ cal->snd_dev_id = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x20;
+ }
+ err = str_parms_get_str(parms, "cal_topoid", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_topoid");
+ cal->topo_id = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x40;
+ }
+ err = str_parms_get_str(parms, "cal_moduleid", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_moduleid");
+ cal->module_id = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x80;
+ }
+ err = str_parms_get_str(parms, "cal_paramid", value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(parms, "cal_paramid");
+ cal->param_id = (uint32_t) strtoul(value, NULL, 0);
+ ret = ret | 0x100;
+ }
+ return ret;
+}
+
+static void set_audiocal(void *platform, struct str_parms *parms, char *value, int len) {
+ struct platform_data *my_data = (struct platform_data *)platform;
+ struct stream_out out;
+ acdb_audio_cal_cfg_t cal;
+ uint8_t *dptr = NULL;
+ int32_t dlen;
+ int err, ret;
+ if(value == NULL || platform == NULL || parms == NULL) {
+ ALOGE("[%s] received null pointer, failed",__func__);
+ goto done_key_audcal;
+ }
+
+ /* parse audio calibration keys */
+ ret = parse_audiocal_cfg(parms, &cal);
+
+ /* handle audio calibration data now */
+ err = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_AUD_CALDATA, value, len);
+ if (err >= 0) {
+ str_parms_del(parms, AUDIO_PARAMETER_KEY_AUD_CALDATA);
+ dlen = strlen(value);
+ if(dlen <= 0) {
+ ALOGE("[%s] null data received",__func__);
+ goto done_key_audcal;
+ }
+ dptr = (uint8_t*) calloc(dlen, sizeof(uint8_t));
+ if(dptr == NULL) {
+ ALOGE("[%s] memory allocation failed for %d",__func__, dlen);
+ goto done_key_audcal;
+ }
+ dlen = b64decode(value, strlen(value), dptr);
+ if(dlen<=0) {
+ ALOGE("[%s] data decoding failed %d", __func__, dlen);
+ goto done_key_audcal;
+ }
+
+ if(cal.dev_id) {
+ if(audio_is_input_device(cal.dev_id)) {
+ cal.snd_dev_id = platform_get_input_snd_device(platform, cal.dev_id);
+ } else {
+ out.devices = cal.dev_id;
+ out.sample_rate = cal.sampling_rate;
+ cal.snd_dev_id = platform_get_output_snd_device(platform, &out);
+ }
+ }
+ cal.acdb_dev_id = platform_get_snd_device_acdb_id(cal.snd_dev_id);
+ ALOGD("Setting audio calibration for snd_device(%d) acdb_id(%d)",
+ cal.snd_dev_id, cal.acdb_dev_id);
+ if(cal.acdb_dev_id == -EINVAL) {
+ ALOGE("[%s] Invalid acdb_device id %d for snd device id %d",
+ __func__, cal.acdb_dev_id, cal.snd_dev_id);
+ goto done_key_audcal;
+ }
+ if(my_data->acdb_set_audio_cal) {
+ ret = my_data->acdb_set_audio_cal((void *)&cal, (void*)dptr, dlen);
+ }
+ }
+done_key_audcal:
+ if(dptr != NULL)
+ free(dptr);
+}
int platform_set_parameters(void *platform, struct str_parms *parms)
{
struct platform_data *my_data = (struct platform_data *)platform;
@@ -4458,6 +4664,8 @@
ALOGV("%s: max_mic_count %d", __func__, my_data->max_mic_count);
}
+ /* handle audio calibration parameters */
+ set_audiocal(platform, parms, value, len);
native_audio_set_params(platform, parms, value, sizeof(value));
audio_extn_spkr_prot_set_parameters(parms, value, len);
audio_extn_usb_set_sidetone_gain(parms, value, len);
@@ -4567,6 +4775,100 @@
return ret;
}
+static void get_audiocal(void *platform, void *keys, void *pReply) {
+ struct platform_data *my_data = (struct platform_data *)platform;
+ struct stream_out out;
+ struct str_parms *query = (struct str_parms *)keys;
+ struct str_parms *reply=(struct str_parms *)pReply;
+ acdb_audio_cal_cfg_t cal;
+ uint8_t *dptr = NULL;
+ char value[512] = {0};
+ char *rparms=NULL;
+ int ret=0, err;
+ uint32_t param_len;
+
+ if(query==NULL || platform==NULL || reply==NULL) {
+ ALOGE("[%s] received null pointer",__func__);
+ ret=-EINVAL;
+ goto done;
+ }
+ /* parse audiocal configuration keys */
+ ret = parse_audiocal_cfg(query, &cal);
+ if(ret == 0) {
+ /* No calibration keys found */
+ goto done;
+ }
+ err = str_parms_get_str(query, AUDIO_PARAMETER_KEY_AUD_CALDATA, value, sizeof(value));
+ if (err >= 0) {
+ str_parms_del(query, AUDIO_PARAMETER_KEY_AUD_CALDATA);
+ } else {
+ goto done;
+ }
+
+ if(cal.dev_id & AUDIO_DEVICE_BIT_IN) {
+ cal.snd_dev_id = platform_get_input_snd_device(platform, cal.dev_id);
+ } else if(cal.dev_id) {
+ out.devices = cal.dev_id;
+ out.sample_rate = cal.sampling_rate;
+ cal.snd_dev_id = platform_get_output_snd_device(platform, &out);
+ }
+ cal.acdb_dev_id = platform_get_snd_device_acdb_id(cal.snd_dev_id);
+ if (cal.acdb_dev_id < 0) {
+ ALOGE("%s: Failed. Could not find acdb id for snd device(%d)",
+ __func__, cal.snd_dev_id);
+ ret = -EINVAL;
+ goto done_key_audcal;
+ }
+ ALOGD("[%s] Getting audio calibration for snd_device(%d) acdb_id(%d)",
+ __func__, cal.snd_dev_id, cal.acdb_dev_id);
+
+ param_len = MAX_SET_CAL_BYTE_SIZE;
+ dptr = (uint8_t*)calloc(param_len, sizeof(uint8_t));
+ if(dptr == NULL) {
+ ALOGE("[%s] Memory allocation failed for length %d",__func__,param_len);
+ ret = -ENOMEM;
+ goto done_key_audcal;
+ }
+ if (my_data->acdb_get_audio_cal != NULL) {
+ ret = my_data->acdb_get_audio_cal((void*)&cal, (void*)dptr, ¶m_len);
+ if (ret == 0) {
+ if(param_len == 0 || param_len == MAX_SET_CAL_BYTE_SIZE) {
+ ret = -EINVAL;
+ goto done_key_audcal;
+ }
+ /* Allocate memory for encoding */
+ rparms = (char*)calloc((param_len*2), sizeof(char));
+ if(rparms == NULL) {
+ ALOGE("[%s] Memory allocation failed for size %d",
+ __func__, param_len*2);
+ ret = -ENOMEM;
+ goto done_key_audcal;
+ }
+ if(cal.persist==0 && cal.module_id && cal.param_id) {
+ err = b64encode(dptr+12, param_len-12, rparms);
+ } else {
+ err = b64encode(dptr, param_len, rparms);
+ }
+ if(err < 0) {
+ ALOGE("[%s] failed to convert data to string", __func__);
+ ret = -EINVAL;
+ goto done_key_audcal;
+ }
+ str_parms_add_int(reply, AUDIO_PARAMETER_KEY_AUD_CALRESULT, ret);
+ str_parms_add_str(reply, AUDIO_PARAMETER_KEY_AUD_CALDATA, rparms);
+ }
+ }
+done_key_audcal:
+ if(ret != 0) {
+ str_parms_add_int(reply, AUDIO_PARAMETER_KEY_AUD_CALRESULT, ret);
+ str_parms_add_str(reply, AUDIO_PARAMETER_KEY_AUD_CALDATA, "");
+ }
+done:
+ if(dptr != NULL)
+ free(dptr);
+ if(rparms != NULL)
+ free(rparms);
+}
void platform_get_parameters(void *platform,
struct str_parms *query,
struct str_parms *reply)
@@ -4603,6 +4905,8 @@
str_parms_add_str(reply, AUDIO_PARAMETER_KEY_VOLUME_BOOST, value);
}
+ /* Handle audio calibration keys */
+ get_audiocal(platform, query, reply);
native_audio_get_params(query, reply, value, sizeof(value));
ret = str_parms_get_str(query, AUDIO_PARAMETER_IS_HW_DECODER_SESSION_AVAILABLE,
@@ -4764,6 +5068,7 @@
case USECASE_AUDIO_PLAYBACK_DEEP_BUFFER:
case USECASE_AUDIO_PLAYBACK_MULTI_CH:
case USECASE_AUDIO_PLAYBACK_OFFLOAD:
+ case USECASE_AUDIO_PLAYBACK_OFFLOAD2:
needs_event = true;
break;
/* concurrent playback in low latency allowed */
@@ -5627,7 +5932,7 @@
ALOGV("%s: enter with device %s\n",
__func__, platform_get_snd_device_name(device));
- if ((device <= SND_DEVICE_MIN) || (device >= SND_DEVICE_MAX)) {
+ if ((device < SND_DEVICE_MIN) || (device >= SND_DEVICE_MAX)) {
ALOGE("%s: Invalid snd_device = %d", __func__, device);
be_dai_id = -EINVAL;
goto done;
@@ -6125,6 +6430,17 @@
{
//reset ext display EDID info
struct platform_data *my_data = (struct platform_data *)platform;
+ struct audio_device *adev = my_data->adev;
+ struct audio_backend_cfg backend_cfg;
+ int backend_idx;
+ snd_device_t snd_device;
+
+ backend_cfg.sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ backend_cfg.channels = DEFAULT_HDMI_OUT_CHANNELS;
+ backend_cfg.bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
+ backend_cfg.format = 0;
+ backend_cfg.passthrough_enabled = false;
+
my_data->edid_valid = false;
if (my_data->edid_info) {
memset(my_data->edid_info, 0, sizeof(struct edid_audio_info));
@@ -6132,15 +6448,17 @@
if (my_data->ext_disp_type == EXT_DISPLAY_TYPE_HDMI) {
//reset HDMI_RX_BACKEND to default values
- my_data->current_backend_cfg[HDMI_RX_BACKEND].sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
- my_data->current_backend_cfg[HDMI_RX_BACKEND].channels = DEFAULT_HDMI_OUT_CHANNELS;
- my_data->current_backend_cfg[HDMI_RX_BACKEND].bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
+ backend_idx = HDMI_RX_BACKEND;
+ snd_device = SND_DEVICE_OUT_HDMI;
} else {
//reset Display port BACKEND to default values
- my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
- my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].channels = DEFAULT_HDMI_OUT_CHANNELS;
- my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
+ backend_idx = DISP_PORT_RX_BACKEND;
+ snd_device = SND_DEVICE_OUT_DISPLAY_PORT;
}
+ platform_set_codec_backend_cfg(adev, snd_device, backend_cfg);
+ my_data->current_backend_cfg[backend_idx].sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ my_data->current_backend_cfg[backend_idx].channels = DEFAULT_HDMI_OUT_CHANNELS;
+ my_data->current_backend_cfg[backend_idx].bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
my_data->ext_disp_type = EXT_DISPLAY_TYPE_NONE;
}
diff --git a/hal/msm8916/platform.h b/hal/msm8916/platform.h
index 5fc124d..76f9d78 100644
--- a/hal/msm8916/platform.h
+++ b/hal/msm8916/platform.h
@@ -139,6 +139,8 @@
SND_DEVICE_OUT_VOIP_SPEAKER,
SND_DEVICE_OUT_VOIP_HEADPHONES,
#endif
+ SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES,
+ SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET,
SND_DEVICE_OUT_END,
/*
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 0bdebff..0094c0c 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -233,6 +233,7 @@
bool fluence_in_voice_call;
bool fluence_in_voice_rec;
bool fluence_in_audio_rec;
+ bool fluence_in_hfp_call;
bool external_spk_1;
bool external_spk_2;
bool external_mic;
@@ -408,6 +409,9 @@
[SND_DEVICE_OUT_ANC_FB_HEADSET] = "anc-fb-headphones",
[SND_DEVICE_OUT_VOICE_ANC_HEADSET] = "voice-anc-headphones",
[SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET] = "voice-anc-fb-headphones",
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = "voice-speaker-and-voice-headphones",
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = "voice-speaker-and-voice-anc-headphones",
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_FB_HEADSET] = "voice-speaker-and-voice-anc-fb-headphones",
[SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET] = "speaker-and-anc-headphones",
[SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET] = "speaker-and-anc-fb-headphones",
[SND_DEVICE_OUT_ANC_HANDSET] = "anc-handset",
@@ -517,6 +521,9 @@
[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = 14,
[SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,
[SND_DEVICE_OUT_VOICE_LINE] = 10,
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = 10,
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = 10,
+ [SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_FB_HEADSET] = 10,
[SND_DEVICE_OUT_HDMI] = 18,
[SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 14,
[SND_DEVICE_OUT_DISPLAY_PORT] = 18,
@@ -1223,6 +1230,9 @@
backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = strdup("voice-speaker-2-vbat");
backend_tag_table[SND_DEVICE_OUT_BT_A2DP] = strdup("bt-a2dp");
backend_tag_table[SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP] = strdup("speaker-and-bt-a2dp");
+ backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = strdup("speaker-and-headphones");
+ backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = strdup("speaker-and-headphones");
+ backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_FB_HEADSET] = strdup("speaker-and-headphones");
hw_interface_table[SND_DEVICE_OUT_HANDSET] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER] = strdup("SLIMBUS_0_RX");
@@ -1235,6 +1245,9 @@
hw_interface_table[SND_DEVICE_OUT_HEADPHONES_DSD] = strdup("SLIMBUS_2_RX");
hw_interface_table[SND_DEVICE_OUT_HEADPHONES_44_1] = strdup("SLIMBUS_5_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_FB_HEADSET] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_LINE] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
@@ -1269,12 +1282,12 @@
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET] = strdup("SLIMBUS_0_RX-and-SLIMBUS_6_RX");
hw_interface_table[SND_DEVICE_OUT_ANC_HANDSET] = strdup("SLIMBUS_0_RX");
- hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_4_TX");
- hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = strdup("SLIMBUS_4_TX");
+ hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
+ hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_SPEAKER_WSA] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = strdup("SLIMBUS_0_RX");
hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA] = strdup("SLIMBUS_0_RX");
@@ -1847,6 +1860,7 @@
my_data->fluence_in_voice_call = false;
my_data->fluence_in_voice_rec = false;
my_data->fluence_in_audio_rec = false;
+ my_data->fluence_in_hfp_call = false;
my_data->external_spk_1 = false;
my_data->external_spk_2 = false;
my_data->external_mic = false;
@@ -1895,6 +1909,11 @@
if (!strncmp("broadside", value, sizeof("broadside"))) {
my_data->fluence_mode = FLUENCE_BROADSIDE;
}
+
+ property_get("persist.audio.fluence.hfpcall",value,"");
+ if (!strncmp("true", value, sizeof("true"))) {
+ my_data->fluence_in_hfp_call = true;
+ }
}
/* Check if Vbat speaker enabled property is set, this should be done before acdb init */
@@ -2056,10 +2075,10 @@
/* obtain source mic type from max mic count*/
get_source_mic_type(my_data);
ALOGD("%s: Fluence_Type(%d) max_mic_count(%d) mic_type(0x%x) fluence_in_voice_call(%d)"
- " fluence_in_voice_rec(%d) fluence_in_spkr_mode(%d) ",
+ " fluence_in_voice_rec(%d) fluence_in_spkr_mode(%d) fluence_in_hfp_call(%d) ",
__func__, my_data->fluence_type, my_data->max_mic_count, my_data->source_mic_type,
my_data->fluence_in_voice_call, my_data->fluence_in_voice_rec,
- my_data->fluence_in_spkr_mode);
+ my_data->fluence_in_spkr_mode, my_data->fluence_in_hfp_call);
/* init usb */
audio_extn_usb_init(adev);
@@ -3106,6 +3125,36 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET &&
+ !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_ANC_HEADSET)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
+ ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET &&
+ !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_ANC_FB_HEADSET)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
+ ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES &&
+ !platform_check_backends_match(SND_DEVICE_OUT_VOICE_SPEAKER, SND_DEVICE_OUT_VOICE_HEADPHONES)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_VOICE_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_VOICE_HEADPHONES;
+ ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET &&
+ !platform_check_backends_match(SND_DEVICE_OUT_VOICE_SPEAKER, SND_DEVICE_OUT_VOICE_ANC_HEADSET)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_VOICE_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_VOICE_ANC_HEADSET;
+ ret = 0;
+ } else if (snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_FB_HEADSET &&
+ !platform_check_backends_match(SND_DEVICE_OUT_VOICE_SPEAKER, SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET)) {
+ *num_devices = 2;
+ new_snd_devices[0] = SND_DEVICE_OUT_VOICE_SPEAKER;
+ new_snd_devices[1] = SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET;
+ ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_HDMI &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_HDMI)) {
*num_devices = 2;
@@ -3196,27 +3245,52 @@
}
if (popcount(devices) == 2) {
+ bool is_active_voice_call = false;
+
+ /*
+ * This is special case handling for combo device use case during
+ * voice call. APM route use case to combo device if stream type is
+ * enforced audible (e.g. Camera shutter sound).
+ */
+ if ((mode == AUDIO_MODE_IN_CALL) ||
+ voice_is_in_call(adev) ||
+ voice_extn_compress_voip_is_active(adev))
+ is_active_voice_call = true;
+
if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
AUDIO_DEVICE_OUT_SPEAKER)) {
if (my_data->external_spk_1)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1;
else if (my_data->external_spk_2)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2;
+ else if (is_active_voice_call)
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES;
else
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
} else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET |
AUDIO_DEVICE_OUT_SPEAKER)) {
if (audio_extn_get_anc_enabled()) {
- if (audio_extn_should_use_fb_anc())
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET;
+ if (audio_extn_should_use_fb_anc()) {
+ if (is_active_voice_call)
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_FB_HEADSET;
+ else
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET;
+ } else {
+ if (is_active_voice_call)
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET;
+ else
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET;
+ }
} else if (my_data->external_spk_1)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1;
else if (my_data->external_spk_2)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
+ else {
+ if (is_active_voice_call)
+ snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES;
+ else
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
+ }
} else if (devices == (AUDIO_DEVICE_OUT_LINE |
AUDIO_DEVICE_OUT_SPEAKER)) {
snd_device = SND_DEVICE_OUT_SPEAKER_AND_LINE;
@@ -3487,7 +3561,8 @@
}
adev->acdb_settings |= ANC_FLAG;
} else if (my_data->fluence_type == FLUENCE_NONE ||
- my_data->fluence_in_voice_call == false) {
+ my_data->fluence_in_voice_call == false ||
+ my_data->fluence_in_hfp_call == false) {
snd_device = SND_DEVICE_IN_HANDSET_MIC;
if (audio_extn_hfp_is_active(adev))
platform_set_echo_reference(adev, true, out_device);
@@ -3512,7 +3587,8 @@
}
} else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {
if (my_data->fluence_type != FLUENCE_NONE &&
- my_data->fluence_in_voice_call &&
+ (my_data->fluence_in_voice_call ||
+ my_data->fluence_in_hfp_call) &&
my_data->fluence_in_spkr_mode) {
if((my_data->fluence_type & FLUENCE_QUAD_MIC) &&
(my_data->source_mic_type & SOURCE_QUAD_MIC)) {
@@ -4697,9 +4773,55 @@
return needs_event;
}
-bool platform_sound_trigger_usecase_needs_event(audio_usecase_t uc_id __unused)
+bool platform_sound_trigger_usecase_needs_event(audio_usecase_t uc_id)
{
- return false;
+ bool needs_event = false;
+
+ switch(uc_id){
+ /* concurrent playback usecases needs event */
+ case USECASE_AUDIO_PLAYBACK_DEEP_BUFFER:
+ case USECASE_AUDIO_PLAYBACK_MULTI_CH:
+ case USECASE_AUDIO_PLAYBACK_OFFLOAD:
+ case USECASE_AUDIO_PLAYBACK_OFFLOAD2:
+ needs_event = true;
+ break;
+ /* concurrent playback in low latency allowed */
+ case USECASE_AUDIO_PLAYBACK_LOW_LATENCY:
+ break;
+ /* concurrent playback FM needs event */
+ case USECASE_AUDIO_PLAYBACK_FM:
+ needs_event = true;
+ break;
+
+ /* concurrent capture usecases, no event, capture handled by device
+ * USECASE_AUDIO_RECORD:
+ * USECASE_AUDIO_RECORD_COMPRESS:
+ * USECASE_AUDIO_RECORD_LOW_LATENCY:
+
+ * USECASE_VOICE_CALL:
+ * USECASE_VOICE2_CALL:
+ * USECASE_VOLTE_CALL:
+ * USECASE_QCHAT_CALL:
+ * USECASE_VOWLAN_CALL:
+ * USECASE_VOICEMMODE1_CALL:
+ * USECASE_VOICEMMODE2_CALL:
+ * USECASE_COMPRESS_VOIP_CALL:
+ * USECASE_AUDIO_RECORD_FM_VIRTUAL:
+ * USECASE_INCALL_REC_UPLINK:
+ * USECASE_INCALL_REC_DOWNLINK:
+ * USECASE_INCALL_REC_UPLINK_AND_DOWNLINK:
+ * USECASE_INCALL_REC_UPLINK_COMPRESS:
+ * USECASE_INCALL_REC_DOWNLINK_COMPRESS:
+ * USECASE_INCALL_REC_UPLINK_AND_DOWNLINK_COMPRESS:
+ * USECASE_INCALL_MUSIC_UPLINK:
+ * USECASE_INCALL_MUSIC_UPLINK2:
+ * USECASE_AUDIO_SPKR_CALIB_RX:
+ * USECASE_AUDIO_SPKR_CALIB_TX:
+ */
+ default:
+ ALOGV("%s:usecase_id[%d] no need to raise event.", __func__, uc_id);
+ }
+ return needs_event;
}
/* Read offload buffer size from a property.
@@ -5487,7 +5609,7 @@
ALOGV("%s: enter with device %d\n", __func__, device);
- if ((device <= SND_DEVICE_MIN) || (device >= SND_DEVICE_MAX)) {
+ if ((device < SND_DEVICE_MIN) || (device >= SND_DEVICE_MAX)) {
ALOGE("%s: Invalid snd_device = %d",
__func__, device);
be_dai_id = -EINVAL;
@@ -5989,6 +6111,17 @@
{
//reset ext display EDID info
struct platform_data *my_data = (struct platform_data *)platform;
+ struct audio_device *adev = my_data->adev;
+ struct audio_backend_cfg backend_cfg;
+ int backend_idx;
+ snd_device_t snd_device;
+
+ backend_cfg.sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ backend_cfg.channels = DEFAULT_HDMI_OUT_CHANNELS;
+ backend_cfg.bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
+ backend_cfg.format = 0;
+ backend_cfg.passthrough_enabled = false;
+
my_data->edid_valid = false;
if (my_data->edid_info) {
memset(my_data->edid_info, 0, sizeof(struct edid_audio_info));
@@ -5996,15 +6129,17 @@
if (my_data->ext_disp_type == EXT_DISPLAY_TYPE_HDMI) {
//reset HDMI_RX_BACKEND to default values
- my_data->current_backend_cfg[HDMI_RX_BACKEND].sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
- my_data->current_backend_cfg[HDMI_RX_BACKEND].channels = DEFAULT_HDMI_OUT_CHANNELS;
- my_data->current_backend_cfg[HDMI_RX_BACKEND].bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
+ backend_idx = HDMI_RX_BACKEND;
+ snd_device = SND_DEVICE_OUT_HDMI;
} else {
//reset Display port BACKEND to default values
- my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
- my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].channels = DEFAULT_HDMI_OUT_CHANNELS;
- my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
+ backend_idx = DISP_PORT_RX_BACKEND;
+ snd_device = SND_DEVICE_OUT_DISPLAY_PORT;
}
+ platform_set_codec_backend_cfg(adev, snd_device, backend_cfg);
+ my_data->current_backend_cfg[backend_idx].sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
+ my_data->current_backend_cfg[backend_idx].channels = DEFAULT_HDMI_OUT_CHANNELS;
+ my_data->current_backend_cfg[backend_idx].bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
my_data->ext_disp_type = EXT_DISPLAY_TYPE_NONE;
}
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 0ce72c6..93e41ed 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -133,6 +133,9 @@
SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA,
SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS,
SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS,
+ SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES,
+ SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET,
+ SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_FB_HEADSET,
SND_DEVICE_OUT_END,
/*
diff --git a/hal/voice_extn/compress_voip.c b/hal/voice_extn/compress_voip.c
index e89d4ac..f23ff5b 100644
--- a/hal/voice_extn/compress_voip.c
+++ b/hal/voice_extn/compress_voip.c
@@ -631,9 +631,9 @@
ALOGD("%s: enter", __func__);
if(voip_data.in_stream_count > 0) {
- adev->active_input = NULL;
voip_data.in_stream_count--;
status = voip_stop_call(adev);
+ adev->active_input = get_next_active_input(adev);
in->pcm = NULL;
}
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk
index d55733a..acc1fdb 100644
--- a/mm-audio/aenc-aac/qdsp6/Android.mk
+++ b/mm-audio/aenc-aac/qdsp6/Android.mk
@@ -40,29 +40,6 @@
include $(BUILD_SHARED_LIBRARY)
-# ---------------------------------------------------------------------------------
-# Make the apps-test (mm-aenc-omxaac-test)
-# ---------------------------------------------------------------------------------
-
-include $(CLEAR_VARS)
-
-mm-aac-enc-test-inc := $(LOCAL_PATH)/inc
-mm-aac-enc-test-inc += $(LOCAL_PATH)/test
-mm-aac-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
-mm-aac-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-
-LOCAL_MODULE := mm-aenc-omxaac-test
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := $(libOmxAacEnc-def)
-LOCAL_C_INCLUDES := $(mm-aac-enc-test-inc)
-LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libmm-omxcore
-LOCAL_SHARED_LIBRARIES += libOmxAacEnc
-LOCAL_SHARED_LIBRARIES += libaudioalsa
-LOCAL_SRC_FILES := test/omx_aac_enc_test.c
-
-include $(BUILD_EXECUTABLE)
-
endif
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-aac/qdsp6/Makefile b/mm-audio/aenc-aac/qdsp6/Makefile
index 5421d45..e9da876 100644
--- a/mm-audio/aenc-aac/qdsp6/Makefile
+++ b/mm-audio/aenc-aac/qdsp6/Makefile
@@ -39,7 +39,7 @@
# ---------------------------------------------------------------------------------
# BUILD
# ---------------------------------------------------------------------------------
-all: libOmxAacEnc.so.$(LIBVER) mm-aenc-omxaac-test
+all: libOmxAacEnc.so.$(LIBVER)
install:
echo "intalling aenc-aac in $(DESTDIR)"
@@ -49,8 +49,7 @@
install -m 555 libOmxAacEnc.so.$(LIBVER) $(LIBINSTALLDIR)
cd $(LIBINSTALLDIR) && ln -s libOmxAacEnc.so.$(LIBVER) libOmxAacEnc.so.$(LIBMAJOR)
cd $(LIBINSTALLDIR) && ln -s libOmxAacEnc.so.$(LIBMAJOR) libOmxAacEnc.so
- install -m 555 mm-aenc-omxaac-test $(BININSTALLDIR)
-
+
# ---------------------------------------------------------------------------------
# COMPILE LIBRARY
# ---------------------------------------------------------------------------------
@@ -65,17 +64,5 @@
$(CC) $(CPPFLAGS) $(CFLAGS_SO) $(LDFLAGS_SO) -Wl,-soname,libOmxAacEnc.so.$(LIBMAJOR) -o $@ $^ $(LDFLAGS) $(LDLIBS)
# ---------------------------------------------------------------------------------
-# COMPILE TEST APP
-# ---------------------------------------------------------------------------------
-TEST_LDLIBS := -lpthread
-TEST_LDLIBS += -ldl
-TEST_LDLIBS += -lOmxCore
-
-TEST_SRCS := test/omx_aac_enc_test.c
-
-mm-aenc-omxaac-test: libOmxAacEnc.so.$(LIBVER) $(TEST_SRCS)
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
-
-# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-aac/qdsp6/Makefile.am b/mm-audio/aenc-aac/qdsp6/Makefile.am
index cb89ec1..2f63d0a 100644
--- a/mm-audio/aenc-aac/qdsp6/Makefile.am
+++ b/mm-audio/aenc-aac/qdsp6/Makefile.am
@@ -26,7 +26,3 @@
libOmxAacEnc_la_CPPFLAGS = $(AM_CPPFLAGS) -fPIC $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy
libOmxAacEnc_la_LIBADD = -lmm-omxcore -lstdc++ -lpthread $(GLIB_LIBS) -ldl -llog
libOmxAacEnc_la_LDFLAGS = -shared $(GLIB_LIBS) -avoid-version $(OMXAUDIO_LIBRARY_VERSION)
-
-bin_PROGRAMS = mm-aenc-omxaac-test
-mm_aenc_omxaac_test_SOURCES = ./test/omx_aac_enc_test.c
-mm_aenc_omxaac_test_LDADD = -lmm-omxcore -ldl -lpthread -llog libOmxAacEnc.la
diff --git a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp
index 8b5c480..3a25c87 100644
--- a/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp
+++ b/mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
-Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.
+Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -4178,14 +4178,25 @@
DEBUG_DETAIL("FTBP->Al_len[%lu]buf[%p]size[%d]numOutBuf[%d]\n",\
buffer->nAllocLen,m_tmp_out_meta_buf,
nReadbytes,nNumOutputBuf);
- if(*m_tmp_out_meta_buf <= 0)
+ if(m_tmp_out_meta_buf == NULL)
+ return OMX_ErrorUndefined;
+
+ if(*m_tmp_out_meta_buf <= 0 || *m_tmp_out_meta_buf > CHAR_MAX)
return OMX_ErrorBadParameter;
- szadifhr = AUDAAC_MAX_ADIF_HEADER_LENGTH;
+ szadifhr = AUDAAC_MAX_ADIF_HEADER_LENGTH;
numframes = *m_tmp_out_meta_buf;
metainfo = (int)((sizeof(ENC_META_OUT) * numframes)+
- sizeof(unsigned char));
+ sizeof(unsigned char));
+ /*
+ * add bounds checking
+ */
+ if ((metainfo > INT_MAX - szadifhr) ||
+ (buffer->nAllocLen < (nReadbytes + szadifhr)) ||
+ (metainfo > nReadbytes)) {
+ return OMX_ErrorBadParameter;
+ }
audaac_rec_install_adif_header_variable(0,sample_idx,
- (OMX_U8)m_aac_param.nChannels);
+ (OMX_U8)m_aac_param.nChannels);
memcpy(buffer->pBuffer,m_tmp_out_meta_buf,metainfo);
memcpy(buffer->pBuffer + metainfo,&audaac_header_adif[0],szadifhr);
memcpy(buffer->pBuffer + metainfo + szadifhr,
diff --git a/mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c b/mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c
deleted file mode 100644
index 43c676b..0000000
--- a/mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c
+++ /dev/null
@@ -1,1295 +0,0 @@
-/*--------------------------------------------------------------------------
-Copyright (c) 2010-2014,2016 The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of The Linux Foundation nor
- the names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------*/
-
-
-/*
- An Open max test application ....
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include "OMX_Core.h"
-#include "OMX_Component.h"
-#include "pthread.h"
-#include <signal.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include<unistd.h>
-#include<string.h>
-#include <pthread.h>
-#include "QOMX_AudioExtensions.h"
-#include "QOMX_AudioIndexExtensions.h"
-#ifdef AUDIOV2
-#include "control.h"
-#endif
-#include <linux/ioctl.h>
-
-typedef unsigned char uint8;
-typedef unsigned char byte;
-typedef unsigned int uint32;
-typedef unsigned int uint16;
-#define AUDAAC_MAX_ADIF_HEADER_LENGTH 64
-/* ADTS variable frame header, frame length field */
-#define AUDAAC_ADTS_FRAME_LENGTH_SIZE 13
-QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam;
-void audaac_rec_install_bits
-(
- uint8 *input,
- byte num_bits_reqd,
- uint32 value,
- uint16 *hdr_bit_index
-);
-
-/* maximum ADTS frame header length */
-#define AUDAAC_MAX_ADTS_HEADER_LENGTH 7
-void audaac_rec_install_adts_header_variable (uint16 byte_num);
-void Release_Encoder();
-
-#ifdef AUDIOV2
-unsigned short session_id;
-int device_id;
-int control = 0;
-const char *device="handset_tx";
-#define DIR_TX 2
-#endif
-
-#define AACHDR_LAYER_SIZE 2
-#define AACHDR_CRC_SIZE 1
-#define AAC_PROFILE_SIZE 2
-#define AAC_SAMPLING_FREQ_INDEX_SIZE 4
-#define AAC_ORIGINAL_COPY_SIZE 1
-#define AAC_HOME_SIZE 1
-
-#define MIN(A,B) (((A) < (B))?(A):(B))
-
-uint8 audaac_header[AUDAAC_MAX_ADTS_HEADER_LENGTH];
-unsigned int audaac_hdr_bit_index;
-
-
-FILE *F1 = NULL;
-
-uint32_t aac_samplerate = 0;
-uint32_t pcm_samplerate = 0;
-uint32_t aac_channels = 0;
-uint32_t pcm_channels = 0;
-uint32_t bitrate = 128000;
-uint32_t pcmplayback = 0;
-uint32_t tunnel = 0;
-uint32_t rectime = 0;
-uint32_t format = 1;
-uint32_t profile = OMX_AUDIO_AACObjectLC;
-#define DEBUG_PRINT printf
-unsigned to_idle_transition = 0;
-
-typedef enum adts_sample_index__ {
-
-ADTS_SAMPLE_INDEX_96000=0x0,
-ADTS_SAMPLE_INDEX_88200,
-ADTS_SAMPLE_INDEX_64000,
-ADTS_SAMPLE_INDEX_48000,
-ADTS_SAMPLE_INDEX_44100,
-ADTS_SAMPLE_INDEX_32000,
-ADTS_SAMPLE_INDEX_24000,
-ADTS_SAMPLE_INDEX_22050,
-ADTS_SAMPLE_INDEX_16000,
-ADTS_SAMPLE_INDEX_12000,
-ADTS_SAMPLE_INDEX_11025,
-ADTS_SAMPLE_INDEX_8000,
-ADTS_SAMPLE_INDEX_7350,
-ADTS_SAMPLE_INDEX_MAX
-
-}adts_sample_index;
-/************************************************************************/
-/* #DEFINES */
-/************************************************************************/
-#define false 0
-#define true 1
-
-#define CONFIG_VERSION_SIZE(param) \
- param.nVersion.nVersion = CURRENT_OMX_SPEC_VERSION;\
- param.nSize = sizeof(param);
-
-#define FAILED(result) (result != OMX_ErrorNone)
-
-#define SUCCEEDED(result) (result == OMX_ErrorNone)
-
-/************************************************************************/
-/* GLOBAL DECLARATIONS */
-/************************************************************************/
-
-pthread_mutex_t lock;
-pthread_cond_t cond;
-pthread_mutex_t elock;
-pthread_cond_t econd;
-pthread_cond_t fcond;
-pthread_mutex_t etb_lock;
-pthread_mutex_t etb_lock1;
-pthread_cond_t etb_cond;
-FILE * inputBufferFile;
-FILE * outputBufferFile;
-OMX_PARAM_PORTDEFINITIONTYPE inputportFmt;
-OMX_PARAM_PORTDEFINITIONTYPE outputportFmt;
-OMX_AUDIO_PARAM_AACPROFILETYPE aacparam;
-OMX_AUDIO_PARAM_PCMMODETYPE pcmparam;
-OMX_PORT_PARAM_TYPE portParam;
-OMX_ERRORTYPE error;
-
-
-
-
-#define ID_RIFF 0x46464952
-#define ID_WAVE 0x45564157
-#define ID_FMT 0x20746d66
-#define ID_DATA 0x61746164
-
-#define FORMAT_PCM 1
-
-struct wav_header {
- uint32_t riff_id;
- uint32_t riff_sz;
- uint32_t riff_fmt;
- uint32_t fmt_id;
- uint32_t fmt_sz;
- uint16_t audio_format;
- uint16_t num_channels;
- uint32_t sample_rate;
- uint32_t byte_rate; /* sample_rate * num_channels * bps / 8 */
- uint16_t block_align; /* num_channels * bps / 8 */
- uint16_t bits_per_sample;
- uint32_t data_id;
- uint32_t data_sz;
-};
-struct enc_meta_out{
- unsigned int offset_to_frame;
- unsigned int frame_size;
- unsigned int encoded_pcm_samples;
- unsigned int msw_ts;
- unsigned int lsw_ts;
- unsigned int nflags;
-} __attribute__ ((packed));
-
-static int totaldatalen = 0;
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-unsigned int input_buf_cnt = 0;
-unsigned int output_buf_cnt = 0;
-int used_ip_buf_cnt = 0;
-volatile int event_is_done = 0;
-volatile int ebd_event_is_done = 0;
-volatile int fbd_event_is_done = 0;
-volatile int etb_event_is_done = 0;
-int ebd_cnt;
-int bInputEosReached = 0;
-int bOutputEosReached = 0;
-int bInputEosReached_tunnel = 0;
-static int etb_done = 0;
-int bFlushing = false;
-int bPause = false;
-const char *in_filename;
-const char *out_filename;
-
-int timeStampLfile = 0;
-int timestampInterval = 100;
-
-//* OMX Spec Version supported by the wrappers. Version = 1.1 */
-const OMX_U32 CURRENT_OMX_SPEC_VERSION = 0x00000101;
-OMX_COMPONENTTYPE* aac_enc_handle = 0;
-
-OMX_BUFFERHEADERTYPE **pInputBufHdrs = NULL;
-OMX_BUFFERHEADERTYPE **pOutputBufHdrs = NULL;
-
-/************************************************************************/
-/* GLOBAL FUNC DECL */
-/************************************************************************/
-int Init_Encoder(char*);
-int Play_Encoder();
-OMX_STRING aud_comp;
-/**************************************************************************/
-/* STATIC DECLARATIONS */
-/**************************************************************************/
-
-static int open_audio_file ();
-static int Read_Buffer(OMX_BUFFERHEADERTYPE *pBufHdr );
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *aac_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize);
-
-
-static OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData);
-static OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-
-static OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-static OMX_ERRORTYPE parse_pcm_header();
-void wait_for_event(void)
-{
- pthread_mutex_lock(&lock);
- DEBUG_PRINT("%s: event_is_done=%d", __FUNCTION__, event_is_done);
- while (event_is_done == 0) {
- pthread_cond_wait(&cond, &lock);
- }
- event_is_done = 0;
- pthread_mutex_unlock(&lock);
-}
-
-void event_complete(void )
-{
- pthread_mutex_lock(&lock);
- if (event_is_done == 0) {
- event_is_done = 1;
- pthread_cond_broadcast(&cond);
- }
- pthread_mutex_unlock(&lock);
-}
-
-void etb_wait_for_event(void)
-{
- pthread_mutex_lock(&etb_lock1);
- DEBUG_PRINT("%s: etb_event_is_done=%d", __FUNCTION__, etb_event_is_done);
- while (etb_event_is_done == 0) {
- pthread_cond_wait(&etb_cond, &etb_lock1);
- }
- etb_event_is_done = 0;
- pthread_mutex_unlock(&etb_lock1);
-}
-
-void etb_event_complete(void )
-{
- pthread_mutex_lock(&etb_lock1);
- if (etb_event_is_done == 0) {
- etb_event_is_done = 1;
- pthread_cond_broadcast(&etb_cond);
- }
- pthread_mutex_unlock(&etb_lock1);
-}
-
-
-OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData)
-{
- DEBUG_PRINT("Function %s \n", __FUNCTION__);
- /* To remove warning for unused variable to keep prototype same */
- (void)hComponent;
- (void)pAppData;
- (void)pEventData;
-
- switch(eEvent) {
- case OMX_EventCmdComplete:
- DEBUG_PRINT("\n OMX_EventCmdComplete event=%d data1=%u data2=%u\n",(OMX_EVENTTYPE)eEvent,
- nData1,nData2);
- event_complete();
- break;
- case OMX_EventError:
- DEBUG_PRINT("\n OMX_EventError \n");
- break;
- case OMX_EventBufferFlag:
- DEBUG_PRINT("\n OMX_EventBufferFlag \n");
- bOutputEosReached = true;
- event_complete();
- break;
- case OMX_EventPortSettingsChanged:
- DEBUG_PRINT("\n OMX_EventPortSettingsChanged \n");
- break;
- default:
- DEBUG_PRINT("\n Unknown Event \n");
- break;
- }
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- size_t bytes_writen = 0;
- size_t total_bytes_writen = 0;
- size_t len = 0;
- struct enc_meta_out *meta = NULL;
- OMX_U8 *src = pBuffer->pBuffer;
- unsigned int num_of_frames = 1;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- if(((pBuffer->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
- DEBUG_PRINT("FBD::EOS on output port\n ");
- bOutputEosReached = true;
- return OMX_ErrorNone;
- }
- if(bInputEosReached_tunnel || bOutputEosReached)
- {
- DEBUG_PRINT("EOS REACHED NO MORE PROCESSING OF BUFFERS\n");
- return OMX_ErrorNone;
- }
- if(num_of_frames != src[0]){
-
- printf("Data corrupt\n");
- return OMX_ErrorNone;
- }
- /* Skip the first bytes */
-
-
-
- src += sizeof(unsigned char);
- meta = (struct enc_meta_out *)src;
- while (num_of_frames > 0) {
- meta = (struct enc_meta_out *)src;
- /*printf("offset=%d framesize=%d encoded_pcm[%d] msw_ts[%d]lsw_ts[%d] nflags[%d]\n",
- meta->offset_to_frame,
- meta->frame_size,
- meta->encoded_pcm_samples, meta->msw_ts, meta->lsw_ts, meta->nflags);*/
- len = meta->frame_size;
-
- if(format == 6)
- {
- audaac_rec_install_adts_header_variable((uint16_t)(len + AUDAAC_MAX_ADTS_HEADER_LENGTH));
- bytes_writen = fwrite(audaac_header,1,AUDAAC_MAX_ADTS_HEADER_LENGTH,outputBufferFile);
- if(bytes_writen < AUDAAC_MAX_ADTS_HEADER_LENGTH)
- {
- DEBUG_PRINT("error: invalid adts header length\n");
- return OMX_ErrorNone;
- }
- }
- bytes_writen = fwrite(pBuffer->pBuffer + sizeof(unsigned char) + meta->offset_to_frame,1,len,outputBufferFile);
- if(bytes_writen < len)
- {
- DEBUG_PRINT("error: invalid AAC encoded data \n");
- return OMX_ErrorNone;
- }
- src += sizeof(struct enc_meta_out);
- num_of_frames--;
- total_bytes_writen += len;
- }
- DEBUG_PRINT(" FillBufferDone size writen to file %zu\n",total_bytes_writen);
- totaldatalen = totaldatalen + (int)total_bytes_writen;
-
- DEBUG_PRINT(" FBD calling FTB\n");
- OMX_FillThisBuffer(hComponent,pBuffer);
-
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- int readBytes =0;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- ebd_cnt++;
- used_ip_buf_cnt--;
- pthread_mutex_lock(&etb_lock);
- if(!etb_done)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT("Wait till first set of buffers are given to component\n");
- DEBUG_PRINT("\n*********************************************\n");
- etb_done++;
- pthread_mutex_unlock(&etb_lock);
- etb_wait_for_event();
- }
- else
- {
- pthread_mutex_unlock(&etb_lock);
- }
-
-
- if(bInputEosReached)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT(" EBD::EOS on input port\n ");
- DEBUG_PRINT("*********************************************\n");
- return OMX_ErrorNone;
- }else if (bFlushing == true) {
- DEBUG_PRINT("omx_aac_adec_test: bFlushing is set to TRUE used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- if (used_ip_buf_cnt == 0) {
- bFlushing = false;
- } else {
- DEBUG_PRINT("omx_aac_adec_test: more buffer to come back used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- return OMX_ErrorNone;
- }
- }
-
- if((readBytes = Read_Buffer(pBuffer)) > 0) {
- pBuffer->nFilledLen = (OMX_U32)readBytes;
- used_ip_buf_cnt++;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- }
- else{
- pBuffer->nFlags |= OMX_BUFFERFLAG_EOS;
- used_ip_buf_cnt++;
- bInputEosReached = true;
- pBuffer->nFilledLen = 0;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- DEBUG_PRINT("EBD..Either EOS or Some Error while reading file\n");
- }
- return OMX_ErrorNone;
-}
-
-void signal_handler(int sig_id) {
-
- /* Flush */
- if (sig_id == SIGUSR1) {
- DEBUG_PRINT("%s Initiate flushing\n", __FUNCTION__);
- bFlushing = true;
- OMX_SendCommand(aac_enc_handle, OMX_CommandFlush, OMX_ALL, NULL);
- } else if (sig_id == SIGUSR2) {
- if (bPause == true) {
- DEBUG_PRINT("%s resume playback\n", __FUNCTION__);
- bPause = false;
- OMX_SendCommand(aac_enc_handle, OMX_CommandStateSet, OMX_StateExecuting, NULL);
- } else {
- DEBUG_PRINT("%s pause playback\n", __FUNCTION__);
- bPause = true;
- OMX_SendCommand(aac_enc_handle, OMX_CommandStateSet, OMX_StatePause, NULL);
- }
- }
-}
-
-int main(int argc, char **argv)
-{
- unsigned int bufCnt=0;
- OMX_ERRORTYPE result;
-
- struct sigaction sa;
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = &signal_handler;
- sigaction(SIGABRT, &sa, NULL);
- sigaction(SIGUSR1, &sa, NULL);
- sigaction(SIGUSR2, &sa, NULL);
-
- (void) signal(SIGINT, Release_Encoder);
-
- pthread_cond_init(&cond, 0);
- pthread_mutex_init(&lock, 0);
- pthread_cond_init(&etb_cond, 0);
- pthread_mutex_init(&etb_lock, 0);
- pthread_mutex_init(&etb_lock1, 0);
-
- if (argc >= 9) {
- in_filename = argv[1];
- out_filename = argv[2];
- aac_samplerate = (uint32_t)atoi(argv[3]);
- aac_channels = (uint32_t)atoi(argv[4]);
- tunnel = (uint32_t)atoi(argv[5]);
- rectime = (uint32_t)atoi(argv[6]);
- bitrate = (uint32_t)atoi(argv[7]);
- format = (uint32_t)atoi(argv[8]);
- profile = (uint32_t)atoi(argv[9]);
-
- DEBUG_PRINT("Input parameters: aac_samplerate = %d, channels = %d, tunnel = %d,"
- " rectime = %d, bitrate = %d, format = %d, profile = %d\n",
- aac_samplerate, aac_channels, tunnel, rectime, bitrate, format, profile);
-
- if (!((profile == 2) || (profile == 5) || (profile == 29))) {
- DEBUG_PRINT("profile = %d, not supported. Supported "
- "profile values are AAC_LC(2), AAC+(5), EAAC+(29)\n", profile);
- return 0;
- }
- if (!((format == 1) || (format == 6))) {
- DEBUG_PRINT("format = %d, not supported. Supported "
- "formats are ADTS(1), RAW(6)\n", format);
- return 0;
- }
- if ((aac_channels > 2) || (aac_channels <= 0)) {
- DEBUG_PRINT("channels = %d, not supported. Supported "
- "number of channels are 1 and 2\n", aac_channels);
- return 0;
- }
- if ((aac_samplerate < 8000) && (aac_samplerate > 48000)) {
- DEBUG_PRINT("samplerate = %d, not supported, Supported "
- "samplerates are 8000, 11025, 12000, 16000, 22050, "
- "24000, 32000, 44100, 48000\n", aac_samplerate);
- return 0;
- } else {
- if ((profile == 5) || (profile == 29)) {
- if (aac_samplerate < 24000) {
- DEBUG_PRINT("samplerate = %d, not supported for AAC+/EAAC+."
- " Supported samplerates are 24000, 32000,"
- " 44100, 48000\n", aac_samplerate);
- return 0;
- }
- }
- }
- } else {
- DEBUG_PRINT(" invalid format: \n");
- DEBUG_PRINT("ex: ./mm-aenc-omxaac INPUTFILE AAC_OUTPUTFILE SAMPFREQ CHANNEL TUNNEL RECORDTIME BITRATE FORMAT PROFILE\n");
- DEBUG_PRINT("FOR TUNNEL MOD PASS INPUT FILE AS ZERO\n");
- DEBUG_PRINT("RECORDTIME in seconds for AST Automation ...TUNNEL MODE ONLY\n");
- DEBUG_PRINT("FORMAT::ADTS(1), RAW(6)\n");
- DEBUG_PRINT("BITRATE in bits/sec \n");
- DEBUG_PRINT("PROFILE::AAC_LC(2), AAC+(5), EAAC+(29)\n");
- return 0;
- }
- if(tunnel == 0)
- aud_comp = "OMX.qcom.audio.encoder.aac";
- else
- aud_comp = "OMX.qcom.audio.encoder.tunneled.aac";
- if(Init_Encoder(aud_comp)!= 0x00)
- {
- DEBUG_PRINT("Decoder Init failed\n");
- return -1;
- }
-
- fcntl(0, F_SETFL, O_NONBLOCK);
-
- if(Play_Encoder() != 0x00)
- {
- DEBUG_PRINT("Play_Decoder failed\n");
- return -1;
- }
-
- // Wait till EOS is reached...
- if(rectime && tunnel)
- {
- sleep(rectime);
- rectime = 0;
- bInputEosReached_tunnel = 1;
- DEBUG_PRINT("\EOS ON INPUT PORT\n");
- }
- else
- {
- wait_for_event();
- }
-
- if((bInputEosReached_tunnel) || ((bOutputEosReached) && !tunnel))
- {
-
- DEBUG_PRINT("\nMoving the decoder to idle state \n");
- OMX_SendCommand(aac_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- wait_for_event();
- DEBUG_PRINT("\nMoving the encoder to loaded state \n");
- OMX_SendCommand(aac_enc_handle, OMX_CommandStateSet, OMX_StateLoaded,0);
- sleep(1);
- if (!tunnel)
- {
- DEBUG_PRINT("\nFillBufferDone: Deallocating i/p buffers \n");
- for(bufCnt=0; bufCnt < input_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(aac_enc_handle, 0, pInputBufHdrs[bufCnt]);
- }
- }
-
- DEBUG_PRINT ("\nFillBufferDone: Deallocating o/p buffers \n");
- for(bufCnt=0; bufCnt < output_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(aac_enc_handle, 1, pOutputBufHdrs[bufCnt]);
- }
- wait_for_event();
-
- result = OMX_FreeHandle(aac_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
- /* Deinit OpenMAX */
- if(tunnel)
- {
- #ifdef AUDIOV2
- if (msm_route_stream(DIR_TX,session_id,device_id, 0))
- {
- DEBUG_PRINT("\ncould not set stream routing\n");
- return -1;
- }
- if (msm_en_device(device_id, 0))
- {
- DEBUG_PRINT("\ncould not enable device\n");
- return -1;
- }
- msm_mixer_close();
- #endif
- }
- OMX_Deinit();
- ebd_cnt=0;
- bOutputEosReached = false;
- bInputEosReached_tunnel = false;
- bInputEosReached = 0;
- aac_enc_handle = NULL;
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- fclose(outputBufferFile);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...AAC ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- }
- return 0;
-}
-
-void Release_Encoder()
-{
- static int cnt=0;
- OMX_ERRORTYPE result;
-
- DEBUG_PRINT("END OF AAC ENCODING: EXITING PLEASE WAIT\n");
- bInputEosReached_tunnel = 1;
- event_complete();
- cnt++;
- if(cnt > 1)
- {
- /* FORCE RESET */
- aac_enc_handle = NULL;
- ebd_cnt=0;
- bInputEosReached_tunnel = false;
-
- result = OMX_FreeHandle(aac_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
-
- OMX_Deinit();
-
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...AAC ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- exit(0);
- }
-}
-
-int Init_Encoder(OMX_STRING audio_component)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE omxresult;
- OMX_U32 total = 0;
- typedef OMX_U8* OMX_U8_PTR;
- char *role ="audio_encoder";
-
- static OMX_CALLBACKTYPE call_back = {
- &EventHandler,&EmptyBufferDone,&FillBufferDone
- };
-
- /* Init. the OpenMAX Core */
- DEBUG_PRINT("\nInitializing OpenMAX Core....\n");
- omxresult = OMX_Init();
-
- if(OMX_ErrorNone != omxresult) {
- DEBUG_PRINT("\n Failed to Init OpenMAX core");
- return -1;
- }
- else {
- DEBUG_PRINT("\nOpenMAX Core Init Done\n");
- }
-
- /* Query for audio decoders*/
- DEBUG_PRINT("Aac_test: Before entering OMX_GetComponentOfRole");
- OMX_GetComponentsOfRole(role, &total, 0);
- DEBUG_PRINT ("\nTotal components of role=%s :%u", role, total);
-
-
- omxresult = OMX_GetHandle((OMX_HANDLETYPE*)(&aac_enc_handle),
- (OMX_STRING)audio_component, NULL, &call_back);
- if (FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to Load the component:%s\n", audio_component);
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nComponent %s is in LOADED state\n", audio_component);
- }
-
- /* Get the port information */
- CONFIG_VERSION_SIZE(portParam);
- omxresult = OMX_GetParameter(aac_enc_handle, OMX_IndexParamAudioInit,
- (OMX_PTR)&portParam);
-
- if(FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to get Port Param\n");
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nportParam.nPorts:%u\n", portParam.nPorts);
- DEBUG_PRINT("\nportParam.nStartPortNumber:%u\n",
- portParam.nStartPortNumber);
- }
- return 0;
-}
-
-int Play_Encoder()
-{
- unsigned int i;
- int Size=0;
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE ret;
- OMX_INDEXTYPE index;
-#ifdef __LP64__
- DEBUG_PRINT("sizeof[%ld]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#else
- DEBUG_PRINT("sizeof[%d]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#endif
-
- /* open the i/p and o/p files based on the video file format passed */
- if(open_audio_file()) {
- DEBUG_PRINT("\n Returning -1");
- return -1;
- }
-
- /* Query the encoder input min buf requirements */
- CONFIG_VERSION_SIZE(inputportFmt);
-
- /* Port for which the Client needs to obtain info */
- inputportFmt.nPortIndex = portParam.nStartPortNumber;
-
- OMX_GetParameter(aac_enc_handle,OMX_IndexParamPortDefinition,&inputportFmt);
- DEBUG_PRINT ("\nEnc Input Buffer Count %u\n", inputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Input Buffer Size %u\n", inputportFmt.nBufferSize);
-
- if(OMX_DirInput != inputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Input Port\n");
- return -1;
- }
-
- pcmparam.nPortIndex = 0;
- pcmparam.nChannels = pcm_channels;
- pcmparam.nSamplingRate = pcm_samplerate;
- OMX_SetParameter(aac_enc_handle,OMX_IndexParamAudioPcm,&pcmparam);
-
-
- /* Query the encoder outport's min buf requirements */
- CONFIG_VERSION_SIZE(outputportFmt);
- /* Port for which the Client needs to obtain info */
- outputportFmt.nPortIndex = portParam.nStartPortNumber + 1;
-
- OMX_GetParameter(aac_enc_handle,OMX_IndexParamPortDefinition,&outputportFmt);
- DEBUG_PRINT ("\nEnc: Output Buffer Count %u\n", outputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Output Buffer Size %u\n", outputportFmt.nBufferSize);
-
- if(OMX_DirOutput != outputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Output Port\n");
- return -1;
- }
-
-
- CONFIG_VERSION_SIZE(aacparam);
-
-
- aacparam.nPortIndex = 1;
- aacparam.nChannels = aac_channels; //2 ; /* 1-> mono 2-> stereo*/
- aacparam.nBitRate = bitrate;
- aacparam.nSampleRate = aac_samplerate;
- aacparam.eChannelMode = OMX_AUDIO_ChannelModeStereo;
- aacparam.eAACStreamFormat = (OMX_AUDIO_AACSTREAMFORMATTYPE)format;
- aacparam.eAACProfile = (OMX_AUDIO_AACPROFILETYPE)profile;
- OMX_SetParameter(aac_enc_handle,OMX_IndexParamAudioAac,&aacparam);
- OMX_GetExtensionIndex(aac_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index);
- OMX_GetParameter(aac_enc_handle,index,&streaminfoparam);
- if(tunnel)
- {
- #ifdef AUDIOV2
- session_id = streaminfoparam.sessionId;
- control = msm_mixer_open("/dev/snd/controlC0", 0);
- if(control < 0)
- printf("ERROR opening the device\n");
- device_id = msm_get_device(device);
- DEBUG_PRINT ("\ndevice_id = %d\n",device_id);
- DEBUG_PRINT("\nsession_id = %d\n",session_id);
- if (msm_en_device(device_id, 1))
- {
- perror("could not enable device\n");
- return -1;
- }
-
- if (msm_route_stream(DIR_TX,session_id,device_id, 1))
- {
- perror("could not set stream routing\n");
- return -1;
- }
- #endif
- }
- DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n");
- OMX_SendCommand(aac_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- /* wait_for_event(); should not wait here event complete status will
- not come until enough buffer are allocated */
- if (tunnel == 0)
- {
- input_buf_cnt = inputportFmt.nBufferCountActual; // inputportFmt.nBufferCountMin + 5;
- DEBUG_PRINT("Transition to Idle State succesful...\n");
- /* Allocate buffer on decoder's i/p port */
- error = Allocate_Buffer(aac_enc_handle, &pInputBufHdrs, inputportFmt.nPortIndex,
- input_buf_cnt, inputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pInputBufHdrs == NULL) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer success\n");
- }
- }
- output_buf_cnt = outputportFmt.nBufferCountMin ;
-
- /* Allocate buffer on encoder's O/Pp port */
- error = Allocate_Buffer(aac_enc_handle, &pOutputBufHdrs, outputportFmt.nPortIndex,
- output_buf_cnt, outputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pOutputBufHdrs == NULL) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer success\n");
- }
-
- wait_for_event();
-
-
- if (tunnel == 1)
- {
- DEBUG_PRINT ("\nOMX_SendCommand to enable TUNNEL MODE during IDLE\n");
- OMX_SendCommand(aac_enc_handle, OMX_CommandPortDisable,0,0); // disable input port
- wait_for_event();
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand encoder -> Executing\n");
- OMX_SendCommand(aac_enc_handle, OMX_CommandStateSet, OMX_StateExecuting,0);
- wait_for_event();
-
- DEBUG_PRINT(" Start sending OMX_FILLthisbuffer\n");
-
- for(i=0; i < output_buf_cnt; i++) {
- DEBUG_PRINT ("\nOMX_FillThisBuffer on output buf no.%d\n",i);
- pOutputBufHdrs[i]->nOutputPortIndex = 1;
- pOutputBufHdrs[i]->nFlags = pOutputBufHdrs[i]->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
- ret = OMX_FillThisBuffer(aac_enc_handle, pOutputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_FillThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_FillThisBuffer success!\n");
- }
- }
-
-if(tunnel == 0)
-{
- DEBUG_PRINT(" Start sending OMX_emptythisbuffer\n");
- for (i = 0;i < input_buf_cnt;i++) {
- DEBUG_PRINT ("\nOMX_EmptyThisBuffer on Input buf no.%d\n",i);
- pInputBufHdrs[i]->nInputPortIndex = 0;
- Size = Read_Buffer(pInputBufHdrs[i]);
- if(Size <=0 ){
- DEBUG_PRINT("NO DATA READ\n");
- bInputEosReached = true;
- pInputBufHdrs[i]->nFlags= OMX_BUFFERFLAG_EOS;
- }
- pInputBufHdrs[i]->nFilledLen = (OMX_U32)Size;
- pInputBufHdrs[i]->nInputPortIndex = 0;
- used_ip_buf_cnt++;
- ret = OMX_EmptyThisBuffer(aac_enc_handle, pInputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_EmptyThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_EmptyThisBuffer success!\n");
- }
- if(Size <=0 ){
- break;//eos reached
- }
- }
- pthread_mutex_lock(&etb_lock);
- if(etb_done)
-{
- DEBUG_PRINT("Component is waiting for EBD to be released.\n");
- etb_event_complete();
- }
- else
- {
- DEBUG_PRINT("\n****************************\n");
- DEBUG_PRINT("EBD not yet happened ...\n");
- DEBUG_PRINT("\n****************************\n");
- etb_done++;
- }
- pthread_mutex_unlock(&etb_lock);
-}
-
- return 0;
-}
-
-
-
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *avc_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE error=OMX_ErrorNone;
- unsigned int bufCnt=0;
- /* To remove warning for unused variable to keep prototype same */
- (void)avc_enc_handle;
-
- *pBufHdrs= (OMX_BUFFERHEADERTYPE **)
- malloc(sizeof(OMX_BUFFERHEADERTYPE*)*bufCntMin);
-
- for(bufCnt=0; bufCnt < bufCntMin; ++bufCnt) {
- DEBUG_PRINT("\n OMX_AllocateBuffer No %d \n", bufCnt);
- error = OMX_AllocateBuffer(aac_enc_handle, &((*pBufHdrs)[bufCnt]),
- nPortIndex, NULL, bufSize);
- }
-
- return error;
-}
-
-
-
-
-static int Read_Buffer (OMX_BUFFERHEADERTYPE *pBufHdr )
-{
-
- size_t bytes_read=0;
-
-
- pBufHdr->nFilledLen = 0;
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
-
- bytes_read = fread(pBufHdr->pBuffer, 1, pBufHdr->nAllocLen , inputBufferFile);
-
- pBufHdr->nFilledLen = (OMX_U32)bytes_read;
- if(bytes_read == 0)
- {
-
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
- DEBUG_PRINT ("\nBytes read zero\n");
- }
- else
- {
- pBufHdr->nFlags = pBufHdr->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
- }
-
- return (int)bytes_read;
-}
-
-
-
-//In Encoder this Should Open a PCM or WAV file for input.
-
-static int open_audio_file ()
-{
- int error_code = 0;
-
- if (!tunnel)
- {
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, in_filename);
- inputBufferFile = fopen (in_filename, "rb");
- if (inputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- in_filename);
- error_code = -1;
- }
- if(parse_pcm_header() != 0x00)
- {
- DEBUG_PRINT("PCM parser failed \n");
- return -1;
- }
- }
-
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, out_filename);
- outputBufferFile = fopen (out_filename, "wb");
- if (outputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- out_filename);
- error_code = -1;
- }
- return error_code;
-}
-
-
-void audaac_rec_install_bits
-(
- uint8 *input,
- byte num_bits_reqd,
- uint32 value,
- uint16 *hdr_bit_index
-)
-{
- uint32 byte_index;
- byte bit_index;
- byte bits_avail_in_byte;
- byte num_to_copy;
- byte byte_to_copy;
-
- byte num_remaining = num_bits_reqd;
- uint8 bit_mask;
-
- bit_mask = 0xFF;
-
- while (num_remaining) {
-
- byte_index = (*hdr_bit_index) >> 3;
- bit_index = (*hdr_bit_index) & 0x07;
-
- bits_avail_in_byte = (uint8)(8 - bit_index);
-
- num_to_copy = MIN(bits_avail_in_byte, num_remaining);
-
- byte_to_copy = (uint8)(((value >> (num_remaining - num_to_copy)) & 0xFF) <<
- (bits_avail_in_byte - num_to_copy));
-
- input[byte_index] &= ((uint8)(bit_mask << bits_avail_in_byte));
- input[byte_index] |= byte_to_copy;
-
- *hdr_bit_index += num_to_copy;
-
- num_remaining = (uint8)(num_remaining - num_to_copy);
- } /* while (num_remaining) */
-} /* audaac_rec_install_bits */
-
-adts_sample_index map_adts_sample_index(uint32 srate)
-{
- adts_sample_index ret;
-
- switch(srate){
-
- case 96000:
- ret= ADTS_SAMPLE_INDEX_96000;
- break;
- case 88200:
- ret= ADTS_SAMPLE_INDEX_88200;
- break;
- case 64000:
- ret= ADTS_SAMPLE_INDEX_64000;
- break;
- case 48000:
- ret=ADTS_SAMPLE_INDEX_48000;
- break;
- case 44100:
- ret=ADTS_SAMPLE_INDEX_44100;
- break;
- case 32000:
- ret=ADTS_SAMPLE_INDEX_32000;
- break;
- case 24000:
- ret=ADTS_SAMPLE_INDEX_24000;
- break;
- case 22050:
- ret=ADTS_SAMPLE_INDEX_22050;
- break;
- case 16000:
- ret=ADTS_SAMPLE_INDEX_16000;
- break;
- case 12000:
- ret=ADTS_SAMPLE_INDEX_12000;
- break;
- case 11025:
- ret=ADTS_SAMPLE_INDEX_11025;
- break;
- case 8000:
- ret=ADTS_SAMPLE_INDEX_8000;
- break;
- case 7350:
- ret=ADTS_SAMPLE_INDEX_7350;
- break;
- default:
- ret=ADTS_SAMPLE_INDEX_44100;
- break;
- }
- return ret;
-}
-
-void audaac_rec_install_adts_header_variable (uint16 byte_num)
-{
- //uint16 bit_index=0;
-
- adts_sample_index srate_enum;
- uint32 value;
-
- uint32 sample_index = (uint32)aac_samplerate;
- uint8 channel_config = (uint8)aac_channels;
-
- /* Store Sync word first */
- audaac_header[0] = 0xFF;
- audaac_header[1] = 0xF0;
-
- audaac_hdr_bit_index = 12;
-
- if ((format == OMX_AUDIO_AACStreamFormatRAW) &&
- ((profile == OMX_AUDIO_AACObjectHE) ||
- (profile == OMX_AUDIO_AACObjectHE_PS))){
- if (aac_samplerate >= 24000)
- sample_index = aac_samplerate/2;
- }
-
- /* ID field, 1 bit */
- value = 1;
- audaac_rec_install_bits(audaac_header,
- 1,
- value,
- &(audaac_hdr_bit_index));
-
- /* Layer field, 2 bits */
- value = 0;
- audaac_rec_install_bits(audaac_header,
- AACHDR_LAYER_SIZE,
- value,
- &(audaac_hdr_bit_index));
-
- /* Protection_absent field, 1 bit */
- value = 1;
- audaac_rec_install_bits(audaac_header,
- AACHDR_CRC_SIZE,
- value,
- &(audaac_hdr_bit_index));
-
- /* profile_ObjectType field, 2 bit */
- value = 1;
- audaac_rec_install_bits(audaac_header,
- AAC_PROFILE_SIZE,
- value,
- &(audaac_hdr_bit_index));
-
- /* sampling_frequency_index field, 4 bits */
- srate_enum = map_adts_sample_index(sample_index);
- audaac_rec_install_bits(audaac_header,
- AAC_SAMPLING_FREQ_INDEX_SIZE,
- (uint32)srate_enum,
- &(audaac_hdr_bit_index));
-
- DEBUG_PRINT("%s: sample_index=%d; srate_enum = %d \n",
- __FUNCTION__, sample_index, srate_enum);
-
- /* pravate_bit field, 1 bits */
- audaac_rec_install_bits(audaac_header,
- 1,
- 0,
- &(audaac_hdr_bit_index));
-
- /* channel_configuration field, 3 bits */
- audaac_rec_install_bits(audaac_header,
- 3,
- channel_config,
- &(audaac_hdr_bit_index));
-
-
- /* original/copy field, 1 bits */
- audaac_rec_install_bits(audaac_header,
- AAC_ORIGINAL_COPY_SIZE,
- 0,
- &(audaac_hdr_bit_index));
-
-
- /* home field, 1 bits */
- audaac_rec_install_bits(audaac_header,
- AAC_HOME_SIZE,
- 0,
- &(audaac_hdr_bit_index));
-
- // bit_index = audaac_hdr_bit_index;
- // bit_index += 2;
-
- /* copyr. id. bit, 1 bits */
- audaac_rec_install_bits(audaac_header,
- 1,
- 0,
- &(audaac_hdr_bit_index));
-
- /* copyr. id. start, 1 bits */
- audaac_rec_install_bits(audaac_header,
- 1,
- 0,
- &(audaac_hdr_bit_index));
-
- /* aac_frame_length field, 13 bits */
- audaac_rec_install_bits(audaac_header,
- AUDAAC_ADTS_FRAME_LENGTH_SIZE,
- byte_num,
- &audaac_hdr_bit_index);
-
- /* adts_buffer_fullness field, 11 bits */
- audaac_rec_install_bits(audaac_header,
- 11,
- 0x660,/*0x660 = CBR,0x7FF = VBR*/
- &audaac_hdr_bit_index);
-
- /* number_of_raw_data_blocks_in_frame, 2 bits */
- audaac_rec_install_bits(audaac_header,
- 2,
- 0,
- &audaac_hdr_bit_index);
-
-} /* audaac_rec_install_adts_header_variable */
-
-static OMX_ERRORTYPE parse_pcm_header()
-{
- struct wav_header hdr;
-
- DEBUG_PRINT("\n***************************************************************\n");
- if(fread(&hdr, 1, sizeof(hdr),inputBufferFile)!=sizeof(hdr))
- {
- DEBUG_PRINT("Wav file cannot read header\n");
- return -1;
- }
-
- if ((hdr.riff_id != ID_RIFF) ||
- (hdr.riff_fmt != ID_WAVE)||
- (hdr.fmt_id != ID_FMT))
- {
- DEBUG_PRINT("Wav file is not a riff/wave file\n");
- return -1;
- }
-
- if (hdr.audio_format != FORMAT_PCM)
- {
- DEBUG_PRINT("Wav file is not adpcm format %d and fmt size is %d\n",
- hdr.audio_format, hdr.fmt_sz);
- return -1;
- }
-
- DEBUG_PRINT("Samplerate is %d\n", hdr.sample_rate);
- DEBUG_PRINT("Channel Count is %d\n", hdr.num_channels);
- DEBUG_PRINT("\n***************************************************************\n");
-
- pcm_samplerate = hdr.sample_rate;
- pcm_channels = hdr.num_channels;
-
- return OMX_ErrorNone;
-}
diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk
index fa8cb23..346602c 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Android.mk
+++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk
@@ -40,29 +40,6 @@
include $(BUILD_SHARED_LIBRARY)
-# ---------------------------------------------------------------------------------
-# Make the apps-test (mm-aenc-omxamr-test)
-# ---------------------------------------------------------------------------------
-
-include $(CLEAR_VARS)
-
-mm-amr-enc-test-inc := $(LOCAL_PATH)/inc
-mm-amr-enc-test-inc += $(LOCAL_PATH)/test
-
-mm-amr-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-mm-amr-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
-LOCAL_MODULE := mm-aenc-omxamr-test
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := $(libOmxAmrEnc-def)
-LOCAL_C_INCLUDES := $(mm-amr-enc-test-inc)
-LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libmm-omxcore
-LOCAL_SHARED_LIBRARIES += libOmxAmrEnc
-LOCAL_SHARED_LIBRARIES += libaudioalsa
-LOCAL_SRC_FILES := test/omx_amr_enc_test.c
-
-include $(BUILD_EXECUTABLE)
-
endif
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-amrnb/qdsp6/Makefile b/mm-audio/aenc-amrnb/qdsp6/Makefile
index 0abd31c..4ea0849 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Makefile
+++ b/mm-audio/aenc-amrnb/qdsp6/Makefile
@@ -39,7 +39,7 @@
# ---------------------------------------------------------------------------------
# BUILD
# ---------------------------------------------------------------------------------
-all: libOmxAmrEnc.so.$(LIBVER) mm-aenc-omxamr-test
+all: libOmxAmrEnc.so.$(LIBVER)
install:
echo "intalling aenc-amr in $(DESTDIR)"
@@ -49,8 +49,7 @@
install -m 555 libOmxAmrEnc.so.$(LIBVER) $(LIBINSTALLDIR)
cd $(LIBINSTALLDIR) && ln -s libOmxAmrEnc.so.$(LIBVER) libOmxAmrEnc.so.$(LIBMAJOR)
cd $(LIBINSTALLDIR) && ln -s libOmxAmrEnc.so.$(LIBMAJOR) libOmxAmrEnc.so
- install -m 555 mm-aenc-omxamr-test $(BININSTALLDIR)
-
+
# ---------------------------------------------------------------------------------
# COMPILE LIBRARY
# ---------------------------------------------------------------------------------
@@ -65,17 +64,5 @@
$(CC) $(CPPFLAGS) $(CFLAGS_SO) $(LDFLAGS_SO) -Wl,-soname,libOmxAmrEnc.so.$(LIBMAJOR) -o $@ $^ $(LDFLAGS) $(LDLIBS)
# ---------------------------------------------------------------------------------
-# COMPILE TEST APP
-# ---------------------------------------------------------------------------------
-TEST_LDLIBS := -lpthread
-TEST_LDLIBS += -ldl
-TEST_LDLIBS += -lOmxCore
-
-TEST_SRCS := test/omx_amr_enc_test.c
-
-mm-aenc-omxamr-test: libOmxAmrEnc.so.$(LIBVER) $(TEST_SRCS)
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
-
-# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-amrnb/qdsp6/Makefile.am b/mm-audio/aenc-amrnb/qdsp6/Makefile.am
index 13379a3..fc19f87 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Makefile.am
+++ b/mm-audio/aenc-amrnb/qdsp6/Makefile.am
@@ -32,11 +32,3 @@
libOmxAmrEnc_la_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy
libOmxAmrEnc_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy
libOmxAmrEnc_la_LDFLAGS = $(GLIB_LIBS) -shared -avoid-version
-
-bin_PROGRAMS = mm_aenc_omxamr_test
-
-mm_aenc_omxamr_test_c_sources = test/omx_amr_enc_test.c
-mm_aenc_omxamr_test_CC = @CC@
-mm_aenc_omxamr_test_SOURCES = $(mm_aenc_omxamr_test_c_sources)
-mm_aenc_omxamr_test_LDADD = libOmxAmrEnc.la -lmm-omxcore
-mm_aenc_omxamr_test_CPPFLAGS = $(AM_CPPFLAGS) $(AM_CFLAGS)
diff --git a/mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c b/mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c
deleted file mode 100644
index 47d67f3..0000000
--- a/mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c
+++ /dev/null
@@ -1,1093 +0,0 @@
-
-/*--------------------------------------------------------------------------
-Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of The Linux Foundation nor
- the names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------*/
-
-
-/*
- An Open max test application ....
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include "OMX_Core.h"
-#include "OMX_Component.h"
-#include "pthread.h"
-#include <signal.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include<unistd.h>
-#include<string.h>
-#include <pthread.h>
-#include "QOMX_AudioExtensions.h"
-#include "QOMX_AudioIndexExtensions.h"
-#ifdef AUDIOV2
-#include "control.h"
-#endif
-
-
-#include <linux/ioctl.h>
-
-typedef unsigned char uint8;
-typedef unsigned char byte;
-typedef unsigned int uint32;
-typedef unsigned int uint16;
-QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam;
-/* maximum ADTS frame header length */
-void Release_Encoder();
-
-#ifdef AUDIOV2
-unsigned short session_id;
-int device_id;
-int control = 0;
-const char *device="handset_tx";
-#define DIR_TX 2
-#endif
-
-uint32_t samplerate = 8000;
-uint32_t channels = 1;
-uint32_t bandmode = 7;
-uint32_t dtxenable = 0;
-uint32_t rectime = 0;
-uint32_t recpath = 0;
-uint32_t pcmplayback = 0;
-uint32_t tunnel = 0;
-uint32_t format = 1;
-uint32_t amrwb_enable=0;
-#define DEBUG_PRINT printf
-unsigned to_idle_transition = 0;
-unsigned long total_pcm_bytes;
-
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-/************************************************************************/
-/* #DEFINES */
-/************************************************************************/
-#define false 0
-#define true 1
-
-#define CONFIG_VERSION_SIZE(param) \
- param.nVersion.nVersion = CURRENT_OMX_SPEC_VERSION;\
- param.nSize = sizeof(param);
-
-#define MIN_BITRATE 4 /* Bit rate 1 - 13.6 , 2 - 6.2 , 3 - 2.7 , 4 - 1.0 kbps*/
-#define MAX_BITRATE 4
-#define AMR_HEADER_SIZE 6
-#define AMRWB_HEADER_SIZE 9
-#define FAILED(result) (result != OMX_ErrorNone)
-
-#define SUCCEEDED(result) (result == OMX_ErrorNone)
-
-/************************************************************************/
-/* GLOBAL DECLARATIONS */
-/************************************************************************/
-
-pthread_mutex_t lock;
-pthread_cond_t cond;
-pthread_mutex_t elock;
-pthread_cond_t econd;
-pthread_cond_t fcond;
-pthread_mutex_t etb_lock;
-pthread_mutex_t etb_lock1;
-pthread_cond_t etb_cond;
-FILE * inputBufferFile;
-FILE * outputBufferFile;
-OMX_PARAM_PORTDEFINITIONTYPE inputportFmt;
-OMX_PARAM_PORTDEFINITIONTYPE outputportFmt;
-OMX_AUDIO_PARAM_AMRTYPE amrparam;
-OMX_AUDIO_PARAM_PCMMODETYPE pcmparam;
-OMX_PORT_PARAM_TYPE portParam;
-OMX_PORT_PARAM_TYPE portFmt;
-OMX_ERRORTYPE error;
-
-
-
-
-#define ID_RIFF 0x46464952
-#define ID_WAVE 0x45564157
-#define ID_FMT 0x20746d66
-#define ID_DATA 0x61746164
-
-#define FORMAT_PCM 1
-
-struct wav_header {
- uint32_t riff_id;
- uint32_t riff_sz;
- uint32_t riff_fmt;
- uint32_t fmt_id;
- uint32_t fmt_sz;
- uint16_t audio_format;
- uint16_t num_channels;
- uint32_t sample_rate;
- uint32_t byte_rate; /* sample_rate * num_channels * bps / 8 */
- uint16_t block_align; /* num_channels * bps / 8 */
- uint16_t bits_per_sample;
- uint32_t data_id;
- uint32_t data_sz;
-};
-struct enc_meta_out{
- unsigned int offset_to_frame;
- unsigned int frame_size;
- unsigned int encoded_pcm_samples;
- unsigned int msw_ts;
- unsigned int lsw_ts;
- unsigned int nflags;
-} __attribute__ ((packed));
-
-struct qcp_header {
- /* RIFF Section */
- char riff[4];
- unsigned int s_riff;
- char qlcm[4];
-
- /* Format chunk */
- char fmt[4];
- unsigned int s_fmt;
- char mjr;
- char mnr;
- unsigned int data1; /* UNIQUE ID of the codec */
- unsigned short data2;
- unsigned short data3;
- char data4[8];
- unsigned short ver; /* Codec Info */
- char name[80];
- unsigned short abps; /* average bits per sec of the codec */
- unsigned short bytes_per_pkt;
- unsigned short samp_per_block;
- unsigned short samp_per_sec;
- unsigned short bits_per_samp;
- unsigned char vr_num_of_rates; /* Rate Header fmt info */
- unsigned char rvd1[3];
- unsigned short vr_bytes_per_pkt[8];
- unsigned int rvd2[5];
-
- /* Vrat chunk */
- unsigned char vrat[4];
- unsigned int s_vrat;
- unsigned int v_rate;
- unsigned int size_in_pkts;
-
- /* Data chunk */
- unsigned char data[4];
- unsigned int s_data;
-} __attribute__ ((packed));
-
-static int totaldatalen = 0;
-static int framecnt = 0;
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-unsigned int input_buf_cnt = 0;
-unsigned int output_buf_cnt = 0;
-int used_ip_buf_cnt = 0;
-volatile int event_is_done = 0;
-volatile int ebd_event_is_done = 0;
-volatile int fbd_event_is_done = 0;
-volatile int etb_event_is_done = 0;
-int ebd_cnt;
-int bInputEosReached = 0;
-int bOutputEosReached = 0;
-int bInputEosReached_tunnel = 0;
-static int etb_done = 0;
-int bFlushing = false;
-int bPause = false;
-const char *in_filename;
-const char *out_filename;
-
-int timeStampLfile = 0;
-int timestampInterval = 100;
-
-//* OMX Spec Version supported by the wrappers. Version = 1.1 */
-const OMX_U32 CURRENT_OMX_SPEC_VERSION = 0x00000101;
-OMX_COMPONENTTYPE* amr_enc_handle = 0;
-
-OMX_BUFFERHEADERTYPE **pInputBufHdrs = NULL;
-OMX_BUFFERHEADERTYPE **pOutputBufHdrs = NULL;
-
-/************************************************************************/
-/* GLOBAL FUNC DECL */
-/************************************************************************/
-int Init_Encoder(char*);
-int Play_Encoder();
-OMX_STRING aud_comp;
-/**************************************************************************/
-/* STATIC DECLARATIONS */
-/**************************************************************************/
-
-static int open_audio_file ();
-static int Read_Buffer(OMX_BUFFERHEADERTYPE *pBufHdr );
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *amr_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize);
-
-
-static OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData);
-static OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-
-static OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-static OMX_ERRORTYPE parse_pcm_header();
-void wait_for_event(void)
-{
- pthread_mutex_lock(&lock);
- DEBUG_PRINT("%s: event_is_done=%d", __FUNCTION__, event_is_done);
- while (event_is_done == 0) {
- pthread_cond_wait(&cond, &lock);
- }
- event_is_done = 0;
- pthread_mutex_unlock(&lock);
-}
-
-void event_complete(void )
-{
- pthread_mutex_lock(&lock);
- if (event_is_done == 0) {
- event_is_done = 1;
- pthread_cond_broadcast(&cond);
- }
- pthread_mutex_unlock(&lock);
-}
-
-void etb_wait_for_event(void)
-{
- pthread_mutex_lock(&etb_lock1);
- DEBUG_PRINT("%s: etb_event_is_done=%d", __FUNCTION__, etb_event_is_done);
- while (etb_event_is_done == 0) {
- pthread_cond_wait(&etb_cond, &etb_lock1);
- }
- etb_event_is_done = 0;
- pthread_mutex_unlock(&etb_lock1);
-}
-
-void etb_event_complete(void )
-{
- pthread_mutex_lock(&etb_lock1);
- if (etb_event_is_done == 0) {
- etb_event_is_done = 1;
- pthread_cond_broadcast(&etb_cond);
- }
- pthread_mutex_unlock(&etb_lock1);
-}
-
-
-OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData)
-{
- DEBUG_PRINT("Function %s \n", __FUNCTION__);
-
- /* To remove warning for unused variable to keep prototype same */
- (void)hComponent;
- (void)pAppData;
- (void)pEventData;
- switch(eEvent) {
- case OMX_EventCmdComplete:
- DEBUG_PRINT("\n OMX_EventCmdComplete event=%d data1=%u data2=%u\n",(OMX_EVENTTYPE)eEvent,
- nData1,nData2);
- event_complete();
- break;
- case OMX_EventError:
- DEBUG_PRINT("\n OMX_EventError \n");
- break;
- case OMX_EventBufferFlag:
- DEBUG_PRINT("\n OMX_EventBufferFlag \n");
- bOutputEosReached = true;
- event_complete();
- break;
- case OMX_EventPortSettingsChanged:
- DEBUG_PRINT("\n OMX_EventPortSettingsChanged \n");
- break;
- default:
- DEBUG_PRINT("\n Unknown Event \n");
- break;
- }
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- size_t bytes_writen = 0;
- size_t total_bytes_writen = 0;
- size_t len = 0;
- struct enc_meta_out *meta = NULL;
- OMX_U8 *src = pBuffer->pBuffer;
- unsigned int num_of_frames = 1;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- if(((pBuffer->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
- DEBUG_PRINT("FBD::EOS on output port\n ");
- bOutputEosReached = true;
- return OMX_ErrorNone;
- }
- if(bInputEosReached_tunnel || bOutputEosReached)
- {
- DEBUG_PRINT("EOS REACHED NO MORE PROCESSING OF BUFFERS\n");
- return OMX_ErrorNone;
- }
- if(num_of_frames != src[0]){
-
- printf("Data corrupt\n");
- return OMX_ErrorNone;
- }
- /* Skip the first bytes */
-
-
-
- src += sizeof(unsigned char);
- meta = (struct enc_meta_out *)src;
- while (num_of_frames > 0) {
- meta = (struct enc_meta_out *)src;
- /*printf("offset=%d framesize=%d encoded_pcm[%d] msw_ts[%d]lsw_ts[%d] nflags[%d]\n",
- meta->offset_to_frame,
- meta->frame_size,
- meta->encoded_pcm_samples, meta->msw_ts, meta->lsw_ts, meta->nflags);*/
- len = meta->frame_size;
-
- bytes_writen = fwrite(pBuffer->pBuffer + sizeof(unsigned char) + meta->offset_to_frame,1,len,outputBufferFile);
- if(bytes_writen < len)
- {
- DEBUG_PRINT("error: invalid AMR encoded data \n");
- return OMX_ErrorNone;
- }
- src += sizeof(struct enc_meta_out);
- num_of_frames--;
- total_bytes_writen += len;
- }
- DEBUG_PRINT(" FillBufferDone size writen to file %zu count %d\n",total_bytes_writen, framecnt);
- totaldatalen = totaldatalen + (int)total_bytes_writen;
- framecnt++;
-
- DEBUG_PRINT(" FBD calling FTB\n");
- OMX_FillThisBuffer(hComponent,pBuffer);
-
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- int readBytes =0;
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- ebd_cnt++;
- used_ip_buf_cnt--;
- pthread_mutex_lock(&etb_lock);
- if(!etb_done)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT("Wait till first set of buffers are given to component\n");
- DEBUG_PRINT("\n*********************************************\n");
- etb_done++;
- pthread_mutex_unlock(&etb_lock);
- etb_wait_for_event();
- }
- else
- {
- pthread_mutex_unlock(&etb_lock);
- }
-
-
- if(bInputEosReached)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT(" EBD::EOS on input port\n ");
- DEBUG_PRINT("*********************************************\n");
- return OMX_ErrorNone;
- }else if (bFlushing == true) {
- DEBUG_PRINT("omx_amr_adec_test: bFlushing is set to TRUE used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- if (used_ip_buf_cnt == 0) {
- bFlushing = false;
- } else {
- DEBUG_PRINT("omx_amr_adec_test: more buffer to come back used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- return OMX_ErrorNone;
- }
- }
-
- if((readBytes = Read_Buffer(pBuffer)) > 0) {
- pBuffer->nFilledLen = (OMX_U32)readBytes;
- used_ip_buf_cnt++;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- }
- else{
- pBuffer->nFlags |= OMX_BUFFERFLAG_EOS;
- used_ip_buf_cnt++;
- bInputEosReached = true;
- pBuffer->nFilledLen = 0;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- DEBUG_PRINT("EBD..Either EOS or Some Error while reading file\n");
- }
- return OMX_ErrorNone;
-}
-
-void signal_handler(int sig_id) {
-
- /* Flush */
- if (sig_id == SIGUSR1) {
- DEBUG_PRINT("%s Initiate flushing\n", __FUNCTION__);
- bFlushing = true;
- OMX_SendCommand(amr_enc_handle, OMX_CommandFlush, OMX_ALL, NULL);
- } else if (sig_id == SIGUSR2) {
- if (bPause == true) {
- DEBUG_PRINT("%s resume record\n", __FUNCTION__);
- bPause = false;
- OMX_SendCommand(amr_enc_handle, OMX_CommandStateSet, OMX_StateExecuting, NULL);
- } else {
- DEBUG_PRINT("%s pause record\n", __FUNCTION__);
- bPause = true;
- OMX_SendCommand(amr_enc_handle, OMX_CommandStateSet, OMX_StatePause, NULL);
- }
- }
-}
-
-int main(int argc, char **argv)
-{
- unsigned int bufCnt=0;
- OMX_ERRORTYPE result;
-
- struct sigaction sa;
- char amr_header[6] = {0x23, 0x21, 0x41, 0x4D, 0x52, 0x0A};
- char amrwb_header[9] = {0x23, 0x21, 0x41, 0x4D, 0x52,0x2D, 0x57, 0x42, 0x0A};
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = &signal_handler;
- sigaction(SIGABRT, &sa, NULL);
- sigaction(SIGUSR1, &sa, NULL);
- sigaction(SIGUSR2, &sa, NULL);
-
- (void) signal(SIGINT, Release_Encoder);
-
- pthread_cond_init(&cond, 0);
- pthread_mutex_init(&lock, 0);
- pthread_cond_init(&etb_cond, 0);
- pthread_mutex_init(&etb_lock, 0);
- pthread_mutex_init(&etb_lock1, 0);
-
- if (argc >= 9) {
- in_filename = argv[1];
- out_filename = argv[2];
- tunnel = (uint32_t)atoi(argv[3]);
- bandmode = (uint32_t)atoi(argv[4]);
- dtxenable = (uint32_t)atoi(argv[5]);
- recpath = (uint32_t)atoi(argv[6]); // No configuration support yet..
- rectime = (uint32_t)atoi(argv[7]);
- amrwb_enable = (uint32_t)atoi(argv[8]);
-
- } else {
- DEBUG_PRINT(" invalid format: \n");
- DEBUG_PRINT("ex: ./mm-aenc-omxamr-test INPUTFILE OUTPUTFILE Tunnel BANDMODE DTXENABLE RECORDPATH RECORDTIME amrwb_enable \n");
- DEBUG_PRINT("amrnb:Bandmode 1-8 amrwb:Bandmode 0-8, dtxenable 0-1\n");
- DEBUG_PRINT("RECORDPATH 0(TX),1(RX),2(BOTH),3(MIC)\n");
- DEBUG_PRINT("RECORDTIME in seconds for AST Automation\n");
- DEBUG_PRINT("amrwb_enable:1-amrwb 0-amrnb\n");
- return 0;
- }
-
- if (!amrwb_enable && (bandmode < 1 || bandmode > 8)) {
- DEBUG_PRINT("%d Bandmode is not supported for amrnb:supported Bandmodes are 1-8\n",bandmode);
- return 0;
- }
-
- if (amrwb_enable && (bandmode < 0 || bandmode > 8)) {
- DEBUG_PRINT("%d Bandmode not supported for amrwb:supported Bandmodes are 0-8\n",bandmode);
- return 0;
- }
-
- if (dtxenable != 0 && dtxenable != 1) {
- DEBUG_PRINT("dtxenable not supported:dtxenable should be 0-1\n");
- return 0;
- }
-
- if(recpath != 3) {
- DEBUG_PRINT("For RECORDPATH Only MIC supported\n");
- return 0;
- }
- if(!amrwb_enable)
- {
- if(tunnel == 0)
- aud_comp = "OMX.qcom.audio.encoder.amrnb";
- else
- aud_comp = "OMX.qcom.audio.encoder.tunneled.amrnb";
- }
- else {
- if(tunnel == 0)
- aud_comp = "OMX.qcom.audio.encoder.amrwb";
- else
- aud_comp = "OMX.qcom.audio.encoder.tunneled.amrwb";
- }
-
- if(Init_Encoder(aud_comp)!= 0x00)
- {
- DEBUG_PRINT("Decoder Init failed\n");
- return -1;
- }
-
- fcntl(0, F_SETFL, O_NONBLOCK);
-
- if(Play_Encoder() != 0x00)
- {
- DEBUG_PRINT("Play_Decoder failed\n");
- return -1;
- }
-
- // Wait till EOS is reached...
- if(rectime && tunnel)
- {
- sleep(rectime);
- rectime = 0;
- bInputEosReached_tunnel = 1;
- DEBUG_PRINT("\EOS ON INPUT PORT\n");
- }
- else
- {
- wait_for_event();
- }
-
- if((bInputEosReached_tunnel) || ((bOutputEosReached) && !tunnel))
- {
-
- DEBUG_PRINT("\nMoving the decoder to idle state \n");
- OMX_SendCommand(amr_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- wait_for_event();
-
- DEBUG_PRINT("\nMoving the encoder to loaded state \n");
- OMX_SendCommand(amr_enc_handle, OMX_CommandStateSet, OMX_StateLoaded,0);
- sleep(1);
- if (!tunnel)
- {
- DEBUG_PRINT("\nFillBufferDone: Deallocating i/p buffers \n");
- for(bufCnt=0; bufCnt < input_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(amr_enc_handle, 0, pInputBufHdrs[bufCnt]);
- }
- }
-
- DEBUG_PRINT ("\nFillBufferDone: Deallocating o/p buffers \n");
- for(bufCnt=0; bufCnt < output_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(amr_enc_handle, 1, pOutputBufHdrs[bufCnt]);
- }
- wait_for_event();
- fseek(outputBufferFile, 0,SEEK_SET);
- if(!amrwb_enable)
- fwrite(amr_header,1,AMR_HEADER_SIZE,outputBufferFile);
- else
- fwrite(amrwb_header,1,AMRWB_HEADER_SIZE,outputBufferFile);
-
- result = OMX_FreeHandle(amr_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
- if(tunnel)
- {
- #ifdef AUDIOV2
- if (msm_route_stream(DIR_TX,session_id,device_id, 0))
- {
- DEBUG_PRINT("\ncould not set stream routing\n");
- return -1;
- }
- if (msm_en_device(device_id, 0))
- {
- DEBUG_PRINT("\ncould not enable device\n");
- return -1;
- }
- msm_mixer_close();
- #endif
- }
- OMX_Deinit();
- ebd_cnt=0;
- bOutputEosReached = false;
- bInputEosReached_tunnel = false;
- bInputEosReached = 0;
- amr_enc_handle = NULL;
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- fclose(outputBufferFile);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...AMR ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- }
- return 0;
-}
-
-void Release_Encoder()
-{
- static int cnt=0;
- OMX_ERRORTYPE result;
-
- DEBUG_PRINT("END OF AMR ENCODING: EXITING PLEASE WAIT\n");
- bInputEosReached_tunnel = 1;
- event_complete();
- cnt++;
- if(cnt > 1)
- {
- /* FORCE RESET */
- amr_enc_handle = NULL;
- ebd_cnt=0;
- bInputEosReached_tunnel = false;
-
- result = OMX_FreeHandle(amr_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
-
- OMX_Deinit();
-
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...AMR ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- exit(0);
- }
-}
-
-int Init_Encoder(OMX_STRING audio_component)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE omxresult;
- OMX_U32 total = 0;
- typedef OMX_U8* OMX_U8_PTR;
- char *role ="audio_encoder";
-
- static OMX_CALLBACKTYPE call_back = {
- &EventHandler,&EmptyBufferDone,&FillBufferDone
- };
-
- /* Init. the OpenMAX Core */
- DEBUG_PRINT("\nInitializing OpenMAX Core....\n");
- omxresult = OMX_Init();
-
- if(OMX_ErrorNone != omxresult) {
- DEBUG_PRINT("\n Failed to Init OpenMAX core");
- return -1;
- }
- else {
- DEBUG_PRINT("\nOpenMAX Core Init Done\n");
- }
-
- /* Query for audio decoders*/
- DEBUG_PRINT("Amr_test: Before entering OMX_GetComponentOfRole");
- OMX_GetComponentsOfRole(role, &total, 0);
- DEBUG_PRINT ("\nTotal components of role=%s :%u", role, total);
-
-
- omxresult = OMX_GetHandle((OMX_HANDLETYPE*)(&amr_enc_handle),
- (OMX_STRING)audio_component, NULL, &call_back);
- if (FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to Load the component:%s\n", audio_component);
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nComponent %s is in LOADED state\n", audio_component);
- }
-
- /* Get the port information */
- CONFIG_VERSION_SIZE(portParam);
- omxresult = OMX_GetParameter(amr_enc_handle, OMX_IndexParamAudioInit,
- (OMX_PTR)&portParam);
-
- if(FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to get Port Param\n");
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nportParam.nPorts:%u\n", portParam.nPorts);
- DEBUG_PRINT("\nportParam.nStartPortNumber:%u\n",
- portParam.nStartPortNumber);
- }
-
- if(OMX_ErrorNone != omxresult)
- {
- DEBUG_PRINT("Set parameter failed");
- }
-
- return 0;
-}
-
-int Play_Encoder()
-{
- unsigned int i;
- int Size=0;
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE ret;
- OMX_INDEXTYPE index;
-#ifdef __LP64__
- DEBUG_PRINT("sizeof[%ld]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#else
- DEBUG_PRINT("sizeof[%d]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#endif
-
- /* open the i/p and o/p files based on the video file format passed */
- if(open_audio_file()) {
- DEBUG_PRINT("\n Returning -1");
- return -1;
- }
-
- /* Query the encoder input min buf requirements */
- CONFIG_VERSION_SIZE(inputportFmt);
-
- /* Port for which the Client needs to obtain info */
- inputportFmt.nPortIndex = portParam.nStartPortNumber;
-
- OMX_GetParameter(amr_enc_handle,OMX_IndexParamPortDefinition,&inputportFmt);
- DEBUG_PRINT ("\nEnc Input Buffer Count %u\n", inputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Input Buffer Size %u\n", inputportFmt.nBufferSize);
-
- if(OMX_DirInput != inputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Input Port\n");
- return -1;
- }
-
- pcmparam.nPortIndex = 0;
- pcmparam.nChannels = channels;
- pcmparam.nSamplingRate = samplerate;
- OMX_SetParameter(amr_enc_handle,OMX_IndexParamAudioPcm,&pcmparam);
-
-
- /* Query the encoder outport's min buf requirements */
- CONFIG_VERSION_SIZE(outputportFmt);
- /* Port for which the Client needs to obtain info */
- outputportFmt.nPortIndex = portParam.nStartPortNumber + 1;
-
- OMX_GetParameter(amr_enc_handle,OMX_IndexParamPortDefinition,&outputportFmt);
- DEBUG_PRINT ("\nEnc: Output Buffer Count %u\n", outputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Output Buffer Size %u\n", outputportFmt.nBufferSize);
-
- if(OMX_DirOutput != outputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Output Port\n");
- return -1;
- }
-
-
- CONFIG_VERSION_SIZE(amrparam);
-
- amrparam.nPortIndex = 1;
- amrparam.nChannels = channels; //2 ; /* 1-> mono 2-> stereo*/
- amrparam.eAMRBandMode = bandmode;
- amrparam.eAMRDTXMode = dtxenable;
- OMX_SetParameter(amr_enc_handle,OMX_IndexParamAudioAmr,&amrparam);
- OMX_GetExtensionIndex(amr_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index);
- OMX_GetParameter(amr_enc_handle,index,&streaminfoparam);
- if(tunnel) {
- #ifdef AUDIOV2
- session_id = streaminfoparam.sessionId;
- control = msm_mixer_open("/dev/snd/controlC0", 0);
- if(control < 0)
- printf("ERROR opening the device\n");
- device_id = msm_get_device(device);
- DEBUG_PRINT ("\ndevice_id = %d\n",device_id);
- DEBUG_PRINT("\nsession_id = %d\n",session_id);
- if (msm_en_device(device_id, 1))
- {
- perror("could not enable device\n");
- return -1;
- }
- if (msm_route_stream(DIR_TX,session_id,device_id, 1))
- {
- perror("could not set stream routing\n");
- return -1;
- }
- #endif
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n");
- OMX_SendCommand(amr_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- /* wait_for_event(); should not wait here event complete status will
- not come until enough buffer are allocated */
- if (tunnel == 0)
- {
- input_buf_cnt = inputportFmt.nBufferCountActual; // inputportFmt.nBufferCountMin + 5;
- DEBUG_PRINT("Transition to Idle State succesful...\n");
- /* Allocate buffer on decoder's i/p port */
- error = Allocate_Buffer(amr_enc_handle, &pInputBufHdrs, inputportFmt.nPortIndex,
- input_buf_cnt, inputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pInputBufHdrs == NULL ) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer success\n");
- }
- }
- output_buf_cnt = outputportFmt.nBufferCountMin ;
-
- /* Allocate buffer on encoder's O/Pp port */
- error = Allocate_Buffer(amr_enc_handle, &pOutputBufHdrs, outputportFmt.nPortIndex,
- output_buf_cnt, outputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pOutputBufHdrs == NULL ) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer success\n");
- }
-
- wait_for_event();
-
-
- if (tunnel == 1)
- {
- DEBUG_PRINT ("\nOMX_SendCommand to enable TUNNEL MODE during IDLE\n");
- OMX_SendCommand(amr_enc_handle, OMX_CommandPortDisable,0,0); // disable input port
- wait_for_event();
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand encoder -> Executing\n");
- OMX_SendCommand(amr_enc_handle, OMX_CommandStateSet, OMX_StateExecuting,0);
- wait_for_event();
-
- DEBUG_PRINT(" Start sending OMX_FILLthisbuffer\n");
-
- for(i=0; i < output_buf_cnt; i++) {
- DEBUG_PRINT ("\nOMX_FillThisBuffer on output buf no.%d\n",i);
- pOutputBufHdrs[i]->nOutputPortIndex = 1;
- pOutputBufHdrs[i]->nFlags = pOutputBufHdrs[i]->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
- ret = OMX_FillThisBuffer(amr_enc_handle, pOutputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_FillThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_FillThisBuffer success!\n");
- }
- }
-
-if(tunnel == 0)
-{
- DEBUG_PRINT(" Start sending OMX_emptythisbuffer\n");
- for (i = 0;i < input_buf_cnt;i++) {
- DEBUG_PRINT ("\nOMX_EmptyThisBuffer on Input buf no.%d\n",i);
- pInputBufHdrs[i]->nInputPortIndex = 0;
- Size = Read_Buffer(pInputBufHdrs[i]);
- if(Size <=0 ){
- DEBUG_PRINT("NO DATA READ\n");
- bInputEosReached = true;
- pInputBufHdrs[i]->nFlags= OMX_BUFFERFLAG_EOS;
- }
- pInputBufHdrs[i]->nFilledLen = (OMX_U32)Size;
- pInputBufHdrs[i]->nInputPortIndex = 0;
- used_ip_buf_cnt++;
- ret = OMX_EmptyThisBuffer(amr_enc_handle, pInputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_EmptyThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_EmptyThisBuffer success!\n");
- }
- if(Size <=0 ){
- break;//eos reached
- }
- }
- pthread_mutex_lock(&etb_lock);
- if(etb_done)
-{
- DEBUG_PRINT("Component is waiting for EBD to be released.\n");
- etb_event_complete();
- }
- else
- {
- DEBUG_PRINT("\n****************************\n");
- DEBUG_PRINT("EBD not yet happened ...\n");
- DEBUG_PRINT("\n****************************\n");
- etb_done++;
- }
- pthread_mutex_unlock(&etb_lock);
-}
-
- return 0;
-}
-
-
-
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *avc_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE error=OMX_ErrorNone;
- unsigned int bufCnt=0;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)avc_enc_handle;
- *pBufHdrs= (OMX_BUFFERHEADERTYPE **)
- malloc(sizeof(OMX_BUFFERHEADERTYPE*)*bufCntMin);
-
- for(bufCnt=0; bufCnt < bufCntMin; ++bufCnt) {
- DEBUG_PRINT("\n OMX_AllocateBuffer No %d \n", bufCnt);
- error = OMX_AllocateBuffer(amr_enc_handle, &((*pBufHdrs)[bufCnt]),
- nPortIndex, NULL, bufSize);
- }
-
- return error;
-}
-
-
-
-
-static int Read_Buffer (OMX_BUFFERHEADERTYPE *pBufHdr )
-{
-
- size_t bytes_read=0;
-
-
- pBufHdr->nFilledLen = 0;
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
-
- bytes_read = fread(pBufHdr->pBuffer, 1, pBufHdr->nAllocLen , inputBufferFile);
-
- pBufHdr->nFilledLen = (OMX_U32)bytes_read;
- // Time stamp logic
- ((OMX_BUFFERHEADERTYPE *)pBufHdr)->nTimeStamp = \
-
- (OMX_TICKS) ((total_pcm_bytes * 1000)/(samplerate * channels *2));
-
- DEBUG_PRINT ("\n--time stamp -- %ld\n", (unsigned long)((OMX_BUFFERHEADERTYPE *)pBufHdr)->nTimeStamp);
- if(bytes_read == 0)
- {
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
- DEBUG_PRINT ("\nBytes read zero\n");
- }
- else
- {
- pBufHdr->nFlags = pBufHdr->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
-
- total_pcm_bytes = (unsigned)(total_pcm_bytes + bytes_read);
- }
-
- return (int)bytes_read;;
-}
-
-
-
-//In Encoder this Should Open a PCM or WAV file for input.
-
-static int open_audio_file ()
-{
- int error_code = 0;
-
- if (!tunnel)
- {
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, in_filename);
- inputBufferFile = fopen (in_filename, "rb");
- if (inputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- in_filename);
- error_code = -1;
- }
- if(parse_pcm_header() != 0x00)
- {
- DEBUG_PRINT("PCM parser failed \n");
- return -1;
- }
- }
-
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, out_filename);
- outputBufferFile = fopen (out_filename, "wb");
- if (outputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- out_filename);
- error_code = -1;
- return error_code;
- }
- if(!amrwb_enable) {
- fseek(outputBufferFile, AMR_HEADER_SIZE, SEEK_SET);
- } else {
- fseek(outputBufferFile, AMRWB_HEADER_SIZE, SEEK_SET);
- }
- return error_code;
-}
-
-static OMX_ERRORTYPE parse_pcm_header()
-{
- struct wav_header hdr;
-
- DEBUG_PRINT("\n***************************************************************\n");
- if(fread(&hdr, 1, sizeof(hdr),inputBufferFile)!=sizeof(hdr))
- {
- DEBUG_PRINT("Wav file cannot read header\n");
- return -1;
- }
-
- if ((hdr.riff_id != ID_RIFF) ||
- (hdr.riff_fmt != ID_WAVE)||
- (hdr.fmt_id != ID_FMT))
- {
- DEBUG_PRINT("Wav file is not a riff/wave file\n");
- return -1;
- }
-
- if (hdr.audio_format != FORMAT_PCM)
- {
- DEBUG_PRINT("Wav file is not adpcm format %d and fmt size is %d\n",
- hdr.audio_format, hdr.fmt_sz);
- return -1;
- }
-
- DEBUG_PRINT("Samplerate is %d\n", hdr.sample_rate);
- DEBUG_PRINT("Channel Count is %d\n", hdr.num_channels);
- DEBUG_PRINT("\n***************************************************************\n");
-
- samplerate = hdr.sample_rate;
- channels = hdr.num_channels;
- total_pcm_bytes = 0;
-
- return OMX_ErrorNone;
-}
diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk
index 42a6b13..83f105e 100644
--- a/mm-audio/aenc-evrc/qdsp6/Android.mk
+++ b/mm-audio/aenc-evrc/qdsp6/Android.mk
@@ -40,28 +40,6 @@
include $(BUILD_SHARED_LIBRARY)
-# ---------------------------------------------------------------------------------
-# Make the apps-test (mm-aenc-omxevrc-test)
-# ---------------------------------------------------------------------------------
-
-include $(CLEAR_VARS)
-
-mm-evrc-enc-test-inc := $(LOCAL_PATH)/inc
-mm-evrc-enc-test-inc += $(LOCAL_PATH)/test
-mm-evrc-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-mm-evrc-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
-LOCAL_MODULE := mm-aenc-omxevrc-test
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := $(libOmxEvrcEnc-def)
-LOCAL_C_INCLUDES := $(mm-evrc-enc-test-inc)
-LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libmm-omxcore
-LOCAL_SHARED_LIBRARIES += libOmxEvrcEnc
-LOCAL_SHARED_LIBRARIES += libaudioalsa
-LOCAL_SRC_FILES := test/omx_evrc_enc_test.c
-
-include $(BUILD_EXECUTABLE)
-
endif
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-evrc/qdsp6/Makefile b/mm-audio/aenc-evrc/qdsp6/Makefile
index d0871de..2c9c7bb 100644
--- a/mm-audio/aenc-evrc/qdsp6/Makefile
+++ b/mm-audio/aenc-evrc/qdsp6/Makefile
@@ -39,7 +39,7 @@
# ---------------------------------------------------------------------------------
# BUILD
# ---------------------------------------------------------------------------------
-all: libOmxEvrcEnc.so.$(LIBVER) mm-aenc-omxevrc-test
+all: libOmxEvrcEnc.so.$(LIBVER)
install:
echo "intalling aenc-evrc in $(DESTDIR)"
@@ -49,8 +49,7 @@
install -m 555 libOmxEvrcEnc.so.$(LIBVER) $(LIBINSTALLDIR)
cd $(LIBINSTALLDIR) && ln -s libOmxEvrcEnc.so.$(LIBVER) libOmxEvrcEnc.so.$(LIBMAJOR)
cd $(LIBINSTALLDIR) && ln -s libOmxEvrcEnc.so.$(LIBMAJOR) libOmxEvrcEnc.so
- install -m 555 mm-aenc-omxevrc-test $(BININSTALLDIR)
-
+
# ---------------------------------------------------------------------------------
# COMPILE LIBRARY
# ---------------------------------------------------------------------------------
@@ -65,17 +64,5 @@
$(CC) $(CPPFLAGS) $(CFLAGS_SO) $(LDFLAGS_SO) -Wl,-soname,libOmxEvrcEnc.so.$(LIBMAJOR) -o $@ $^ $(LDFLAGS) $(LDLIBS)
# ---------------------------------------------------------------------------------
-# COMPILE TEST APP
-# ---------------------------------------------------------------------------------
-TEST_LDLIBS := -lpthread
-TEST_LDLIBS += -ldl
-TEST_LDLIBS += -lOmxCore
-
-TEST_SRCS := test/omx_evrc_enc_test.c
-
-mm-aenc-omxevrc-test: libOmxEvrcEnc.so.$(LIBVER) $(TEST_SRCS)
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
-
-# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c b/mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c
deleted file mode 100644
index 63d953b..0000000
--- a/mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c
+++ /dev/null
@@ -1,1098 +0,0 @@
-
-/*--------------------------------------------------------------------------
-Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of The Linux Foundation nor
- the names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------*/
-
-
-/*
- An Open max test application ....
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include "OMX_Core.h"
-#include "OMX_Component.h"
-#include "pthread.h"
-#include <signal.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include<unistd.h>
-#include<string.h>
-#include <pthread.h>
-#include "QOMX_AudioExtensions.h"
-#include "QOMX_AudioIndexExtensions.h"
-#ifdef AUDIOV2
-#include "control.h"
-#endif
-
-
-#include <linux/ioctl.h>
-
-typedef unsigned char uint8;
-typedef unsigned char byte;
-typedef unsigned int uint32;
-typedef unsigned int uint16;
-QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam;
-/* maximum ADTS frame header length */
-void Release_Encoder();
-
-#ifdef AUDIOV2
-unsigned short session_id;
-int device_id;
-int control = 0;
-const char *device="handset_tx";
-#define DIR_TX 2
-#endif
-
-uint32_t samplerate = 8000;
-uint32_t channels = 1;
-uint32_t min_bitrate = 0;
-uint32_t max_bitrate = 0;
-uint32_t cdmarate = 0;
-uint32_t rectime = 0;
-uint32_t recpath = 0;
-int32_t pcmplayback = 0;
-uint32_t tunnel = 0;
-uint32_t format = 1;
-#define DEBUG_PRINT printf
-unsigned to_idle_transition = 0;
-unsigned long total_pcm_bytes;
-
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-/************************************************************************/
-/* #DEFINES */
-/************************************************************************/
-#define false 0
-#define true 1
-
-#define CONFIG_VERSION_SIZE(param) \
- param.nVersion.nVersion = CURRENT_OMX_SPEC_VERSION;\
- param.nSize = sizeof(param);
-
-#define QCP_HEADER_SIZE sizeof(struct qcp_header)
-#define MIN_BITRATE 4 /* Bit rate 1 - 13.6 , 2 - 6.2 , 3 - 2.7 , 4 - 1.0 kbps*/
-#define MAX_BITRATE 4
-
-#define FAILED(result) (result != OMX_ErrorNone)
-
-#define SUCCEEDED(result) (result == OMX_ErrorNone)
-
-/************************************************************************/
-/* GLOBAL DECLARATIONS */
-/************************************************************************/
-
-pthread_mutex_t lock;
-pthread_cond_t cond;
-pthread_mutex_t elock;
-pthread_cond_t econd;
-pthread_cond_t fcond;
-pthread_mutex_t etb_lock;
-pthread_mutex_t etb_lock1;
-pthread_cond_t etb_cond;
-FILE * inputBufferFile;
-FILE * outputBufferFile;
-OMX_PARAM_PORTDEFINITIONTYPE inputportFmt;
-OMX_PARAM_PORTDEFINITIONTYPE outputportFmt;
-OMX_AUDIO_PARAM_EVRCTYPE evrcparam;
-OMX_AUDIO_PARAM_PCMMODETYPE pcmparam;
-OMX_PORT_PARAM_TYPE portParam;
-OMX_PORT_PARAM_TYPE portFmt;
-OMX_ERRORTYPE error;
-
-
-
-
-#define ID_RIFF 0x46464952
-#define ID_WAVE 0x45564157
-#define ID_FMT 0x20746d66
-#define ID_DATA 0x61746164
-
-#define FORMAT_PCM 1
-
-struct wav_header {
- uint32_t riff_id;
- uint32_t riff_sz;
- uint32_t riff_fmt;
- uint32_t fmt_id;
- uint32_t fmt_sz;
- uint16_t audio_format;
- uint16_t num_channels;
- uint32_t sample_rate;
- uint32_t byte_rate; /* sample_rate * num_channels * bps / 8 */
- uint16_t block_align; /* num_channels * bps / 8 */
- uint16_t bits_per_sample;
- uint32_t data_id;
- uint32_t data_sz;
-};
-struct enc_meta_out{
- unsigned int offset_to_frame;
- unsigned int frame_size;
- unsigned int encoded_pcm_samples;
- unsigned int msw_ts;
- unsigned int lsw_ts;
- unsigned int nflags;
-} __attribute__ ((packed));
-
-struct qcp_header {
- /* RIFF Section */
- char riff[4];
- unsigned int s_riff;
- char qlcm[4];
-
- /* Format chunk */
- char fmt[4];
- unsigned int s_fmt;
- char mjr;
- char mnr;
- unsigned int data1; /* UNIQUE ID of the codec */
- unsigned short data2;
- unsigned short data3;
- char data4[8];
- unsigned short ver; /* Codec Info */
- char name[80];
- unsigned short abps; /* average bits per sec of the codec */
- unsigned short bytes_per_pkt;
- unsigned short samp_per_block;
- unsigned short samp_per_sec;
- unsigned short bits_per_samp;
- unsigned char vr_num_of_rates; /* Rate Header fmt info */
- unsigned char rvd1[3];
- unsigned short vr_bytes_per_pkt[8];
- unsigned int rvd2[5];
-
- /* Vrat chunk */
- unsigned char vrat[4];
- unsigned int s_vrat;
- unsigned int v_rate;
- unsigned int size_in_pkts;
-
- /* Data chunk */
- unsigned char data[4];
- unsigned int s_data;
-} __attribute__ ((packed));
-
- /* Common part */
- static struct qcp_header append_header = {
- {'R', 'I', 'F', 'F'}, 0, {'Q', 'L', 'C', 'M'},
- {'f', 'm', 't', ' '}, 150, 1, 0, 0, 0, 0,{0}, 0, {0},0,0,160,8000,16,0,{0},{0},{0},
- {'v','r','a','t'},0, 0, 0,{'d','a','t','a'},0
- };
-
-static int totaldatalen = 0;
-static int framecnt = 0;
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-unsigned int input_buf_cnt = 0;
-unsigned int output_buf_cnt = 0;
-int used_ip_buf_cnt = 0;
-volatile int event_is_done = 0;
-volatile int ebd_event_is_done = 0;
-volatile int fbd_event_is_done = 0;
-volatile int etb_event_is_done = 0;
-int ebd_cnt;
-int bInputEosReached = 0;
-int bOutputEosReached = 0;
-int bInputEosReached_tunnel = 0;
-static int etb_done = 0;
-int bFlushing = false;
-int bPause = false;
-const char *in_filename;
-const char *out_filename;
-
-int timeStampLfile = 0;
-int timestampInterval = 100;
-
-//* OMX Spec Version supported by the wrappers. Version = 1.1 */
-const OMX_U32 CURRENT_OMX_SPEC_VERSION = 0x00000101;
-OMX_COMPONENTTYPE* evrc_enc_handle = 0;
-
-OMX_BUFFERHEADERTYPE **pInputBufHdrs = NULL;
-OMX_BUFFERHEADERTYPE **pOutputBufHdrs = NULL;
-
-/************************************************************************/
-/* GLOBAL FUNC DECL */
-/************************************************************************/
-int Init_Encoder(char*);
-int Play_Encoder();
-OMX_STRING aud_comp;
-/**************************************************************************/
-/* STATIC DECLARATIONS */
-/**************************************************************************/
-
-static int open_audio_file ();
-static int Read_Buffer(OMX_BUFFERHEADERTYPE *pBufHdr );
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *evrc_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize);
-
-
-static OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData);
-static OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-
-static OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-static OMX_ERRORTYPE parse_pcm_header();
-void wait_for_event(void)
-{
- pthread_mutex_lock(&lock);
- DEBUG_PRINT("%s: event_is_done=%d", __FUNCTION__, event_is_done);
- while (event_is_done == 0) {
- pthread_cond_wait(&cond, &lock);
- }
- event_is_done = 0;
- pthread_mutex_unlock(&lock);
-}
-
-void event_complete(void )
-{
- pthread_mutex_lock(&lock);
- if (event_is_done == 0) {
- event_is_done = 1;
- pthread_cond_broadcast(&cond);
- }
- pthread_mutex_unlock(&lock);
-}
-
-void etb_wait_for_event(void)
-{
- pthread_mutex_lock(&etb_lock1);
- DEBUG_PRINT("%s: etb_event_is_done=%d", __FUNCTION__, etb_event_is_done);
- while (etb_event_is_done == 0) {
- pthread_cond_wait(&etb_cond, &etb_lock1);
- }
- etb_event_is_done = 0;
- pthread_mutex_unlock(&etb_lock1);
-}
-
-void etb_event_complete(void )
-{
- pthread_mutex_lock(&etb_lock1);
- if (etb_event_is_done == 0) {
- etb_event_is_done = 1;
- pthread_cond_broadcast(&etb_cond);
- }
- pthread_mutex_unlock(&etb_lock1);
-}
-
-static void create_qcp_header(int Datasize, int Frames)
-{
- append_header.s_riff = (unsigned)(Datasize + (int)QCP_HEADER_SIZE - 8);
- /* exclude riff id and size field */
- append_header.data1 = 0xe689d48d;
- append_header.data2 = 0x9076;
- append_header.data3 = 0x46b5;
- append_header.data4[0] = 0x91;
- append_header.data4[1] = 0xef;
- append_header.data4[2] = 0x73;
- append_header.data4[3] = 0x6a;
- append_header.data4[4] = 0x51;
- append_header.data4[5] = 0x00;
- append_header.data4[6] = 0xce;
- append_header.data4[7] = 0xb4;
- append_header.ver = 0x0001;
- memcpy(append_header.name, "TIA IS-127 Enhanced Variable Rate Codec, Speech Service Option 3", 64);
- append_header.abps = 9600;
- append_header.bytes_per_pkt = 23;
- append_header.vr_num_of_rates = 4;
- append_header.vr_bytes_per_pkt[0] = 0x0416;
- append_header.vr_bytes_per_pkt[1] = 0x030a;
- append_header.vr_bytes_per_pkt[2] = 0x0200;
- append_header.vr_bytes_per_pkt[3] = 0x0102;
- append_header.s_vrat = 0x00000008;
- append_header.v_rate = 0x00000001;
- append_header.size_in_pkts = (unsigned)Frames;
- append_header.s_data = (unsigned)Datasize;
- return;
-}
-
-OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData)
-{
- DEBUG_PRINT("Function %s \n", __FUNCTION__);
-
- /* To remove warning for unused variable to keep prototype same */
- (void)hComponent;
- (void)pAppData;
- (void)pEventData;
- switch(eEvent) {
- case OMX_EventCmdComplete:
- DEBUG_PRINT("\n OMX_EventCmdComplete event=%d data1=%u data2=%u\n",(OMX_EVENTTYPE)eEvent,
- nData1,nData2);
- event_complete();
- break;
- case OMX_EventError:
- DEBUG_PRINT("\n OMX_EventError \n");
- break;
- case OMX_EventBufferFlag:
- DEBUG_PRINT("\n OMX_EventBufferFlag \n");
- bOutputEosReached = true;
- event_complete();
- break;
- case OMX_EventPortSettingsChanged:
- DEBUG_PRINT("\n OMX_EventPortSettingsChanged \n");
- break;
- default:
- DEBUG_PRINT("\n Unknown Event \n");
- break;
- }
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- size_t bytes_writen = 0;
- size_t total_bytes_writen = 0;
- size_t len = 0;
- struct enc_meta_out *meta = NULL;
- OMX_U8 *src = pBuffer->pBuffer;
- unsigned int num_of_frames = 1;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- if(((pBuffer->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
- DEBUG_PRINT("FBD::EOS on output port\n ");
- bOutputEosReached = true;
- return OMX_ErrorNone;
- }
- if(bInputEosReached_tunnel || bOutputEosReached)
- {
- DEBUG_PRINT("EOS REACHED NO MORE PROCESSING OF BUFFERS\n");
- return OMX_ErrorNone;
- }
- if(num_of_frames != src[0]){
-
- printf("Data corrupt\n");
- return OMX_ErrorNone;
- }
- /* Skip the first bytes */
-
-
-
- src += sizeof(unsigned char);
- meta = (struct enc_meta_out *)src;
- while (num_of_frames > 0) {
- meta = (struct enc_meta_out *)src;
- /*printf("offset=%d framesize=%d encoded_pcm[%d] msw_ts[%d]lsw_ts[%d] nflags[%d]\n",
- meta->offset_to_frame,
- meta->frame_size,
- meta->encoded_pcm_samples, meta->msw_ts, meta->lsw_ts, meta->nflags);*/
- len = meta->frame_size;
-
- bytes_writen = fwrite(pBuffer->pBuffer + sizeof(unsigned char) + meta->offset_to_frame,1,len,outputBufferFile);
- if(bytes_writen < len)
- {
- DEBUG_PRINT("error: invalid EVRC encoded data \n");
- return OMX_ErrorNone;
- }
- src += sizeof(struct enc_meta_out);
- num_of_frames--;
- total_bytes_writen += len;
- }
- DEBUG_PRINT(" FillBufferDone size writen to file %zu count %d\n",total_bytes_writen, framecnt);
- totaldatalen = totaldatalen + (int)total_bytes_writen;
- framecnt++;
-
- DEBUG_PRINT(" FBD calling FTB\n");
- OMX_FillThisBuffer(hComponent,pBuffer);
-
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- int readBytes =0;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- ebd_cnt++;
- used_ip_buf_cnt--;
- pthread_mutex_lock(&etb_lock);
- if(!etb_done)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT("Wait till first set of buffers are given to component\n");
- DEBUG_PRINT("\n*********************************************\n");
- etb_done++;
- pthread_mutex_unlock(&etb_lock);
- etb_wait_for_event();
- }
- else
- {
- pthread_mutex_unlock(&etb_lock);
- }
-
-
- if(bInputEosReached)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT(" EBD::EOS on input port\n ");
- DEBUG_PRINT("*********************************************\n");
- return OMX_ErrorNone;
- }else if (bFlushing == true) {
- DEBUG_PRINT("omx_evrc13_adec_test: bFlushing is set to TRUE used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- if (used_ip_buf_cnt == 0) {
- bFlushing = false;
- } else {
- DEBUG_PRINT("omx_evrc13_adec_test: more buffer to come back used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- return OMX_ErrorNone;
- }
- }
-
- if((readBytes = Read_Buffer(pBuffer)) > 0) {
- pBuffer->nFilledLen = (OMX_U32)readBytes;
- used_ip_buf_cnt++;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- }
- else{
- pBuffer->nFlags |= OMX_BUFFERFLAG_EOS;
- used_ip_buf_cnt++;
- bInputEosReached = true;
- pBuffer->nFilledLen = 0;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- DEBUG_PRINT("EBD..Either EOS or Some Error while reading file\n");
- }
- return OMX_ErrorNone;
-}
-
-void signal_handler(int sig_id) {
-
- /* Flush */
- if (sig_id == SIGUSR1) {
- DEBUG_PRINT("%s Initiate flushing\n", __FUNCTION__);
- bFlushing = true;
- OMX_SendCommand(evrc_enc_handle, OMX_CommandFlush, OMX_ALL, NULL);
- } else if (sig_id == SIGUSR2) {
- if (bPause == true) {
- DEBUG_PRINT("%s resume record\n", __FUNCTION__);
- bPause = false;
- OMX_SendCommand(evrc_enc_handle, OMX_CommandStateSet, OMX_StateExecuting, NULL);
- } else {
- DEBUG_PRINT("%s pause record\n", __FUNCTION__);
- bPause = true;
- OMX_SendCommand(evrc_enc_handle, OMX_CommandStateSet, OMX_StatePause, NULL);
- }
- }
-}
-
-int main(int argc, char **argv)
-{
- unsigned int bufCnt=0;
- OMX_ERRORTYPE result;
-
- struct sigaction sa;
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = &signal_handler;
- sigaction(SIGABRT, &sa, NULL);
- sigaction(SIGUSR1, &sa, NULL);
- sigaction(SIGUSR2, &sa, NULL);
-
- (void) signal(SIGINT, Release_Encoder);
-
- pthread_cond_init(&cond, 0);
- pthread_mutex_init(&lock, 0);
- pthread_cond_init(&etb_cond, 0);
- pthread_mutex_init(&etb_lock, 0);
- pthread_mutex_init(&etb_lock1, 0);
-
- if (argc >= 9) {
- in_filename = argv[1];
- out_filename = argv[2];
- tunnel = (uint32_t)atoi(argv[3]);
- min_bitrate = (uint32_t)atoi(argv[4]);
- max_bitrate = (uint32_t)atoi(argv[5]);
- cdmarate = (uint32_t)atoi(argv[6]);
- recpath = (uint32_t)atoi(argv[7]); // No configuration support yet..
- rectime = (uint32_t)atoi(argv[8]);
-
- } else {
- DEBUG_PRINT(" invalid format: \n");
- DEBUG_PRINT("ex: ./mm-aenc-omxevrc-test INPUTFILE OUTPUTFILE Tunnel MINRATE MAXRATE CDMARATE RECORDPATH RECORDTIME\n");
- DEBUG_PRINT("MINRATE MAXRATE and CDMARATE 1 to 4\n");
- DEBUG_PRINT("RECORDPATH 0(TX),1(RX),2(BOTH),3(MIC)\n");
- DEBUG_PRINT("RECORDTIME in seconds for AST Automation\n");
- return 0;
- }
- if(recpath != 3) {
- DEBUG_PRINT("For RECORDPATH Only MIC supported\n");
- return 0;
- }
- if(tunnel == 0)
- aud_comp = "OMX.qcom.audio.encoder.evrc";
- else
- aud_comp = "OMX.qcom.audio.encoder.tunneled.evrc";
- if(Init_Encoder(aud_comp)!= 0x00)
- {
- DEBUG_PRINT("Decoder Init failed\n");
- return -1;
- }
-
- fcntl(0, F_SETFL, O_NONBLOCK);
-
- if(Play_Encoder() != 0x00)
- {
- DEBUG_PRINT("Play_Decoder failed\n");
- return -1;
- }
-
- // Wait till EOS is reached...
- if(rectime && tunnel)
- {
- sleep(rectime);
- rectime = 0;
- bInputEosReached_tunnel = 1;
- DEBUG_PRINT("\EOS ON INPUT PORT\n");
- }
- else
- {
- wait_for_event();
- }
-
- if((bInputEosReached_tunnel) || ((bOutputEosReached) && !tunnel))
- {
-
- DEBUG_PRINT("\nMoving the decoder to idle state \n");
- OMX_SendCommand(evrc_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- wait_for_event();
-
- DEBUG_PRINT("\nMoving the encoder to loaded state \n");
- OMX_SendCommand(evrc_enc_handle, OMX_CommandStateSet, OMX_StateLoaded,0);
- sleep(1);
- if (!tunnel)
- {
- DEBUG_PRINT("\nFillBufferDone: Deallocating i/p buffers \n");
- for(bufCnt=0; bufCnt < input_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(evrc_enc_handle, 0, pInputBufHdrs[bufCnt]);
- }
- }
-
- DEBUG_PRINT ("\nFillBufferDone: Deallocating o/p buffers \n");
- for(bufCnt=0; bufCnt < output_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(evrc_enc_handle, 1, pOutputBufHdrs[bufCnt]);
- }
- wait_for_event();
- create_qcp_header(totaldatalen, framecnt);
- fseek(outputBufferFile, 0,SEEK_SET);
- fwrite(&append_header,1,QCP_HEADER_SIZE,outputBufferFile);
-
-
- result = OMX_FreeHandle(evrc_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
- if(tunnel)
- {
- #ifdef AUDIOV2
- if (msm_route_stream(DIR_TX,session_id,device_id, 0))
- {
- DEBUG_PRINT("\ncould not set stream routing\n");
- return -1;
- }
- if (msm_en_device(device_id, 0))
- {
- DEBUG_PRINT("\ncould not enable device\n");
- return -1;
- }
- msm_mixer_close();
- #endif
- }
- OMX_Deinit();
- ebd_cnt=0;
- bOutputEosReached = false;
- bInputEosReached_tunnel = false;
- bInputEosReached = 0;
- evrc_enc_handle = NULL;
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- fclose(outputBufferFile);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...EVRC ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- }
- return 0;
-}
-
-void Release_Encoder()
-{
- static int cnt=0;
- OMX_ERRORTYPE result;
-
- DEBUG_PRINT("END OF EVRC ENCODING: EXITING PLEASE WAIT\n");
- bInputEosReached_tunnel = 1;
- event_complete();
- cnt++;
- if(cnt > 1)
- {
- /* FORCE RESET */
- evrc_enc_handle = NULL;
- ebd_cnt=0;
- bInputEosReached_tunnel = false;
-
- result = OMX_FreeHandle(evrc_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
-
- OMX_Deinit();
-
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...EVRC ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- exit(0);
- }
-}
-
-int Init_Encoder(OMX_STRING audio_component)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE omxresult;
- OMX_U32 total = 0;
- typedef OMX_U8* OMX_U8_PTR;
- char *role ="audio_encoder";
-
- static OMX_CALLBACKTYPE call_back = {
- &EventHandler,&EmptyBufferDone,&FillBufferDone
- };
-
- /* Init. the OpenMAX Core */
- DEBUG_PRINT("\nInitializing OpenMAX Core....\n");
- omxresult = OMX_Init();
-
- if(OMX_ErrorNone != omxresult) {
- DEBUG_PRINT("\n Failed to Init OpenMAX core");
- return -1;
- }
- else {
- DEBUG_PRINT("\nOpenMAX Core Init Done\n");
- }
-
- /* Query for audio decoders*/
- DEBUG_PRINT("Evrc_test: Before entering OMX_GetComponentOfRole");
- OMX_GetComponentsOfRole(role, &total, 0);
- DEBUG_PRINT ("\nTotal components of role=%s :%u", role, total);
-
-
- omxresult = OMX_GetHandle((OMX_HANDLETYPE*)(&evrc_enc_handle),
- (OMX_STRING)audio_component, NULL, &call_back);
- if (FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to Load the component:%s\n", audio_component);
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nComponent %s is in LOADED state\n", audio_component);
- }
-
- /* Get the port information */
- CONFIG_VERSION_SIZE(portParam);
- omxresult = OMX_GetParameter(evrc_enc_handle, OMX_IndexParamAudioInit,
- (OMX_PTR)&portParam);
-
- if(FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to get Port Param\n");
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nportParam.nPorts:%u\n", portParam.nPorts);
- DEBUG_PRINT("\nportParam.nStartPortNumber:%u\n",
- portParam.nStartPortNumber);
- }
-
- if(OMX_ErrorNone != omxresult)
- {
- DEBUG_PRINT("Set parameter failed");
- }
-
- return 0;
-}
-
-int Play_Encoder()
-{
- unsigned int i;
- int Size=0;
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE ret;
- OMX_INDEXTYPE index;
-#ifdef __LP64__
- DEBUG_PRINT("sizeof[%ld]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#else
- DEBUG_PRINT("sizeof[%d]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#endif
-
- /* open the i/p and o/p files based on the video file format passed */
- if(open_audio_file()) {
- DEBUG_PRINT("\n Returning -1");
- return -1;
- }
-
- /* Query the encoder input min buf requirements */
- CONFIG_VERSION_SIZE(inputportFmt);
-
- /* Port for which the Client needs to obtain info */
- inputportFmt.nPortIndex = portParam.nStartPortNumber;
-
- OMX_GetParameter(evrc_enc_handle,OMX_IndexParamPortDefinition,&inputportFmt);
- DEBUG_PRINT ("\nEnc Input Buffer Count %u\n", inputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Input Buffer Size %u\n", inputportFmt.nBufferSize);
-
- if(OMX_DirInput != inputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Input Port\n");
- return -1;
- }
-
- pcmparam.nPortIndex = 0;
- pcmparam.nChannels = channels;
- pcmparam.nSamplingRate = samplerate;
- OMX_SetParameter(evrc_enc_handle,OMX_IndexParamAudioPcm,&pcmparam);
-
-
- /* Query the encoder outport's min buf requirements */
- CONFIG_VERSION_SIZE(outputportFmt);
- /* Port for which the Client needs to obtain info */
- outputportFmt.nPortIndex = portParam.nStartPortNumber + 1;
-
- OMX_GetParameter(evrc_enc_handle,OMX_IndexParamPortDefinition,&outputportFmt);
- DEBUG_PRINT ("\nEnc: Output Buffer Count %u\n", outputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Output Buffer Size %u\n", outputportFmt.nBufferSize);
-
- if(OMX_DirOutput != outputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Output Port\n");
- return -1;
- }
-
-
- CONFIG_VERSION_SIZE(evrcparam);
-
- evrcparam.nPortIndex = 1;
- evrcparam.nChannels = channels; //2 ; /* 1-> mono 2-> stereo*/
- evrcparam.nMinBitRate = min_bitrate;
- evrcparam.nMaxBitRate = max_bitrate;
- OMX_SetParameter(evrc_enc_handle,OMX_IndexParamAudioEvrc,&evrcparam);
- OMX_GetExtensionIndex(evrc_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index);
- OMX_GetParameter(evrc_enc_handle,index,&streaminfoparam);
- if(tunnel) {
- #ifdef AUDIOV2
- session_id = streaminfoparam.sessionId;
- control = msm_mixer_open("/dev/snd/controlC0", 0);
- if(control < 0)
- printf("ERROR opening the device\n");
- device_id = msm_get_device(device);
- DEBUG_PRINT ("\ndevice_id = %d\n",device_id);
- DEBUG_PRINT("\nsession_id = %d\n",session_id);
- if (msm_en_device(device_id, 1))
- {
- perror("could not enable device\n");
- return -1;
- }
- if (msm_route_stream(DIR_TX,session_id,device_id, 1))
- {
- perror("could not set stream routing\n");
- return -1;
- }
- #endif
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n");
- OMX_SendCommand(evrc_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- /* wait_for_event(); should not wait here event complete status will
- not come until enough buffer are allocated */
- if (tunnel == 0)
- {
- input_buf_cnt = inputportFmt.nBufferCountActual; // inputportFmt.nBufferCountMin + 5;
- DEBUG_PRINT("Transition to Idle State succesful...\n");
- /* Allocate buffer on decoder's i/p port */
- error = Allocate_Buffer(evrc_enc_handle, &pInputBufHdrs, inputportFmt.nPortIndex,
- input_buf_cnt, inputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pInputBufHdrs == NULL) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer success\n");
- }
- }
- output_buf_cnt = outputportFmt.nBufferCountMin ;
-
- /* Allocate buffer on encoder's O/Pp port */
- error = Allocate_Buffer(evrc_enc_handle, &pOutputBufHdrs, outputportFmt.nPortIndex,
- output_buf_cnt, outputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pOutputBufHdrs == NULL) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer success\n");
- }
-
- wait_for_event();
-
-
- if (tunnel == 1)
- {
- DEBUG_PRINT ("\nOMX_SendCommand to enable TUNNEL MODE during IDLE\n");
- OMX_SendCommand(evrc_enc_handle, OMX_CommandPortDisable,0,0); // disable input port
- wait_for_event();
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand encoder -> Executing\n");
- OMX_SendCommand(evrc_enc_handle, OMX_CommandStateSet, OMX_StateExecuting,0);
- wait_for_event();
-
- DEBUG_PRINT(" Start sending OMX_FILLthisbuffer\n");
-
- for(i=0; i < output_buf_cnt; i++) {
- DEBUG_PRINT ("\nOMX_FillThisBuffer on output buf no.%d\n",i);
- pOutputBufHdrs[i]->nOutputPortIndex = 1;
- pOutputBufHdrs[i]->nFlags = pOutputBufHdrs[i]->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
- ret = OMX_FillThisBuffer(evrc_enc_handle, pOutputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_FillThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_FillThisBuffer success!\n");
- }
- }
-
-if(tunnel == 0)
-{
- DEBUG_PRINT(" Start sending OMX_emptythisbuffer\n");
- for (i = 0;i < input_buf_cnt;i++) {
- DEBUG_PRINT ("\nOMX_EmptyThisBuffer on Input buf no.%d\n",i);
- pInputBufHdrs[i]->nInputPortIndex = 0;
- Size = Read_Buffer(pInputBufHdrs[i]);
- if(Size <=0 ){
- DEBUG_PRINT("NO DATA READ\n");
- bInputEosReached = true;
- pInputBufHdrs[i]->nFlags= OMX_BUFFERFLAG_EOS;
- }
- pInputBufHdrs[i]->nFilledLen = (OMX_U32)Size;
- pInputBufHdrs[i]->nInputPortIndex = 0;
- used_ip_buf_cnt++;
- ret = OMX_EmptyThisBuffer(evrc_enc_handle, pInputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_EmptyThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_EmptyThisBuffer success!\n");
- }
- if(Size <=0 ){
- break;//eos reached
- }
- }
- pthread_mutex_lock(&etb_lock);
- if(etb_done)
-{
- DEBUG_PRINT("Component is waiting for EBD to be released.\n");
- etb_event_complete();
- }
- else
- {
- DEBUG_PRINT("\n****************************\n");
- DEBUG_PRINT("EBD not yet happened ...\n");
- DEBUG_PRINT("\n****************************\n");
- etb_done++;
- }
- pthread_mutex_unlock(&etb_lock);
-}
-
- return 0;
-}
-
-
-
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *avc_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE error=OMX_ErrorNone;
- unsigned int bufCnt=0;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)avc_enc_handle;
- *pBufHdrs= (OMX_BUFFERHEADERTYPE **)
- malloc(sizeof(OMX_BUFFERHEADERTYPE*)*bufCntMin);
-
- for(bufCnt=0; bufCnt < bufCntMin; ++bufCnt) {
- DEBUG_PRINT("\n OMX_AllocateBuffer No %d \n", bufCnt);
- error = OMX_AllocateBuffer(evrc_enc_handle, &((*pBufHdrs)[bufCnt]),
- nPortIndex, NULL, bufSize);
- }
-
- return error;
-}
-
-
-
-
-static int Read_Buffer (OMX_BUFFERHEADERTYPE *pBufHdr )
-{
-
- size_t bytes_read=0;
-
-
- pBufHdr->nFilledLen = 0;
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
-
- bytes_read = fread(pBufHdr->pBuffer, 1, pBufHdr->nAllocLen , inputBufferFile);
-
- pBufHdr->nFilledLen = (OMX_U32)bytes_read;
- // Time stamp logic
- ((OMX_BUFFERHEADERTYPE *)pBufHdr)->nTimeStamp = \
-
- (OMX_TICKS) ((total_pcm_bytes * 1000)/(samplerate * channels *2));
-
- DEBUG_PRINT ("\n--time stamp -- %ld\n", (unsigned long)((OMX_BUFFERHEADERTYPE *)pBufHdr)->nTimeStamp);
- if(bytes_read == 0)
- {
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
- DEBUG_PRINT ("\nBytes read zero\n");
- }
- else
- {
- pBufHdr->nFlags = pBufHdr->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
-
- total_pcm_bytes = (unsigned)(total_pcm_bytes + bytes_read);
- }
-
- return (int)bytes_read;;
-}
-
-
-
-//In Encoder this Should Open a PCM or WAV file for input.
-
-static int open_audio_file ()
-{
- int error_code = 0;
-
- if (!tunnel)
- {
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, in_filename);
- inputBufferFile = fopen (in_filename, "rb");
- if (inputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- in_filename);
- error_code = -1;
- }
- if(parse_pcm_header() != 0x00)
- {
- DEBUG_PRINT("PCM parser failed \n");
- return -1;
- }
- }
-
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, out_filename);
- outputBufferFile = fopen (out_filename, "wb");
- if (outputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- out_filename);
- error_code = -1;
- return error_code;
- }
- fseek(outputBufferFile, QCP_HEADER_SIZE, SEEK_SET);
- return error_code;
-}
-
-static OMX_ERRORTYPE parse_pcm_header()
-{
- struct wav_header hdr;
-
- DEBUG_PRINT("\n***************************************************************\n");
- if(fread(&hdr, 1, sizeof(hdr),inputBufferFile)!=sizeof(hdr))
- {
- DEBUG_PRINT("Wav file cannot read header\n");
- return -1;
- }
-
- if ((hdr.riff_id != ID_RIFF) ||
- (hdr.riff_fmt != ID_WAVE)||
- (hdr.fmt_id != ID_FMT))
- {
- DEBUG_PRINT("Wav file is not a riff/wave file\n");
- return -1;
- }
-
- if (hdr.audio_format != FORMAT_PCM)
- {
- DEBUG_PRINT("Wav file is not adpcm format %d and fmt size is %d\n",
- hdr.audio_format, hdr.fmt_sz);
- return -1;
- }
-
- DEBUG_PRINT("Samplerate is %d\n", hdr.sample_rate);
- DEBUG_PRINT("Channel Count is %d\n", hdr.num_channels);
- DEBUG_PRINT("\n***************************************************************\n");
-
- samplerate = hdr.sample_rate;
- channels = hdr.num_channels;
- total_pcm_bytes = 0;
-
- return OMX_ErrorNone;
-}
diff --git a/mm-audio/aenc-g711/qdsp6/Android.mk b/mm-audio/aenc-g711/qdsp6/Android.mk
index fd071eb..b4e60d4 100644
--- a/mm-audio/aenc-g711/qdsp6/Android.mk
+++ b/mm-audio/aenc-g711/qdsp6/Android.mk
@@ -42,28 +42,6 @@
include $(BUILD_SHARED_LIBRARY)
-
-# ---------------------------------------------------------------------------------
-# Make the apps-test (mm-aenc-omxg711-test)
-# ---------------------------------------------------------------------------------
-
-include $(CLEAR_VARS)
-
-mm-g711-enc-test-inc := $(LOCAL_PATH)/inc
-mm-g711-enc-test-inc += $(LOCAL_PATH)/test
-mm-g711-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-
-LOCAL_MODULE := mm-aenc-omxg711-test
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := $(libOmxG711Enc-def)
-LOCAL_C_INCLUDES := $(mm-g711-enc-test-inc)
-LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libmm-omxcore
-LOCAL_SHARED_LIBRARIES += libOmxG711Enc
-LOCAL_SRC_FILES := test/omx_g711_enc_test.c
-
-include $(BUILD_EXECUTABLE)
-
endif
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-g711/qdsp6/Makefile b/mm-audio/aenc-g711/qdsp6/Makefile
index 80dd4e5..f6bd921 100644
--- a/mm-audio/aenc-g711/qdsp6/Makefile
+++ b/mm-audio/aenc-g711/qdsp6/Makefile
@@ -39,7 +39,7 @@
# ---------------------------------------------------------------------------------
# BUILD
# ---------------------------------------------------------------------------------
-all: libOmxG711Enc.so.$(LIBVER) mm-aenc-omxg711-test
+all: libOmxG711Enc.so.$(LIBVER)
install:
echo "intalling aenc-g711 in $(DESTDIR)"
@@ -49,7 +49,6 @@
install -m 555 libOmxG711Enc.so.$(LIBVER) $(LIBINSTALLDIR)
cd $(LIBINSTALLDIR) && ln -s libOmxG711Enc.so.$(LIBVER) libOmxG711Enc.so.$(LIBMAJOR)
cd $(LIBINSTALLDIR) && ln -s libOmxG711Enc.so.$(LIBMAJOR) libOmxG711Enc.so
- install -m 555 mm-aenc-omxg711-test $(BININSTALLDIR)
# ---------------------------------------------------------------------------------
# COMPILE LIBRARY
@@ -65,17 +64,5 @@
$(CC) $(CPPFLAGS) $(CFLAGS_SO) $(LDFLAGS_SO) -Wl,-soname,libOmxG711Enc.so.$(LIBMAJOR) -o $@ $^ $(LDFLAGS) $(LDLIBS)
# ---------------------------------------------------------------------------------
-# COMPILE TEST APP
-# ---------------------------------------------------------------------------------
-TEST_LDLIBS := -lpthread
-TEST_LDLIBS += -ldl
-TEST_LDLIBS += -lOmxCore
-
-#TEST_SRCS := test/omx_g711_enc_test.c
-
-mm-aenc-omxg711-test: libOmxG711Enc.so.$(LIBVER) $(TEST_SRCS)
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
-
-# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-g711/qdsp6/Makefile.am b/mm-audio/aenc-g711/qdsp6/Makefile.am
index f5ccca8..688bae8 100644
--- a/mm-audio/aenc-g711/qdsp6/Makefile.am
+++ b/mm-audio/aenc-g711/qdsp6/Makefile.am
@@ -23,8 +23,3 @@
libOmxG711Enc_la_CPPFLAGS = $(AM_CFLAGS) -Dstrlcpy=g_strlcpy $(GLIB_CFLAGS) -include glib.h
libOmxG711Enc_la_LIBADD = $(GLIB_LIBS) -lcutils -llog -lstdc++
libOmxG711Enc_la_LDFLAGS = -shared -avoid-version
-
-bin_PROGRAMS = mm_aenc_omxg711_test
-mm_aenc_omxg711_test_SOURCES = ./test/omx_g711_enc_test.c
-mm_aenc_omxg711_test_CFLAGS = $(AM_CFLAGS) -Dstrlcpy=g_strlcpy $(GLIB_CFLAGS) -include glib.h
-mm_aenc_omxg711_test_LDADD = $(GLIB_LIBS) -lmm-omxcore -lpthread libOmxG711Enc.la
diff --git a/mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c b/mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c
deleted file mode 100644
index 54e80ea..0000000
--- a/mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c
+++ /dev/null
@@ -1,1026 +0,0 @@
-/*--------------------------------------------------------------------------
-Copyright (c) 2010, 2014, 2016, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------*/
-
-
-/*
- An Open max test application ....
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include "OMX_Core.h"
-#include "OMX_Component.h"
-#include "pthread.h"
-#include <signal.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include<unistd.h>
-#include<string.h>
-#include <pthread.h>
-#include "QOMX_AudioExtensions.h"
-#include "QOMX_AudioIndexExtensions.h"
-#include <linux/ioctl.h>
-
-typedef unsigned char uint8;
-typedef unsigned char byte;
-typedef unsigned int uint32;
-typedef unsigned int uint16;
-
-QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam;
-
-void Release_Encoder();
-
-#ifdef AUDIOV2
-unsigned short session_id;
-int device_id;
-int control = 0;
-const char *device="handset_tx";
-#define DIR_TX 2
-#endif
-
-#define MIN(A,B) (((A) < (B))?(A):(B))
-
-FILE *F1 = NULL;
-
-uint32_t channels = 1;
-uint32_t samplerate = 8000;
-uint32_t pcmplayback = 0;
-uint32_t tunnel = 0;
-uint32_t rectime = 0;
-uint32_t encode_format = 0;
-#define DEBUG_PRINT printf
-unsigned to_idle_transition = 0;
-
-
-/************************************************************************/
-/* #DEFINES */
-/************************************************************************/
-#define false 0
-#define true 1
-
-#define CONFIG_VERSION_SIZE(param) \
- param.nVersion.nVersion = CURRENT_OMX_SPEC_VERSION;\
- param.nSize = sizeof(param);
-
-#define FAILED(result) (result != OMX_ErrorNone)
-
-#define SUCCEEDED(result) (result == OMX_ErrorNone)
-
-/************************************************************************/
-/* GLOBAL DECLARATIONS */
-/************************************************************************/
-
-pthread_mutex_t lock;
-pthread_cond_t cond;
-pthread_mutex_t elock;
-pthread_cond_t econd;
-pthread_cond_t fcond;
-pthread_mutex_t etb_lock;
-pthread_mutex_t etb_lock1;
-pthread_cond_t etb_cond;
-FILE * inputBufferFile;
-FILE * outputBufferFile;
-OMX_PARAM_PORTDEFINITIONTYPE inputportFmt;
-OMX_PARAM_PORTDEFINITIONTYPE outputportFmt;
-OMX_AUDIO_PARAM_PCMMODETYPE pcmParams;
-OMX_PORT_PARAM_TYPE portParam;
-OMX_ERRORTYPE error;
-
-
-
-
-#define ID_RIFF 0x46464952
-#define ID_WAVE 0x45564157
-#define ID_FMT 0x20746d66
-#define ID_DATA 0x61746164
-#define ID_FACT 0x74636166
-
-#define FORMAT_PCM 0x0001
-#define FORMAT_ALAW 0x0006
-#define FORMAT_MULAW 0x0007
-
-struct wav_header {
- uint32_t riff_id;
- uint32_t riff_sz;
- uint32_t riff_fmt;
- uint32_t fmt_id;
- uint32_t fmt_sz;
- uint16_t audio_format;
- uint16_t num_channels;
- uint32_t sample_rate;
- uint32_t byte_rate; /* sample_rate * num_channels * bps / 8 */
- uint16_t block_align; /* num_channels * bps / 8 */
- uint16_t bits_per_sample;
- uint32_t data_id;
- uint32_t data_sz;
-};
-
-struct __attribute__((__packed__)) g711_header {
- uint32_t riff_id;
- uint32_t riff_sz;
- uint32_t riff_fmt;
- uint32_t fmt_id;
- uint32_t fmt_sz;
- uint16_t audio_format;
- uint16_t num_channels;
- uint32_t sample_rate;
- uint32_t byte_rate; /* sample_rate * num_channels * bps / 8 */
- uint16_t block_align; /* num_channels * bps / 8 */
- uint16_t bits_per_sample;
- uint16_t extension_size;
- uint32_t fact_id;
- uint32_t fact_sz;
- uint32_t sample_length;
- uint32_t data_id;
- uint32_t data_sz;
-};
-
-struct enc_meta_out{
- unsigned int offset_to_frame;
- unsigned int frame_size;
- unsigned int encoded_pcm_samples;
- unsigned int msw_ts;
- unsigned int lsw_ts;
- unsigned int nflags;
-} __attribute__ ((packed));
-
-static int totaldatalen = 0;
-
-static struct wav_header hdr;
-static struct g711_header g711hdr;
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-unsigned int input_buf_cnt = 0;
-unsigned int output_buf_cnt = 0;
-int used_ip_buf_cnt = 0;
-volatile int event_is_done = 0;
-volatile int ebd_event_is_done = 0;
-volatile int fbd_event_is_done = 0;
-volatile int etb_event_is_done = 0;
-int ebd_cnt;
-int bInputEosReached = 0;
-int bOutputEosReached = 0;
-int bInputEosReached_tunnel = 0;
-static int etb_done = 0;
-int bFlushing = false;
-int bPause = false;
-const char *in_filename;
-const char *out_filename;
-
-int timeStampLfile = 0;
-int timestampInterval = 100;
-
-//* OMX Spec Version supported by the wrappers. Version = 1.1 */
-const OMX_U32 CURRENT_OMX_SPEC_VERSION = 0x00000101;
-OMX_COMPONENTTYPE* g711_enc_handle = 0;
-
-OMX_BUFFERHEADERTYPE **pInputBufHdrs = NULL;
-OMX_BUFFERHEADERTYPE **pOutputBufHdrs = NULL;
-
-/************************************************************************/
-/* GLOBAL FUNC DECL */
-/************************************************************************/
-int Init_Encoder(char*);
-int Play_Encoder();
-OMX_STRING aud_comp;
-/**************************************************************************/
-/* STATIC DECLARATIONS */
-/**************************************************************************/
-
-static int open_audio_file ();
-static int Read_Buffer(OMX_BUFFERHEADERTYPE *pBufHdr );
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *g711_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize);
-
-
-static OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData);
-static OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-
-static OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-static OMX_ERRORTYPE parse_pcm_header();
-static OMX_ERRORTYPE attach_g711_header();
-void wait_for_event(void)
-{
- pthread_mutex_lock(&lock);
- DEBUG_PRINT("%s: event_is_done=%d", __FUNCTION__, event_is_done);
- while (event_is_done == 0) {
- pthread_cond_wait(&cond, &lock);
- }
- event_is_done = 0;
- pthread_mutex_unlock(&lock);
-}
-
-void event_complete(void )
-{
- pthread_mutex_lock(&lock);
- if (event_is_done == 0) {
- event_is_done = 1;
- pthread_cond_broadcast(&cond);
- }
- pthread_mutex_unlock(&lock);
-}
-
-void etb_wait_for_event(void)
-{
- pthread_mutex_lock(&etb_lock1);
- DEBUG_PRINT("%s: etb_event_is_done=%d", __FUNCTION__, etb_event_is_done);
- while (etb_event_is_done == 0) {
- pthread_cond_wait(&etb_cond, &etb_lock1);
- }
- etb_event_is_done = 0;
- pthread_mutex_unlock(&etb_lock1);
-}
-
-void etb_event_complete(void )
-{
- pthread_mutex_lock(&etb_lock1);
- if (etb_event_is_done == 0) {
- etb_event_is_done = 1;
- pthread_cond_broadcast(&etb_cond);
- }
- pthread_mutex_unlock(&etb_lock1);
-}
-
-
-OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData)
-{
- DEBUG_PRINT("Function %s \n", __FUNCTION__);
- /* To remove warning for unused variable to keep prototype same */
- (void)hComponent;
- (void)pAppData;
- (void)pEventData;
-
- switch(eEvent) {
- case OMX_EventCmdComplete:
- DEBUG_PRINT("\n OMX_EventCmdComplete event=%d data1=%u data2=%u\n",(OMX_EVENTTYPE)eEvent,
- nData1,nData2);
- event_complete();
- break;
- case OMX_EventError:
- DEBUG_PRINT("\n OMX_EventError \n");
- break;
- case OMX_EventBufferFlag:
- DEBUG_PRINT("\n OMX_EventBufferFlag \n");
- bOutputEosReached = true;
- event_complete();
- break;
- case OMX_EventPortSettingsChanged:
- DEBUG_PRINT("\n OMX_EventPortSettingsChanged \n");
- break;
- default:
- DEBUG_PRINT("\n Unknown Event \n");
- break;
- }
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- size_t bytes_writen = 0;
- size_t total_bytes_writen = 0;
- size_t len = 0;
- struct enc_meta_out *meta = NULL;
- OMX_U8 *src = pBuffer->pBuffer;
- unsigned int num_of_frames = 1;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- if(((pBuffer->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
- DEBUG_PRINT("FBD::EOS on output port totaldatalen %d\n ", totaldatalen);
- bOutputEosReached = true;
- g711hdr.data_sz = (uint32_t)totaldatalen;
- g711hdr.sample_length = (uint32_t)totaldatalen;
- g711hdr.riff_sz = g711hdr.data_sz + sizeof(g711hdr) - 8;
- fseek(outputBufferFile, 0, SEEK_SET);
- fwrite(&g711hdr,1, sizeof(g711hdr), outputBufferFile);
- fseek(outputBufferFile, 0, SEEK_END);
- return OMX_ErrorNone;
- }
- if(bInputEosReached_tunnel || bOutputEosReached)
- {
- DEBUG_PRINT("EOS REACHED NO MORE PROCESSING OF BUFFERS\n");
- return OMX_ErrorNone;
- }
- if(num_of_frames != src[0]){
-
- printf("Data corrupt\n");
- return OMX_ErrorNone;
- }
- /* Skip the first bytes */
-
-
-
- src += sizeof(unsigned char);
- meta = (struct enc_meta_out *)src;
- while (num_of_frames > 0) {
- meta = (struct enc_meta_out *)src;
- len = meta->frame_size;
- bytes_writen = fwrite(pBuffer->pBuffer + sizeof(unsigned char) + meta->offset_to_frame,1,len,outputBufferFile);
- if(bytes_writen < len)
- {
- DEBUG_PRINT("error: invalid g711 encoded data \n");
- return OMX_ErrorNone;
- }
- src += sizeof(struct enc_meta_out);
- num_of_frames--;
- total_bytes_writen += len;
- }
- DEBUG_PRINT(" FillBufferDone size writen to file %zu\n",total_bytes_writen);
- totaldatalen = totaldatalen + (int)total_bytes_writen;
-
- DEBUG_PRINT(" FBD calling FTB\n");
- OMX_FillThisBuffer(hComponent,pBuffer);
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- int readBytes =0;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- ebd_cnt++;
- used_ip_buf_cnt--;
- pthread_mutex_lock(&etb_lock);
- if(!etb_done)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT("Wait till first set of buffers are given to component\n");
- DEBUG_PRINT("\n*********************************************\n");
- etb_done++;
- pthread_mutex_unlock(&etb_lock);
- etb_wait_for_event();
- }
- else
- {
- pthread_mutex_unlock(&etb_lock);
- }
-
-
- if(bInputEosReached)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT(" EBD::EOS on input port\n ");
- DEBUG_PRINT("*********************************************\n");
- return OMX_ErrorNone;
- }else if (bFlushing == true) {
- DEBUG_PRINT("omx_g711_aenc_test: bFlushing is set to TRUE used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- if (used_ip_buf_cnt == 0) {
- bFlushing = false;
- } else {
- DEBUG_PRINT("omx_g711_aenc_test: more buffer to come back used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- return OMX_ErrorNone;
- }
- }
-
- if((readBytes = Read_Buffer(pBuffer)) > 0) {
- pBuffer->nFilledLen = (OMX_U32)readBytes;
- used_ip_buf_cnt++;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- }
- else{
- pBuffer->nFlags |= OMX_BUFFERFLAG_EOS;
- used_ip_buf_cnt++;
- bInputEosReached = true;
- pBuffer->nFilledLen = 0;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- DEBUG_PRINT("EBD..Either EOS or Some Error while reading file\n");
- }
- return OMX_ErrorNone;
-}
-
-void signal_handler(int sig_id) {
-
- /* Flush */
- if (sig_id == SIGUSR1) {
- DEBUG_PRINT("%s Initiate flushing\n", __FUNCTION__);
- bFlushing = true;
- OMX_SendCommand(g711_enc_handle, OMX_CommandFlush, OMX_ALL, NULL);
- } else if (sig_id == SIGUSR2) {
- if (bPause == true) {
- DEBUG_PRINT("%s resume playback\n", __FUNCTION__);
- bPause = false;
- OMX_SendCommand(g711_enc_handle, OMX_CommandStateSet, OMX_StateExecuting, NULL);
- } else {
- DEBUG_PRINT("%s pause playback\n", __FUNCTION__);
- bPause = true;
- OMX_SendCommand(g711_enc_handle, OMX_CommandStateSet, OMX_StatePause, NULL);
- }
- }
-}
-
-int main(int argc, char **argv)
-{
- unsigned int bufCnt=0;
- OMX_ERRORTYPE result;
-
- struct sigaction sa;
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = &signal_handler;
- sigaction(SIGABRT, &sa, NULL);
- sigaction(SIGUSR1, &sa, NULL);
- sigaction(SIGUSR2, &sa, NULL);
-
- (void) signal(SIGINT, Release_Encoder);
-
- pthread_cond_init(&cond, 0);
- pthread_mutex_init(&lock, 0);
- pthread_cond_init(&etb_cond, 0);
- pthread_mutex_init(&etb_lock, 0);
- pthread_mutex_init(&etb_lock1, 0);
-
- if (argc >= 5) {
- in_filename = argv[1];
- out_filename = argv[2];
- encode_format = (uint32_t)atoi(argv[3]);
- tunnel = (uint32_t)atoi(argv[4]);
- rectime = (uint32_t)atoi(argv[5]);
-
-
- DEBUG_PRINT("Input parameters: enocder format= %d, tunnel %d, rectime = %d\n",
- encode_format, tunnel, rectime);
-
- } else {
- DEBUG_PRINT(" invalid format: \n");
- DEBUG_PRINT("ex: ./mm-aenc-omxg711 INPUTFILE G711_OUTPUTFILE ENCODE_FORMAT TUNNEL RECORDTIME \n");
- DEBUG_PRINT("ENCODE formats are : G711MLAW :0 , G711ALAW: 1");
- DEBUG_PRINT("FOR TUNNEL MOD PASS INPUT FILE AS ZERO\n");
- DEBUG_PRINT("RECORDTIME in seconds for AST Automation ...TUNNEL MODE ONLY\n");
- return 0;
- }
- if(tunnel == 0) {
- if(encode_format == 0) {
- aud_comp = "OMX.qcom.audio.encoder.g711mlaw";
- }
- else {
- aud_comp = "OMX.qcom.audio.encoder.g711alaw";
- }
- } else {
- if(encode_format == 0) {
- aud_comp = "OMX.qcom.audio.encoder.tunneled.g711mlaw";
- }
- else {
- aud_comp = "OMX.qcom.audio.encoder.tunneled.g711alaw";
- }
- }
- if(Init_Encoder(aud_comp)!= 0x00)
- {
- DEBUG_PRINT("Decoder Init failed\n");
- return -1;
- }
-
- fcntl(0, F_SETFL, O_NONBLOCK);
-
- if(Play_Encoder() != 0x00)
- {
- DEBUG_PRINT("Play_Decoder failed\n");
- return -1;
- }
-
- // Wait till EOS is reached...
- if(rectime && tunnel)
- {
- sleep(rectime);
- rectime = 0;
- bInputEosReached_tunnel = 1;
- DEBUG_PRINT("\EOS ON INPUT PORT\n");
- }
- else
- {
- wait_for_event();
- }
-
- if((bInputEosReached_tunnel) || ((bOutputEosReached) && !tunnel))
- {
-
- DEBUG_PRINT("\nMoving the decoder to idle state \n");
- OMX_SendCommand(g711_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- wait_for_event();
- DEBUG_PRINT("\nMoving the encoder to loaded state \n");
- OMX_SendCommand(g711_enc_handle, OMX_CommandStateSet, OMX_StateLoaded,0);
- sleep(1);
- if (!tunnel)
- {
- DEBUG_PRINT("\nFillBufferDone: Deallocating i/p buffers \n");
- for(bufCnt=0; bufCnt < input_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(g711_enc_handle, 0, pInputBufHdrs[bufCnt]);
- }
- }
-
- DEBUG_PRINT ("\nFillBufferDone: Deallocating o/p buffers \n");
- for(bufCnt=0; bufCnt < output_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(g711_enc_handle, 1, pOutputBufHdrs[bufCnt]);
- }
- wait_for_event();
-
- result = OMX_FreeHandle(g711_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
- OMX_Deinit();
- ebd_cnt=0;
- bOutputEosReached = false;
- bInputEosReached_tunnel = false;
- bInputEosReached = 0;
- g711_enc_handle = NULL;
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- fclose(outputBufferFile);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...G711 ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- }
- return 0;
-}
-
-void Release_Encoder()
-{
- static int cnt=0;
- OMX_ERRORTYPE result;
-
- DEBUG_PRINT("END OF G711 ENCODING: EXITING PLEASE WAIT\n");
- bInputEosReached_tunnel = 1;
- event_complete();
- cnt++;
- if(cnt > 1)
- {
- /* FORCE RESET */
- g711_enc_handle = NULL;
- ebd_cnt=0;
- bInputEosReached_tunnel = false;
-
- result = OMX_FreeHandle(g711_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
-
- OMX_Deinit();
-
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...G711 ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- exit(0);
- }
-}
-
-int Init_Encoder(OMX_STRING audio_component)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE omxresult;
- OMX_U32 total = 0;
- typedef OMX_U8* OMX_U8_PTR;
- char *role ="audio_encoder";
-
- static OMX_CALLBACKTYPE call_back = {
- &EventHandler,&EmptyBufferDone,&FillBufferDone
- };
-
- /* Init. the OpenMAX Core */
- DEBUG_PRINT("\nInitializing OpenMAX Core....\n");
- omxresult = OMX_Init();
-
- if(OMX_ErrorNone != omxresult) {
- DEBUG_PRINT("\n Failed to Init OpenMAX core");
- return -1;
- }
- else {
- DEBUG_PRINT("\nOpenMAX Core Init Done\n");
- }
-
- /* Query for audio decoders*/
- DEBUG_PRINT("G711_test: Before entering OMX_GetComponentOfRole");
- OMX_GetComponentsOfRole(role, &total, 0);
- DEBUG_PRINT ("\nTotal components of role=%s :%u", role, total);
-
-
- omxresult = OMX_GetHandle((OMX_HANDLETYPE*)(&g711_enc_handle),
- (OMX_STRING)audio_component, NULL, &call_back);
- if (FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to Load the component:%s\n", audio_component);
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nComponent %s is in LOADED state\n", audio_component);
- }
-
- /* Get the port information */
- CONFIG_VERSION_SIZE(portParam);
- omxresult = OMX_GetParameter(g711_enc_handle, OMX_IndexParamAudioInit,
- (OMX_PTR)&portParam);
-
- if(FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to get Port Param\n");
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nportParam.nPorts:%u\n", portParam.nPorts);
- DEBUG_PRINT("\nportParam.nStartPortNumber:%u\n",
- portParam.nStartPortNumber);
- }
- return 0;
-}
-
-int Play_Encoder()
-{
- unsigned int i;
- int Size=0;
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE ret;
- OMX_INDEXTYPE index;
-#ifdef __LP64__
- DEBUG_PRINT("sizeof[%ld]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#else
- DEBUG_PRINT("sizeof[%d]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#endif
-
- /* open the i/p and o/p files based on the video file format passed */
- if(open_audio_file()) {
- DEBUG_PRINT("\n Returning -1");
- return -1;
- }
-
- /* Query the encoder input min buf requirements */
- CONFIG_VERSION_SIZE(inputportFmt);
-
- /* Port for which the Client needs to obtain info */
- inputportFmt.nPortIndex = portParam.nStartPortNumber;
-
- OMX_GetParameter(g711_enc_handle,OMX_IndexParamPortDefinition,&inputportFmt);
- DEBUG_PRINT ("\nEnc Input Buffer Count %u\n", inputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Input Buffer Size %u\n", inputportFmt.nBufferSize);
-
- if(OMX_DirInput != inputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Input Port\n");
- return -1;
- }
-
- pcmParams.nPortIndex = 0;
- pcmParams.nChannels = channels;
- pcmParams.bInterleaved = OMX_TRUE;
- pcmParams.nSamplingRate = samplerate;
- OMX_SetParameter(g711_enc_handle,OMX_IndexParamAudioPcm,&pcmParams);
-
-
- /* Query the encoder outport's min buf requirements */
- CONFIG_VERSION_SIZE(outputportFmt);
- /* Port for which the Client needs to obtain info */
- outputportFmt.nPortIndex = portParam.nStartPortNumber + 1;
-
- OMX_GetParameter(g711_enc_handle,OMX_IndexParamPortDefinition,&outputportFmt);
- DEBUG_PRINT ("\nEnc: Output Buffer Count %u\n", outputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Output Buffer Size %u\n", outputportFmt.nBufferSize);
-
- if(OMX_DirOutput != outputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Output Port\n");
- return -1;
- }
-
-
- CONFIG_VERSION_SIZE(pcmParams);
-
-
- pcmParams.nPortIndex = 1;
- pcmParams.nChannels = channels; //Only mono is supported
- pcmParams.nSamplingRate = samplerate;
- OMX_SetParameter(g711_enc_handle,OMX_IndexParamAudioPcm,&pcmParams);
- OMX_GetExtensionIndex(g711_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index);
- OMX_GetParameter(g711_enc_handle,index,&streaminfoparam);
- DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n");
- OMX_SendCommand(g711_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- /* wait_for_event(); should not wait here event complete status will
- not come until enough buffer are allocated */
- if (tunnel == 0)
- {
- input_buf_cnt = inputportFmt.nBufferCountActual; // inputportFmt.nBufferCountMin + 5;
- DEBUG_PRINT("Transition to Idle State succesful...\n");
- /* Allocate buffer on decoder's i/p port */
- error = Allocate_Buffer(g711_enc_handle, &pInputBufHdrs, inputportFmt.nPortIndex,
- input_buf_cnt, inputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pInputBufHdrs == NULL) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer success\n");
- }
- }
- output_buf_cnt = outputportFmt.nBufferCountMin ;
-
- /* Allocate buffer on encoder's O/Pp port */
- error = Allocate_Buffer(g711_enc_handle, &pOutputBufHdrs, outputportFmt.nPortIndex,
- output_buf_cnt, outputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pOutputBufHdrs == NULL) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer success\n");
- }
-
- wait_for_event();
-
- if (tunnel == 1)
- {
- DEBUG_PRINT ("\nOMX_SendCommand to enable TUNNEL MODE during IDLE\n");
- OMX_SendCommand(g711_enc_handle, OMX_CommandPortDisable,0,0); // disable input port
- wait_for_event();
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand encoder -> Executing\n");
- OMX_SendCommand(g711_enc_handle, OMX_CommandStateSet, OMX_StateExecuting,0);
- wait_for_event();
-
- DEBUG_PRINT(" Start sending OMX_FILLthisbuffer\n");
-
- attach_g711_header();
-
- for(i=0; i < output_buf_cnt; i++) {
- DEBUG_PRINT ("\nOMX_FillThisBuffer on output buf no.%d\n",i);
- pOutputBufHdrs[i]->nOutputPortIndex = 1;
- pOutputBufHdrs[i]->nFlags = pOutputBufHdrs[i]->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
- ret = OMX_FillThisBuffer(g711_enc_handle, pOutputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_FillThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_FillThisBuffer success!\n");
- }
- }
-
- if(tunnel == 0)
- {
- DEBUG_PRINT(" Start sending OMX_emptythisbuffer\n");
- for (i = 0;i < input_buf_cnt;i++) {
- DEBUG_PRINT ("\nOMX_EmptyThisBuffer on Input buf no.%d\n",i);
- pInputBufHdrs[i]->nInputPortIndex = 0;
- Size = Read_Buffer(pInputBufHdrs[i]);
- if(Size <=0 ){
- DEBUG_PRINT("NO DATA READ\n");
- bInputEosReached = true;
- pInputBufHdrs[i]->nFlags= OMX_BUFFERFLAG_EOS;
- }
- pInputBufHdrs[i]->nFilledLen = (OMX_U32)Size;
- pInputBufHdrs[i]->nInputPortIndex = 0;
- used_ip_buf_cnt++;
- ret = OMX_EmptyThisBuffer(g711_enc_handle, pInputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_EmptyThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_EmptyThisBuffer success!\n");
- }
- if(Size <=0 ){
- break;//eos reached
- }
- }
- pthread_mutex_lock(&etb_lock);
- if(etb_done)
- {
- DEBUG_PRINT("Component is waiting for EBD to be released.\n");
- etb_event_complete();
- }
- else
- {
- DEBUG_PRINT("\n****************************\n");
- DEBUG_PRINT("EBD not yet happened ...\n");
- DEBUG_PRINT("\n****************************\n");
- etb_done++;
- }
- pthread_mutex_unlock(&etb_lock);
- }
- return 0;
-}
-
-
-
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *avc_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE error=OMX_ErrorNone;
- unsigned int bufCnt=0;
- /* To remove warning for unused variable to keep prototype same */
- (void)avc_enc_handle;
-
- *pBufHdrs= (OMX_BUFFERHEADERTYPE **)
- malloc(sizeof(OMX_BUFFERHEADERTYPE*)*bufCntMin);
-
- for(bufCnt=0; bufCnt < bufCntMin; ++bufCnt) {
- DEBUG_PRINT("\n OMX_AllocateBuffer No %d \n", bufCnt);
- error = OMX_AllocateBuffer(g711_enc_handle, &((*pBufHdrs)[bufCnt]),
- nPortIndex, NULL, bufSize);
- }
- return error;
-}
-
-
-
-
-static int Read_Buffer (OMX_BUFFERHEADERTYPE *pBufHdr )
-{
- size_t bytes_read=0;
- pBufHdr->nFilledLen = 0;
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
-
- bytes_read = fread(pBufHdr->pBuffer, 1, pBufHdr->nAllocLen , inputBufferFile);
-
- pBufHdr->nFilledLen = (OMX_U32)bytes_read;
- if(bytes_read == 0)
- {
-
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
- DEBUG_PRINT ("\nBytes read zero\n");
- }
- else
- {
- pBufHdr->nFlags = pBufHdr->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
- }
-
- return (int)bytes_read;
-}
-
-
-
-//In Encoder this Should Open a PCM or WAV file for input.
-
-static int open_audio_file ()
-{
- int error_code = 0;
-
- if (!tunnel)
- {
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, in_filename);
- inputBufferFile = fopen (in_filename, "rb");
- if (inputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- in_filename);
- error_code = -1;
- }
- if(parse_pcm_header() != 0x00)
- {
- DEBUG_PRINT("PCM parser failed \n");
- return -1;
- }
- }
-
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, out_filename);
- outputBufferFile = fopen (out_filename, "wb");
- if (outputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- out_filename);
- error_code = -1;
- }
- return error_code;
-}
-
-static OMX_ERRORTYPE attach_g711_header()
-{
-
- memset(&g711hdr, 0, sizeof(struct g711_header));
-
- g711hdr.riff_id = ID_RIFF;
- g711hdr.riff_fmt = ID_WAVE;
- g711hdr.fmt_id = ID_FMT;
- g711hdr.fmt_sz = 18;
-
- //change format type from wav to g711
- if(encode_format == 0) {
- g711hdr.audio_format = FORMAT_MULAW;
- }
- else {
- g711hdr.audio_format = FORMAT_ALAW;
- }
-
- g711hdr.num_channels = hdr.num_channels;
- g711hdr.sample_rate = hdr.sample_rate;
- g711hdr.bits_per_sample = 8;
- g711hdr.byte_rate = g711hdr.sample_rate * g711hdr.num_channels * (g711hdr.bits_per_sample / 8);
- g711hdr.block_align = (uint16_t)((g711hdr.bits_per_sample / 8) * g711hdr.num_channels);
- g711hdr.extension_size = 0;
- g711hdr.fact_id = ID_FACT;
- g711hdr.fact_sz = 4;
- g711hdr.data_id = ID_DATA;
- g711hdr.data_sz = 0;
- g711hdr.riff_sz = g711hdr.data_sz + sizeof(g711hdr) - 8;
-
- fwrite(&g711hdr,1, sizeof(g711hdr), outputBufferFile);
-
- /*To Do : Attach Fact chunk for Non -PCM format */
- return OMX_ErrorNone;
-}
-
-static OMX_ERRORTYPE parse_pcm_header()
-{
-
- DEBUG_PRINT("\n***************************************************************\n");
- if(fread(&hdr, 1, sizeof(hdr),inputBufferFile)!=sizeof(hdr))
- {
- DEBUG_PRINT("Wav file cannot read header\n");
- return -1;
- }
-
- if ((hdr.riff_id != ID_RIFF) ||
- (hdr.riff_fmt != ID_WAVE)||
- (hdr.fmt_id != ID_FMT))
- {
- DEBUG_PRINT("Wav file is not a riff/wave file\n");
- return -1;
- }
-
- if (hdr.audio_format != FORMAT_PCM)
- {
- DEBUG_PRINT("Wav file is not pcm format %d and fmt size is %d\n",
- hdr.audio_format, hdr.fmt_sz);
- return -1;
- }
-
- if ((hdr.sample_rate != 8000) && (hdr.sample_rate != 16000)) {
- DEBUG_PRINT("samplerate = %d, not supported, Supported "
- "samplerates are 8000, 16000", samplerate);
- return -1;
- }
-
- if (hdr.num_channels != 1) {
- DEBUG_PRINT("stereo and multi channel are not supported, channels %d"
- , hdr.num_channels);
- return -1;
- }
-
- DEBUG_PRINT("Samplerate is %d\n", hdr.sample_rate);
- DEBUG_PRINT("Channel Count is %d\n", hdr.num_channels);
- DEBUG_PRINT("\n***************************************************************\n");
-
- samplerate = hdr.sample_rate;
- channels = hdr.num_channels;
-
- return OMX_ErrorNone;
-}
diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
index 6841d1a..b575d7f 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk
+++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
@@ -41,30 +41,6 @@
include $(BUILD_SHARED_LIBRARY)
-
-# ---------------------------------------------------------------------------------
-# Make the apps-test (mm-aenc-omxqcelp13-test)
-# ---------------------------------------------------------------------------------
-
-include $(CLEAR_VARS)
-
-mm-qcelp13-enc-test-inc := $(LOCAL_PATH)/inc
-mm-qcelp13-enc-test-inc += $(LOCAL_PATH)/test
-
-mm-qcelp13-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-mm-qcelp13-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
-LOCAL_MODULE := mm-aenc-omxqcelp13-test
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := $(libOmxQcelp13Enc-def)
-LOCAL_C_INCLUDES := $(mm-qcelp13-enc-test-inc)
-LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libmm-omxcore
-LOCAL_SHARED_LIBRARIES += libOmxQcelp13Enc
-LOCAL_SHARED_LIBRARIES += libaudioalsa
-LOCAL_SRC_FILES := test/omx_qcelp13_enc_test.c
-
-include $(BUILD_EXECUTABLE)
-
endif
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-qcelp13/qdsp6/Makefile b/mm-audio/aenc-qcelp13/qdsp6/Makefile
index b14655b..9bbc4ab 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/Makefile
+++ b/mm-audio/aenc-qcelp13/qdsp6/Makefile
@@ -39,7 +39,7 @@
# ---------------------------------------------------------------------------------
# BUILD
# ---------------------------------------------------------------------------------
-all: libOmxQcelp13Enc.so.$(LIBVER) mm-aenc-omxqcelp13-test
+all: libOmxQcelp13Enc.so.$(LIBVER)
install:
echo "intalling aenc-qcelp13 in $(DESTDIR)"
@@ -49,8 +49,7 @@
install -m 555 libOmxQcelp13Enc.so.$(LIBVER) $(LIBINSTALLDIR)
cd $(LIBINSTALLDIR) && ln -s libOmxQcelp13Enc.so.$(LIBVER) libOmxQcelp13Enc.so.$(LIBMAJOR)
cd $(LIBINSTALLDIR) && ln -s libOmxQcelp13Enc.so.$(LIBMAJOR) libOmxQcelp13Enc.so
- install -m 555 mm-aenc-omxqcelp13-test $(BININSTALLDIR)
-
+
# ---------------------------------------------------------------------------------
# COMPILE LIBRARY
# ---------------------------------------------------------------------------------
@@ -65,17 +64,5 @@
$(CC) $(CPPFLAGS) $(CFLAGS_SO) $(LDFLAGS_SO) -Wl,-soname,libOmxQcelp13Enc.so.$(LIBMAJOR) -o $@ $^ $(LDFLAGS) $(LDLIBS)
# ---------------------------------------------------------------------------------
-# COMPILE TEST APP
-# ---------------------------------------------------------------------------------
-TEST_LDLIBS := -lpthread
-TEST_LDLIBS += -ldl
-TEST_LDLIBS += -lOmxCore
-
-TEST_SRCS := test/omx_qcelp13_enc_test.c
-
-mm-aenc-omxqcelp13-test: libOmxQcelp13Enc.so.$(LIBVER) $(TEST_SRCS)
- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
-
-# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------
diff --git a/mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c b/mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c
deleted file mode 100644
index 432c07a..0000000
--- a/mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c
+++ /dev/null
@@ -1,1101 +0,0 @@
-
-/*--------------------------------------------------------------------------
-Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of The Linux Foundation nor
- the names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------*/
-
-
-/*
- An Open max test application ....
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include "OMX_Core.h"
-#include "OMX_Component.h"
-#include "pthread.h"
-#include <signal.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include<unistd.h>
-#include<string.h>
-#include <pthread.h>
-#include "QOMX_AudioExtensions.h"
-#include "QOMX_AudioIndexExtensions.h"
-#ifdef AUDIOV2
-#include "control.h"
-#endif
-
-
-#include <linux/ioctl.h>
-
-typedef unsigned char uint8;
-typedef unsigned char byte;
-typedef unsigned int uint32;
-typedef unsigned int uint16;
-QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam;
-/* maximum ADTS frame header length */
-void Release_Encoder();
-
-#ifdef AUDIOV2
-unsigned short session_id;
-int device_id;
-int control = 0;
-const char *device="handset_tx";
-#define DIR_TX 2
-#endif
-
-uint32_t samplerate = 8000;
-uint32_t channels = 1;
-uint32_t min_bitrate = 0;
-uint32_t max_bitrate = 0;
-uint32_t cdmarate = 0;
-uint32_t rectime = 0;
-uint32_t recpath = 0;
-uint32_t pcmplayback = 0;
-uint32_t tunnel = 0;
-uint32_t format = 1;
-#define DEBUG_PRINT printf
-unsigned to_idle_transition = 0;
-unsigned long total_pcm_bytes;
-
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-/************************************************************************/
-/* #DEFINES */
-/************************************************************************/
-#define false 0
-#define true 1
-
-#define CONFIG_VERSION_SIZE(param) \
- param.nVersion.nVersion = CURRENT_OMX_SPEC_VERSION;\
- param.nSize = sizeof(param);
-
-#define QCP_HEADER_SIZE sizeof(struct qcp_header)
-#define MIN_BITRATE 4 /* Bit rate 1 - 13.6 , 2 - 6.2 , 3 - 2.7 , 4 - 1.0 kbps*/
-#define MAX_BITRATE 4
-
-#define FAILED(result) (result != OMX_ErrorNone)
-
-#define SUCCEEDED(result) (result == OMX_ErrorNone)
-
-/************************************************************************/
-/* GLOBAL DECLARATIONS */
-/************************************************************************/
-
-pthread_mutex_t lock;
-pthread_cond_t cond;
-pthread_mutex_t elock;
-pthread_cond_t econd;
-pthread_cond_t fcond;
-pthread_mutex_t etb_lock;
-pthread_mutex_t etb_lock1;
-pthread_cond_t etb_cond;
-FILE * inputBufferFile;
-FILE * outputBufferFile;
-OMX_PARAM_PORTDEFINITIONTYPE inputportFmt;
-OMX_PARAM_PORTDEFINITIONTYPE outputportFmt;
-OMX_AUDIO_PARAM_QCELP13TYPE qcelp13param;
-OMX_AUDIO_PARAM_PCMMODETYPE pcmparam;
-OMX_PORT_PARAM_TYPE portParam;
-OMX_PORT_PARAM_TYPE portFmt;
-OMX_ERRORTYPE error;
-
-
-
-
-#define ID_RIFF 0x46464952
-#define ID_WAVE 0x45564157
-#define ID_FMT 0x20746d66
-#define ID_DATA 0x61746164
-
-#define FORMAT_PCM 1
-
-struct wav_header {
- uint32_t riff_id;
- uint32_t riff_sz;
- uint32_t riff_fmt;
- uint32_t fmt_id;
- uint32_t fmt_sz;
- uint16_t audio_format;
- uint16_t num_channels;
- uint32_t sample_rate;
- uint32_t byte_rate; /* sample_rate * num_channels * bps / 8 */
- uint16_t block_align; /* num_channels * bps / 8 */
- uint16_t bits_per_sample;
- uint32_t data_id;
- uint32_t data_sz;
-};
-struct enc_meta_out{
- unsigned int offset_to_frame;
- unsigned int frame_size;
- unsigned int encoded_pcm_samples;
- unsigned int msw_ts;
- unsigned int lsw_ts;
- unsigned int nflags;
-} __attribute__ ((packed));
-
-struct qcp_header {
- /* RIFF Section */
- char riff[4];
- unsigned int s_riff;
- char qlcm[4];
-
- /* Format chunk */
- char fmt[4];
- unsigned int s_fmt;
- char mjr;
- char mnr;
- unsigned int data1; /* UNIQUE ID of the codec */
- unsigned short data2;
- unsigned short data3;
- char data4[8];
- unsigned short ver; /* Codec Info */
- char name[80];
- unsigned short abps; /* average bits per sec of the codec */
- unsigned short bytes_per_pkt;
- unsigned short samp_per_block;
- unsigned short samp_per_sec;
- unsigned short bits_per_samp;
- unsigned char vr_num_of_rates; /* Rate Header fmt info */
- unsigned char rvd1[3];
- unsigned short vr_bytes_per_pkt[8];
- unsigned int rvd2[5];
-
- /* Vrat chunk */
- unsigned char vrat[4];
- unsigned int s_vrat;
- unsigned int v_rate;
- unsigned int size_in_pkts;
-
- /* Data chunk */
- unsigned char data[4];
- unsigned int s_data;
-} __attribute__ ((packed));
-
- /* Common part */
- static struct qcp_header append_header = {
- {'R', 'I', 'F', 'F'}, 0, {'Q', 'L', 'C', 'M'},
- {'f', 'm', 't', ' '}, 150, 1, 0, 0, 0, 0,{0}, 0, {0},0,0,160,8000,16,0,{0},{0},{0},
- {'v','r','a','t'},0, 0, 0,{'d','a','t','a'},0
- };
-
-static int totaldatalen = 0;
-static int framecnt = 0;
-/************************************************************************/
-/* GLOBAL INIT */
-/************************************************************************/
-
-unsigned int input_buf_cnt = 0;
-unsigned int output_buf_cnt = 0;
-int used_ip_buf_cnt = 0;
-volatile int event_is_done = 0;
-volatile int ebd_event_is_done = 0;
-volatile int fbd_event_is_done = 0;
-volatile int etb_event_is_done = 0;
-int ebd_cnt;
-int bInputEosReached = 0;
-int bOutputEosReached = 0;
-int bInputEosReached_tunnel = 0;
-static int etb_done = 0;
-int bFlushing = false;
-int bPause = false;
-const char *in_filename;
-const char *out_filename;
-
-int timeStampLfile = 0;
-int timestampInterval = 100;
-
-//* OMX Spec Version supported by the wrappers. Version = 1.1 */
-const OMX_U32 CURRENT_OMX_SPEC_VERSION = 0x00000101;
-OMX_COMPONENTTYPE* qcelp13_enc_handle = 0;
-
-OMX_BUFFERHEADERTYPE **pInputBufHdrs = NULL;
-OMX_BUFFERHEADERTYPE **pOutputBufHdrs = NULL;
-
-/************************************************************************/
-/* GLOBAL FUNC DECL */
-/************************************************************************/
-int Init_Encoder(char*);
-int Play_Encoder();
-OMX_STRING aud_comp;
-/**************************************************************************/
-/* STATIC DECLARATIONS */
-/**************************************************************************/
-
-static int open_audio_file ();
-static int Read_Buffer(OMX_BUFFERHEADERTYPE *pBufHdr );
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *qcelp13_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize);
-
-
-static OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData);
-static OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-
-static OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-static OMX_ERRORTYPE parse_pcm_header();
-void wait_for_event(void)
-{
- pthread_mutex_lock(&lock);
- DEBUG_PRINT("%s: event_is_done=%d", __FUNCTION__, event_is_done);
- while (event_is_done == 0) {
- pthread_cond_wait(&cond, &lock);
- }
- event_is_done = 0;
- pthread_mutex_unlock(&lock);
-}
-
-void event_complete(void )
-{
- pthread_mutex_lock(&lock);
- if (event_is_done == 0) {
- event_is_done = 1;
- pthread_cond_broadcast(&cond);
- }
- pthread_mutex_unlock(&lock);
-}
-
-void etb_wait_for_event(void)
-{
- pthread_mutex_lock(&etb_lock1);
- DEBUG_PRINT("%s: etb_event_is_done=%d", __FUNCTION__, etb_event_is_done);
- while (etb_event_is_done == 0) {
- pthread_cond_wait(&etb_cond, &etb_lock1);
- }
- etb_event_is_done = 0;
- pthread_mutex_unlock(&etb_lock1);
-}
-
-void etb_event_complete(void )
-{
- pthread_mutex_lock(&etb_lock1);
- if (etb_event_is_done == 0) {
- etb_event_is_done = 1;
- pthread_cond_broadcast(&etb_cond);
- }
- pthread_mutex_unlock(&etb_lock1);
-}
-
-static void create_qcp_header(int Datasize, int Frames)
-{
- append_header.s_riff = (unsigned)(Datasize + (int)QCP_HEADER_SIZE - 8);
- /* exclude riff id and size field */
- append_header.data1 = 0x5E7F6D41;
- append_header.data2 = 0xB115;
- append_header.data3 = 0x11D0;
- append_header.data4[0] = 0xBA;
- append_header.data4[1] = 0x91;
- append_header.data4[2] = 0x00;
- append_header.data4[3] = 0x80;
- append_header.data4[4] = 0x5F;
- append_header.data4[5] = 0xB4;
- append_header.data4[6] = 0xB9;
- append_header.data4[7] = 0x7E;
- append_header.ver = 0x0002;
- memcpy(append_header.name, "Qcelp 13K", 9);
- append_header.abps = 13000;
- append_header.bytes_per_pkt = 35;
- append_header.vr_num_of_rates = 5;
- append_header.vr_bytes_per_pkt[0] = 0x0422;
- append_header.vr_bytes_per_pkt[1] = 0x0310;
- append_header.vr_bytes_per_pkt[2] = 0x0207;
- append_header.vr_bytes_per_pkt[3] = 0x0103;
- append_header.s_vrat = 0x00000008;
- append_header.v_rate = 0x00000001;
- append_header.size_in_pkts = (unsigned)Frames;
- append_header.s_data = (unsigned)Datasize;
- return;
-}
-
-OMX_ERRORTYPE EventHandler(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_EVENTTYPE eEvent,
- OMX_IN OMX_U32 nData1, OMX_IN OMX_U32 nData2,
- OMX_IN OMX_PTR pEventData)
-{
- DEBUG_PRINT("Function %s \n", __FUNCTION__);
-
- /* To remove warning for unused variable to keep prototype same */
- (void)hComponent;
- (void)pAppData;
- (void)pEventData;
-
- switch(eEvent) {
- case OMX_EventCmdComplete:
- DEBUG_PRINT("\n OMX_EventCmdComplete event=%d data1=%u data2=%u\n",(OMX_EVENTTYPE)eEvent,
- nData1,nData2);
- event_complete();
- break;
- case OMX_EventError:
- DEBUG_PRINT("\n OMX_EventError \n");
- break;
- case OMX_EventBufferFlag:
- DEBUG_PRINT("\n OMX_EventBufferFlag \n");
- bOutputEosReached = true;
- event_complete();
- break;
- case OMX_EventPortSettingsChanged:
- DEBUG_PRINT("\n OMX_EventPortSettingsChanged \n");
- break;
- default:
- DEBUG_PRINT("\n Unknown Event \n");
- break;
- }
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE FillBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- size_t bytes_writen = 0;
- size_t total_bytes_writen = 0;
- size_t len = 0;
- struct enc_meta_out *meta = NULL;
- OMX_U8 *src = pBuffer->pBuffer;
- unsigned int num_of_frames = 1;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- if(((pBuffer->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS)) {
- DEBUG_PRINT("FBD::EOS on output port\n ");
- bOutputEosReached = true;
- return OMX_ErrorNone;
- }
- if(bInputEosReached_tunnel || bOutputEosReached)
- {
- DEBUG_PRINT("EOS REACHED NO MORE PROCESSING OF BUFFERS\n");
- return OMX_ErrorNone;
- }
- if(num_of_frames != src[0]){
-
- printf("Data corrupt\n");
- return OMX_ErrorNone;
- }
- /* Skip the first bytes */
-
-
-
- src += sizeof(unsigned char);
- meta = (struct enc_meta_out *)src;
- while (num_of_frames > 0) {
- meta = (struct enc_meta_out *)src;
- /*printf("offset=%d framesize=%d encoded_pcm[%d] msw_ts[%d]lsw_ts[%d] nflags[%d]\n",
- meta->offset_to_frame,
- meta->frame_size,
- meta->encoded_pcm_samples, meta->msw_ts, meta->lsw_ts, meta->nflags);*/
- len = meta->frame_size;
-
- bytes_writen = fwrite(pBuffer->pBuffer + sizeof(unsigned char) + meta->offset_to_frame,1,len,outputBufferFile);
- if(bytes_writen < len)
- {
- DEBUG_PRINT("error: invalid QCELP13 encoded data \n");
- return OMX_ErrorNone;
- }
- src += sizeof(struct enc_meta_out);
- num_of_frames--;
- total_bytes_writen += len;
- }
- DEBUG_PRINT(" FillBufferDone size writen to file %zu count %d\n",total_bytes_writen, framecnt);
- totaldatalen = totaldatalen + (int)total_bytes_writen;
- framecnt++;
-
- DEBUG_PRINT(" FBD calling FTB\n");
- OMX_FillThisBuffer(hComponent,pBuffer);
-
- return OMX_ErrorNone;
-}
-
-OMX_ERRORTYPE EmptyBufferDone(OMX_IN OMX_HANDLETYPE hComponent,
- OMX_IN OMX_PTR pAppData,
- OMX_IN OMX_BUFFERHEADERTYPE* pBuffer)
-{
- int readBytes =0;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)pAppData;
-
- ebd_cnt++;
- used_ip_buf_cnt--;
- pthread_mutex_lock(&etb_lock);
- if(!etb_done)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT("Wait till first set of buffers are given to component\n");
- DEBUG_PRINT("\n*********************************************\n");
- etb_done++;
- pthread_mutex_unlock(&etb_lock);
- etb_wait_for_event();
- }
- else
- {
- pthread_mutex_unlock(&etb_lock);
- }
-
-
- if(bInputEosReached)
- {
- DEBUG_PRINT("\n*********************************************\n");
- DEBUG_PRINT(" EBD::EOS on input port\n ");
- DEBUG_PRINT("*********************************************\n");
- return OMX_ErrorNone;
- }else if (bFlushing == true) {
- DEBUG_PRINT("omx_qcelp13_adec_test: bFlushing is set to TRUE used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- if (used_ip_buf_cnt == 0) {
- bFlushing = false;
- } else {
- DEBUG_PRINT("omx_qcelp13_adec_test: more buffer to come back used_ip_buf_cnt=%d\n",used_ip_buf_cnt);
- return OMX_ErrorNone;
- }
- }
-
- if((readBytes = Read_Buffer(pBuffer)) > 0) {
- pBuffer->nFilledLen = (OMX_U32)readBytes;
- used_ip_buf_cnt++;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- }
- else{
- pBuffer->nFlags |= OMX_BUFFERFLAG_EOS;
- used_ip_buf_cnt++;
- bInputEosReached = true;
- pBuffer->nFilledLen = 0;
- OMX_EmptyThisBuffer(hComponent,pBuffer);
- DEBUG_PRINT("EBD..Either EOS or Some Error while reading file\n");
- }
- return OMX_ErrorNone;
-}
-
-void signal_handler(int sig_id) {
-
- /* Flush */
- if (sig_id == SIGUSR1) {
- DEBUG_PRINT("%s Initiate flushing\n", __FUNCTION__);
- bFlushing = true;
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandFlush, OMX_ALL, NULL);
- } else if (sig_id == SIGUSR2) {
- if (bPause == true) {
- DEBUG_PRINT("%s resume record\n", __FUNCTION__);
- bPause = false;
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandStateSet, OMX_StateExecuting, NULL);
- } else {
- DEBUG_PRINT("%s pause record\n", __FUNCTION__);
- bPause = true;
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandStateSet, OMX_StatePause, NULL);
- }
- }
-}
-
-int main(int argc, char **argv)
-{
- unsigned int bufCnt=0;
- OMX_ERRORTYPE result;
-
- struct sigaction sa;
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = &signal_handler;
- sigaction(SIGABRT, &sa, NULL);
- sigaction(SIGUSR1, &sa, NULL);
- sigaction(SIGUSR2, &sa, NULL);
-
- (void) signal(SIGINT, Release_Encoder);
-
- pthread_cond_init(&cond, 0);
- pthread_mutex_init(&lock, 0);
- pthread_cond_init(&etb_cond, 0);
- pthread_mutex_init(&etb_lock, 0);
- pthread_mutex_init(&etb_lock1, 0);
-
- if (argc >= 9) {
- in_filename = argv[1];
- out_filename = argv[2];
- tunnel = (uint32_t)atoi(argv[3]);
- min_bitrate = (uint32_t)atoi(argv[4]);
- max_bitrate = (uint32_t)atoi(argv[5]);
- cdmarate = (uint32_t)atoi(argv[6]);
- recpath = (uint32_t)atoi(argv[7]); // No configuration support yet..
- rectime = (uint32_t)atoi(argv[8]);
-
- } else {
- DEBUG_PRINT(" invalid format: \n");
- DEBUG_PRINT("ex: ./mm-aenc-omxqcelp13-test INPUTFILE OUTPUTFILE Tunnel MINRATE MAXRATE CDMARATE RECORDPATH RECORDTIME\n");
- DEBUG_PRINT("MINRATE, MAXRATE and CDMARATE 1 to 4\n");
- DEBUG_PRINT("RECORDPATH 0(TX),1(RX),2(BOTH),3(MIC)\n");
- DEBUG_PRINT("RECORDTIME in seconds for AST Automation\n");
- return 0;
- }
- if(recpath != 3) {
- DEBUG_PRINT("For RECORDPATH Only MIC supported\n");
- return 0;
- }
-
- if(tunnel == 0)
- aud_comp = "OMX.qcom.audio.encoder.qcelp13";
- else
- aud_comp = "OMX.qcom.audio.encoder.tunneled.qcelp13";
- if(Init_Encoder(aud_comp)!= 0x00)
- {
- DEBUG_PRINT("Decoder Init failed\n");
- return -1;
- }
-
- fcntl(0, F_SETFL, O_NONBLOCK);
-
- if(Play_Encoder() != 0x00)
- {
- DEBUG_PRINT("Play_Decoder failed\n");
- return -1;
- }
-
- // Wait till EOS is reached...
- if(rectime && tunnel)
- {
- sleep(rectime);
- rectime = 0;
- bInputEosReached_tunnel = 1;
- DEBUG_PRINT("\EOS ON INPUT PORT\n");
- }
- else
- {
- wait_for_event();
- }
-
- if((bInputEosReached_tunnel) || ((bOutputEosReached) && !tunnel))
- {
-
- DEBUG_PRINT("\nMoving the decoder to idle state \n");
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- wait_for_event();
-
- DEBUG_PRINT("\nMoving the encoder to loaded state \n");
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandStateSet, OMX_StateLoaded,0);
- sleep(1);
- if (!tunnel)
- {
- DEBUG_PRINT("\nFillBufferDone: Deallocating i/p buffers \n");
- for(bufCnt=0; bufCnt < input_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(qcelp13_enc_handle, 0, pInputBufHdrs[bufCnt]);
- }
- }
-
- DEBUG_PRINT ("\nFillBufferDone: Deallocating o/p buffers \n");
- for(bufCnt=0; bufCnt < output_buf_cnt; ++bufCnt) {
- OMX_FreeBuffer(qcelp13_enc_handle, 1, pOutputBufHdrs[bufCnt]);
- }
- wait_for_event();
- create_qcp_header(totaldatalen, framecnt);
- fseek(outputBufferFile, 0,SEEK_SET);
- fwrite(&append_header,1,QCP_HEADER_SIZE,outputBufferFile);
-
-
- result = OMX_FreeHandle(qcelp13_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
- if(tunnel)
- {
- #ifdef AUDIOV2
- if (msm_route_stream(DIR_TX,session_id,device_id, 0))
- {
- DEBUG_PRINT("\ncould not set stream routing\n");
- return -1;
- }
- if (msm_en_device(device_id, 0))
- {
- DEBUG_PRINT("\ncould not enable device\n");
- return -1;
- }
- msm_mixer_close();
- #endif
- }
- OMX_Deinit();
- ebd_cnt=0;
- bOutputEosReached = false;
- bInputEosReached_tunnel = false;
- bInputEosReached = 0;
- qcelp13_enc_handle = NULL;
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- fclose(outputBufferFile);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...QCELP13 ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- }
- return 0;
-}
-
-void Release_Encoder()
-{
- static int cnt=0;
- OMX_ERRORTYPE result;
-
- DEBUG_PRINT("END OF QCELP13 ENCODING: EXITING PLEASE WAIT\n");
- bInputEosReached_tunnel = 1;
- event_complete();
- cnt++;
- if(cnt > 1)
- {
- /* FORCE RESET */
- qcelp13_enc_handle = NULL;
- ebd_cnt=0;
- bInputEosReached_tunnel = false;
-
- result = OMX_FreeHandle(qcelp13_enc_handle);
- if (result != OMX_ErrorNone) {
- DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result);
- }
-
- /* Deinit OpenMAX */
-
- OMX_Deinit();
-
- pthread_cond_destroy(&cond);
- pthread_mutex_destroy(&lock);
- DEBUG_PRINT("*****************************************\n");
- DEBUG_PRINT("******...QCELP13 ENC TEST COMPLETED...***************\n");
- DEBUG_PRINT("*****************************************\n");
- exit(0);
- }
-}
-
-int Init_Encoder(OMX_STRING audio_component)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE omxresult;
- OMX_U32 total = 0;
- typedef OMX_U8* OMX_U8_PTR;
- char *role ="audio_encoder";
-
- static OMX_CALLBACKTYPE call_back = {
- &EventHandler,&EmptyBufferDone,&FillBufferDone
- };
-
- /* Init. the OpenMAX Core */
- DEBUG_PRINT("\nInitializing OpenMAX Core....\n");
- omxresult = OMX_Init();
-
- if(OMX_ErrorNone != omxresult) {
- DEBUG_PRINT("\n Failed to Init OpenMAX core");
- return -1;
- }
- else {
- DEBUG_PRINT("\nOpenMAX Core Init Done\n");
- }
-
- /* Query for audio decoders*/
- DEBUG_PRINT("Qcelp13_test: Before entering OMX_GetComponentOfRole");
- OMX_GetComponentsOfRole(role, &total, 0);
- DEBUG_PRINT ("\nTotal components of role=%s :%u", role, total);
-
-
- omxresult = OMX_GetHandle((OMX_HANDLETYPE*)(&qcelp13_enc_handle),
- (OMX_STRING)audio_component, NULL, &call_back);
- if (FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to Load the component:%s\n", audio_component);
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nComponent %s is in LOADED state\n", audio_component);
- }
-
- /* Get the port information */
- CONFIG_VERSION_SIZE(portParam);
- omxresult = OMX_GetParameter(qcelp13_enc_handle, OMX_IndexParamAudioInit,
- (OMX_PTR)&portParam);
-
- if(FAILED(omxresult)) {
- DEBUG_PRINT("\nFailed to get Port Param\n");
- return -1;
- }
- else
- {
- DEBUG_PRINT("\nportParam.nPorts:%u\n", portParam.nPorts);
- DEBUG_PRINT("\nportParam.nStartPortNumber:%u\n",
- portParam.nStartPortNumber);
- }
-
- if(OMX_ErrorNone != omxresult)
- {
- DEBUG_PRINT("Set parameter failed");
- }
-
- return 0;
-}
-
-int Play_Encoder()
-{
- unsigned int i;
- int Size=0;
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE ret;
- OMX_INDEXTYPE index;
-#ifdef __LP64__
- DEBUG_PRINT("sizeof[%ld]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#else
- DEBUG_PRINT("sizeof[%d]\n", sizeof(OMX_BUFFERHEADERTYPE));
-#endif
-
- /* open the i/p and o/p files based on the video file format passed */
- if(open_audio_file()) {
- DEBUG_PRINT("\n Returning -1");
- return -1;
- }
-
- /* Query the encoder input min buf requirements */
- CONFIG_VERSION_SIZE(inputportFmt);
-
- /* Port for which the Client needs to obtain info */
- inputportFmt.nPortIndex = portParam.nStartPortNumber;
-
- OMX_GetParameter(qcelp13_enc_handle,OMX_IndexParamPortDefinition,&inputportFmt);
- DEBUG_PRINT ("\nEnc Input Buffer Count %u\n", inputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Input Buffer Size %u\n", inputportFmt.nBufferSize);
-
- if(OMX_DirInput != inputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Input Port\n");
- return -1;
- }
-
- pcmparam.nPortIndex = 0;
- pcmparam.nChannels = channels;
- pcmparam.nSamplingRate = samplerate;
- OMX_SetParameter(qcelp13_enc_handle,OMX_IndexParamAudioPcm,&pcmparam);
-
-
- /* Query the encoder outport's min buf requirements */
- CONFIG_VERSION_SIZE(outputportFmt);
- /* Port for which the Client needs to obtain info */
- outputportFmt.nPortIndex = portParam.nStartPortNumber + 1;
-
- OMX_GetParameter(qcelp13_enc_handle,OMX_IndexParamPortDefinition,&outputportFmt);
- DEBUG_PRINT ("\nEnc: Output Buffer Count %u\n", outputportFmt.nBufferCountMin);
- DEBUG_PRINT ("\nEnc: Output Buffer Size %u\n", outputportFmt.nBufferSize);
-
- if(OMX_DirOutput != outputportFmt.eDir) {
- DEBUG_PRINT ("\nEnc: Expect Output Port\n");
- return -1;
- }
-
-
- CONFIG_VERSION_SIZE(qcelp13param);
-
- qcelp13param.nPortIndex = 1;
- qcelp13param.nChannels = channels; //2 ; /* 1-> mono 2-> stereo*/
- qcelp13param.nMinBitRate = min_bitrate;
- qcelp13param.nMaxBitRate = max_bitrate;
- OMX_SetParameter(qcelp13_enc_handle,OMX_IndexParamAudioQcelp13,&qcelp13param);
- OMX_GetExtensionIndex(qcelp13_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index);
- OMX_GetParameter(qcelp13_enc_handle,index,&streaminfoparam);
- if(tunnel) {
- #ifdef AUDIOV2
- session_id = streaminfoparam.sessionId;
- control = msm_mixer_open("/dev/snd/controlC0", 0);
- if(control < 0)
- printf("ERROR opening the device\n");
- device_id = msm_get_device(device);
- DEBUG_PRINT ("\ndevice_id = %d\n",device_id);
- DEBUG_PRINT("\nsession_id = %d\n",session_id);
- if (msm_en_device(device_id, 1))
- {
- perror("could not enable device\n");
- return -1;
- }
- if (msm_route_stream(DIR_TX,session_id,device_id, 1))
- {
- perror("could not set stream routing\n");
- return -1;
- }
- #endif
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n");
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0);
- /* wait_for_event(); should not wait here event complete status will
- not come until enough buffer are allocated */
- if (tunnel == 0)
- {
- input_buf_cnt = inputportFmt.nBufferCountActual; // inputportFmt.nBufferCountMin + 5;
- DEBUG_PRINT("Transition to Idle State succesful...\n");
- /* Allocate buffer on decoder's i/p port */
- error = Allocate_Buffer(qcelp13_enc_handle, &pInputBufHdrs, inputportFmt.nPortIndex,
- input_buf_cnt, inputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pInputBufHdrs == NULL) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Input buffer success\n");
- }
- }
- output_buf_cnt = outputportFmt.nBufferCountMin ;
-
- /* Allocate buffer on encoder's O/Pp port */
- error = Allocate_Buffer(qcelp13_enc_handle, &pOutputBufHdrs, outputportFmt.nPortIndex,
- output_buf_cnt, outputportFmt.nBufferSize);
- if (error != OMX_ErrorNone || pOutputBufHdrs == NULL ) {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer error\n");
- return -1;
- }
- else {
- DEBUG_PRINT ("\nOMX_AllocateBuffer Output buffer success\n");
- }
-
- wait_for_event();
-
-
- if (tunnel == 1)
- {
- DEBUG_PRINT ("\nOMX_SendCommand to enable TUNNEL MODE during IDLE\n");
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandPortDisable,0,0); // disable input port
- wait_for_event();
- }
-
- DEBUG_PRINT ("\nOMX_SendCommand encoder -> Executing\n");
- OMX_SendCommand(qcelp13_enc_handle, OMX_CommandStateSet, OMX_StateExecuting,0);
- wait_for_event();
-
- DEBUG_PRINT(" Start sending OMX_FILLthisbuffer\n");
-
- for(i=0; i < output_buf_cnt; i++) {
- DEBUG_PRINT ("\nOMX_FillThisBuffer on output buf no.%d\n",i);
- pOutputBufHdrs[i]->nOutputPortIndex = 1;
- pOutputBufHdrs[i]->nFlags = pOutputBufHdrs[i]->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
- ret = OMX_FillThisBuffer(qcelp13_enc_handle, pOutputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_FillThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_FillThisBuffer success!\n");
- }
- }
-
-if(tunnel == 0)
-{
- DEBUG_PRINT(" Start sending OMX_emptythisbuffer\n");
- for (i = 0;i < input_buf_cnt;i++) {
- DEBUG_PRINT ("\nOMX_EmptyThisBuffer on Input buf no.%d\n",i);
- pInputBufHdrs[i]->nInputPortIndex = 0;
- Size = Read_Buffer(pInputBufHdrs[i]);
- if(Size <=0 ){
- DEBUG_PRINT("NO DATA READ\n");
- bInputEosReached = true;
- pInputBufHdrs[i]->nFlags= OMX_BUFFERFLAG_EOS;
- }
- pInputBufHdrs[i]->nFilledLen = (OMX_U32)Size;
- pInputBufHdrs[i]->nInputPortIndex = 0;
- used_ip_buf_cnt++;
- ret = OMX_EmptyThisBuffer(qcelp13_enc_handle, pInputBufHdrs[i]);
- if (OMX_ErrorNone != ret) {
- DEBUG_PRINT("OMX_EmptyThisBuffer failed with result %d\n", ret);
- }
- else {
- DEBUG_PRINT("OMX_EmptyThisBuffer success!\n");
- }
- if(Size <=0 ){
- break;//eos reached
- }
- }
- pthread_mutex_lock(&etb_lock);
- if(etb_done)
-{
- DEBUG_PRINT("Component is waiting for EBD to be released.\n");
- etb_event_complete();
- }
- else
- {
- DEBUG_PRINT("\n****************************\n");
- DEBUG_PRINT("EBD not yet happened ...\n");
- DEBUG_PRINT("\n****************************\n");
- etb_done++;
- }
- pthread_mutex_unlock(&etb_lock);
-}
-
- return 0;
-}
-
-
-
-static OMX_ERRORTYPE Allocate_Buffer ( OMX_COMPONENTTYPE *avc_enc_handle,
- OMX_BUFFERHEADERTYPE ***pBufHdrs,
- OMX_U32 nPortIndex,
- unsigned int bufCntMin, unsigned int bufSize)
-{
- DEBUG_PRINT("Inside %s \n", __FUNCTION__);
- OMX_ERRORTYPE error=OMX_ErrorNone;
- unsigned int bufCnt=0;
-
- /* To remove warning for unused variable to keep prototype same */
- (void)avc_enc_handle;
-
- *pBufHdrs= (OMX_BUFFERHEADERTYPE **)
- malloc(sizeof(OMX_BUFFERHEADERTYPE*)*bufCntMin);
-
- for(bufCnt=0; bufCnt < bufCntMin; ++bufCnt) {
- DEBUG_PRINT("\n OMX_AllocateBuffer No %d \n", bufCnt);
- error = OMX_AllocateBuffer(qcelp13_enc_handle, &((*pBufHdrs)[bufCnt]),
- nPortIndex, NULL, bufSize);
- }
-
- return error;
-}
-
-
-
-
-static int Read_Buffer (OMX_BUFFERHEADERTYPE *pBufHdr )
-{
-
- size_t bytes_read=0;
-
-
- pBufHdr->nFilledLen = 0;
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
-
- bytes_read = fread(pBufHdr->pBuffer, 1, pBufHdr->nAllocLen , inputBufferFile);
-
- pBufHdr->nFilledLen = (OMX_U32)bytes_read;
- // Time stamp logic
- ((OMX_BUFFERHEADERTYPE *)pBufHdr)->nTimeStamp = \
-
- (OMX_TICKS) ((total_pcm_bytes * 1000)/(samplerate * channels *2));
-
- DEBUG_PRINT ("\n--time stamp -- %ld\n", (unsigned long)((OMX_BUFFERHEADERTYPE *)pBufHdr)->nTimeStamp);
- if(bytes_read == 0)
- {
- pBufHdr->nFlags |= OMX_BUFFERFLAG_EOS;
- DEBUG_PRINT ("\nBytes read zero\n");
- }
- else
- {
- pBufHdr->nFlags = pBufHdr->nFlags & (unsigned)~OMX_BUFFERFLAG_EOS;
-
- total_pcm_bytes = (unsigned)(total_pcm_bytes + bytes_read);
- }
-
- return (int)bytes_read;;
-}
-
-
-
-//In Encoder this Should Open a PCM or WAV file for input.
-
-static int open_audio_file ()
-{
- int error_code = 0;
-
- if (!tunnel)
- {
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, in_filename);
- inputBufferFile = fopen (in_filename, "rb");
- if (inputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- in_filename);
- error_code = -1;
- }
- if(parse_pcm_header() != 0x00)
- {
- DEBUG_PRINT("PCM parser failed \n");
- return -1;
- }
- }
-
- DEBUG_PRINT("Inside %s filename=%s\n", __FUNCTION__, out_filename);
- outputBufferFile = fopen (out_filename, "wb");
- if (outputBufferFile == NULL) {
- DEBUG_PRINT("\ni/p file %s could NOT be opened\n",
- out_filename);
- error_code = -1;
- return error_code;
- }
- fseek(outputBufferFile, QCP_HEADER_SIZE, SEEK_SET);
- return error_code;
-}
-
-static OMX_ERRORTYPE parse_pcm_header()
-{
- struct wav_header hdr;
-
- DEBUG_PRINT("\n***************************************************************\n");
- if(fread(&hdr, 1, sizeof(hdr),inputBufferFile)!=sizeof(hdr))
- {
- DEBUG_PRINT("Wav file cannot read header\n");
- return -1;
- }
-
- if ((hdr.riff_id != ID_RIFF) ||
- (hdr.riff_fmt != ID_WAVE)||
- (hdr.fmt_id != ID_FMT))
- {
- DEBUG_PRINT("Wav file is not a riff/wave file\n");
- return -1;
- }
-
- if (hdr.audio_format != FORMAT_PCM)
- {
- DEBUG_PRINT("Wav file is not adpcm format %d and fmt size is %d\n",
- hdr.audio_format, hdr.fmt_sz);
- return -1;
- }
-
- DEBUG_PRINT("Samplerate is %d\n", hdr.sample_rate);
- DEBUG_PRINT("Channel Count is %d\n", hdr.num_channels);
- DEBUG_PRINT("\n***************************************************************\n");
-
- samplerate = hdr.sample_rate;
- channels = hdr.num_channels;
- total_pcm_bytes = 0;
-
- return OMX_ErrorNone;
-}
diff --git a/qahw_api/test/qahw_multi_record_test.c b/qahw_api/test/qahw_multi_record_test.c
index 1a61a08..c9f8b03 100644
--- a/qahw_api/test/qahw_multi_record_test.c
+++ b/qahw_api/test/qahw_multi_record_test.c
@@ -405,7 +405,7 @@
fread((void *) latencyBuf, 100, 1, fdLatencyNode);
fclose(fdLatencyNode);
sscanf(latencyBuf, " %llu,%llu", &tsec, &tusec);
- tCont = tsCont.tv_sec*1000 - tsec*1000 + tsCont.tv_nsec/1000000 - tusec/1000;
+ tCont = ((uint64_t)tsCont.tv_sec)*1000 - tsec*1000 + ((uint64_t)tsCont.tv_nsec)/1000000 - tusec/1000;
if (log_file != stdout) {
fprintf(stdout, "\n cold latency %llums, continuous latency %llums, handle(%d)\n", tCold, tCont, params->handle);
fprintf(stdout, " **Note: please add DSP Pipe/PP latency numbers to this, for final latency values\n");
diff --git a/qahw_api/test/qahw_playback_test.c b/qahw_api/test/qahw_playback_test.c
index d114ede..ef44fae 100644
--- a/qahw_api/test/qahw_playback_test.c
+++ b/qahw_api/test/qahw_playback_test.c
@@ -880,7 +880,7 @@
else
stream_info->config.offload_info.format = AUDIO_FORMAT_PCM_16_BIT;
if (!(stream_info->flags_set))
- stream_info->flags = AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;
+ stream_info->flags = AUDIO_OUTPUT_FLAG_DIRECT_PCM|AUDIO_OUTPUT_FLAG_DIRECT;
break;
case FILE_MP3:
@@ -1017,8 +1017,8 @@
fread((void *) latency_buf, 100, 1, fd_latency_node);
fclose(fd_latency_node);
sscanf(latency_buf, " %llu,%llu,%*llu,%*llu,%llu,%llu", &scold, &uscold, &scont, &uscont);
- tcold = scold*1000 - ts_cold.tv_sec*1000 + uscold/1000 - ts_cold.tv_nsec/1000000;
- tcont = scont*1000 - ts_cont.tv_sec*1000 + uscont/1000 - ts_cont.tv_nsec/1000000;
+ tcold = scold*1000 - ((uint64_t)ts_cold.tv_sec)*1000 + uscold/1000 - ((uint64_t)ts_cold.tv_nsec)/1000000;
+ tcont = scont*1000 - ((uint64_t)ts_cont.tv_sec)*1000 + uscont/1000 - ((uint64_t)ts_cont.tv_nsec)/1000000;
fprintf(log_file, "\n values from debug node %s\n", latency_buf);
fprintf(log_file, " cold latency %llums, continuous latency %llums,\n", tcold, tcont);
fprintf(log_file, " **Note: please add DSP Pipe/PP latency numbers to this, for final latency values\n");
diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index bc44139..622af33 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -21,8 +21,8 @@
LOCAL_CFLAGS+= -O2 -fvisibility=hidden
-ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),)
- LOCAL_CFLAGS += -DPLATFORM_MSM8998
+ifneq ($(filter sdm660 msm8998,$(TARGET_BOARD_PLATFORM)),)
+ LOCAL_CFLAGS += -DCAPTURE_DEVICE=7
endif
LOCAL_SHARED_LIBRARIES := \
diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index 716755b..30e9e79 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 The Android Open Source Project
+ * Copyright (C) 2013, 2017 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.
@@ -179,9 +179,8 @@
#define MIXER_CARD 0
#define SOUND_CARD 0
-#ifdef PLATFORM_MSM8998
-#define CAPTURE_DEVICE 7
-#else
+
+#ifndef CAPTURE_DEVICE
#define CAPTURE_DEVICE 8
#endif
@@ -451,7 +450,7 @@
__attribute__ ((visibility ("default")))
int visualizer_hal_start_output(audio_io_handle_t output, int pcm_id) {
- int ret;
+ int ret = 0;
struct listnode *node;
ALOGV("%s output %d pcm_id %d", __func__, output, pcm_id);
@@ -502,7 +501,7 @@
__attribute__ ((visibility ("default")))
int visualizer_hal_stop_output(audio_io_handle_t output, int pcm_id) {
- int ret;
+ int ret = 0;
struct listnode *node;
struct listnode *fx_node;
output_context_t *out_ctxt;