Merge "Media: Add support for 5.1 surround sound recording" into jb
This commit is contained in:
commit
b0449fe387
|
@ -21,6 +21,7 @@
|
|||
<CodecList>
|
||||
<Encoders>
|
||||
<!-- Audio Hardware -->
|
||||
<MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
|
||||
<MediaCodec name="OMX.qcom.audio.encoder.aac" type="audio/mp4a-latm" />
|
||||
<MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
|
||||
<Quirk name="requires-allocate-on-input-ports" />
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
<!ATTLIST Audio codec (amrnb|amrwb|aac) #REQUIRED>
|
||||
<!ATTLIST Audio bitRate CDATA #REQUIRED>
|
||||
<!ATTLIST Audio sampleRate CDATA #REQUIRED>
|
||||
<!ATTLIST Audio channels (1|2) #REQUIRED>
|
||||
<!ATTLIST Audio channels (1|2|6) #REQUIRED>
|
||||
<!ELEMENT ImageEncoding EMPTY>
|
||||
<!ATTLIST ImageEncoding quality (90|80|70|60|50|40) #REQUIRED>
|
||||
<!ELEMENT ImageDecoding EMPTY>
|
||||
|
@ -67,8 +67,8 @@
|
|||
<!ATTLIST AudioEncoderCap maxBitRate CDATA #REQUIRED>
|
||||
<!ATTLIST AudioEncoderCap minSampleRate CDATA #REQUIRED>
|
||||
<!ATTLIST AudioEncoderCap maxSampleRate CDATA #REQUIRED>
|
||||
<!ATTLIST AudioEncoderCap minChannels (1|2) #REQUIRED>
|
||||
<!ATTLIST AudioEncoderCap maxChannels (1|2) #REQUIRED>
|
||||
<!ATTLIST AudioEncoderCap minChannels (1|2|6) #REQUIRED>
|
||||
<!ATTLIST AudioEncoderCap maxChannels (1|2|6) #REQUIRED>
|
||||
<!ELEMENT VideoDecoderCap EMPTY>
|
||||
<!ATTLIST VideoDecoderCap name (wmv) #REQUIRED>
|
||||
<!ATTLIST VideoDecoderCap enabled (true|false) #REQUIRED>
|
||||
|
@ -568,7 +568,7 @@
|
|||
<AudioEncoderCap name="aac" enabled="true"
|
||||
minBitRate="8000" maxBitRate="96000"
|
||||
minSampleRate="8000" maxSampleRate="48000"
|
||||
minChannels="1" maxChannels="1" />
|
||||
minChannels="1" maxChannels="6" />
|
||||
|
||||
<AudioEncoderCap name="amrwb" enabled="true"
|
||||
minBitRate="6600" maxBitRate="23050"
|
||||
|
|
Loading…
Reference in New Issue