lineage/android_device_samsung_msm8974-common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msm8974-common: Update media_codecs for L

Browse Source 
Change-Id: I43e9f833033751fe65f01bd3bcc9f320cdf538be
This commit is contained in:
Christopher R. Palmer 2014-11-17 06:12:50 -05:00
parent 7c662df7a3
commit 4375ed3da1
2 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
configs/media_codecs.xml
View File

@ -15,23 +15,19 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<CodecList> <MediaCodecs>
<Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_google_telephony.xml" />
<Encoders> <Encoders>
<!-- Audio Hardware --> <!-- Audio Hardware -->
<MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
<MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" > <MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.google.flac.encoder" type="audio/flac"/>
<MediaCodec name="OMX.qcom.audio.encoder.qcelp13" type="audio/qcelp" > <MediaCodec name="OMX.qcom.audio.encoder.qcelp13" type="audio/qcelp" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
</MediaCodec> </MediaCodec>
<!-- Audio Software -->
<MediaCodec name="AACEncoder" type="audio/mp4a-latm" />
<MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
<MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
<!-- Video Hardware --> <!-- Video Hardware -->
<MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" > <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
@ -49,9 +45,6 @@
<Quirk name="requires-loaded-to-idle-after-allocation" /> <Quirk name="requires-loaded-to-idle-after-allocation" />
</MediaCodec> </MediaCodec>
<!-- Video Software --> <!-- Video Software -->
<MediaCodec name="OMX.google.h264.encoder" type="video/avc" />
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" />
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" />
</Encoders> </Encoders>
<Decoders> <Decoders>
<!-- Audio Hardware --> <!-- Audio Hardware -->
@ -68,15 +61,7 @@
<MediaCodec name="OMX.qcom.audio.decoder.amrwbplus" type="audio/amr-wb-plus" > <MediaCodec name="OMX.qcom.audio.decoder.amrwbplus" type="audio/amr-wb-plus" >
</MediaCodec> </MediaCodec>
<!-- Audio Software --> <!-- Audio Software -->
<MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
<MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg" />
<MediaCodec name="MP3Decoder" type="audio/mpeg" /> <MediaCodec name="MP3Decoder" type="audio/mpeg" />
<MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" />
<MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" />
<MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
<MediaCodec name="AACDecoder" type="audio/mp4a-latm" />
<MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" />
<MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
<MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" > <MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" >
<Quirk name="requires-global-flush" /> <Quirk name="requires-global-flush" />
</MediaCodec> </MediaCodec>
@ -87,56 +72,49 @@
<MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" > <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" > <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" > <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" > <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" > <MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" > <MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" > <MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" > <MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" > <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
<Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-allocate-on-output-ports" />
<Quirk name="defers-output-buffer-allocation" /> <Quirk name="adaptive-playback" />
</MediaCodec> </MediaCodec>
<!-- Video Software -->
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" />
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" />
<!-- ffmpeg audio codecs --> <!-- ffmpeg audio codecs -->
<MediaCodec name="OMX.ffmpeg.ra.decoder" type="audio/vnd.rn-realaudio"/> <MediaCodec name="OMX.ffmpeg.ra.decoder" type="audio/vnd.rn-realaudio"/>
<MediaCodec name="OMX.ffmpeg.flac.decoder" type="audio/flac"/> <MediaCodec name="OMX.ffmpeg.flac.decoder" type="audio/flac"/>
@ -155,6 +133,6 @@
<MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/> <MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/>
<MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"/> <MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"/>
<MediaCodec name="OMX.ffmpeg.vtrial.decoder" type="video/ffmpeg"/> <MediaCodec name="OMX.ffmpeg.vtrial.decoder" type="video/ffmpeg"/>
</Decoders> </Decoders>
</CodecList> <Include href="media_codecs_google_video.xml" />
</MediaCodecs>

3
msm8974.mk
View File

@ -110,6 +110,9 @@ PRODUCT_COPY_FILES += \
# Media # Media
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
device/samsung/msm8974-common/configs/media_codecs.xml:system/etc/media_codecs.xml device/samsung/msm8974-common/configs/media_codecs.xml:system/etc/media_codecs.xml
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \