Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42b05320 authored by Streetwalrus Einstein's avatar Streetwalrus Einstein
Browse files

media_codecs: clean up ffmpeg codecs

These are already provided by media_codecs_ffmpeg.xml and they prevent
stagefright from initializing properly, causing most media playback and
video recording to be broken.

Change-Id: I0c26d1084d12b62243fd90fe8e35e7fb9c168fee
parent 68a6c624
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
@@ -106,26 +106,6 @@
            <Feature name="adaptive-playback" />
            <Limit name="concurrent-instances" max="4" />
        </MediaCodec>

        <!--  ffmpeg audio codecs  -->
        <MediaCodec name="OMX.ffmpeg.ra.decoder" type="audio/vnd.rn-realaudio"/>
        <MediaCodec name="OMX.ffmpeg.flac.decoder" type="audio/flac"/>
        <MediaCodec name="OMX.ffmpeg.mp2.decoder" type="audio/mpeg-L2"/>
        <MediaCodec name="OMX.ffmpeg.ac3.decoder" type="audio/ac3"/>
        <MediaCodec name="OMX.ffmpeg.ape.decoder" type="audio/x-ape"/>
        <MediaCodec name="OMX.ffmpeg.dts.decoder" type="audio/vnd.dts"/>
        <MediaCodec name="OMX.ffmpeg.atrial.decoder" type="audio/ffmpeg"/>

        <!--  ffmpeg video codecs  -->
        <MediaCodec name="OMX.ffmpeg.mpeg2v.decoder" type="video/mpeg2"/>
        <MediaCodec name="OMX.ffmpeg.wmv.decoder" type="video/x-ms-wmv"/>
        <MediaCodec name="OMX.ffmpeg.rv.decoder" type="video/vnd.rn-realvideo"/>
        <MediaCodec name="OMX.ffmpeg.vc1.decoder" type="video/vc1"/>
        <MediaCodec name="OMX.ffmpeg.flv1.decoder" type="video/x-flv"/>
        <MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/>
        <MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"/>
        <MediaCodec name="OMX.ffmpeg.vtrial.decoder" type="video/ffmpeg"/>

    </Decoders>
    <Include href="media_codecs_google_video.xml" />
    <Include href="media_codecs_ffmpeg.xml" />