am e88fe446: am b4b0608b: Merge "legacy audio policy: check string parameters before...

[android-x86/hardware-libhardware_legacy.git] / audio / audio_policy.conf

diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf
index 9f77dce..3e29976 100644 (file)
--- a/audio/audio_policy.conf
+++ b/audio/audio_policy.conf
@@ -9,14 +9,14 @@
 global_configuration {
   attached_output_devices AUDIO_DEVICE_OUT_SPEAKER
   default_output_device AUDIO_DEVICE_OUT_SPEAKER
-  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
+  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX
 }
 
 # audio hardware module section: contains descriptors for all audio hw modules present on the
 # device. Each hw module node is named after the corresponding hw module library base name.
 # For instance, "primary" corresponds to audio.primary.<device>.so.
 # The "primary" module is mandatory and must include at least one output with
-# AUDIO_POLICY_OUTPUT_FLAG_PRIMARY flag.
+# AUDIO_OUTPUT_FLAG_PRIMARY flag.
 # Each module descriptor contains one or more output profile descriptors and zero or more
 # input profile descriptors. Each profile lists all the parameters supported by a given output
 # or input stream category.
@@ -31,7 +31,7 @@ audio_hw_modules {
         channel_masks AUDIO_CHANNEL_OUT_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
         devices AUDIO_DEVICE_OUT_SPEAKER
-        flags AUDIO_POLICY_OUTPUT_FLAG_PRIMARY
+        flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
     }
     inputs {
@@ -43,4 +43,22 @@ audio_hw_modules {
       }
     }
   }
+  r_submix {
+    outputs {
+      submix {
+        sampling_rates 48000
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX
+      }
+    }
+    inputs {
+      submix {
+        sampling_rates 48000
+        channel_masks AUDIO_CHANNEL_IN_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_IN_REMOTE_SUBMIX
+      }
+    }
+  }
 }