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

Commit 90d6b27a authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am c83d228e: Merge "stagefright: Move google mpeg2 codec into...

am c83d228e: Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" into mnc-dr-dev

* commit 'c83d228e':
  stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml
parents 5259aaac c83d228e
Loading
Loading
Loading
Loading
+29 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright (C) 2015 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.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<Included>
    <Decoders>
        <MediaCodec name="OMX.google.mpeg2.decoder" type="video/mpeg2">
            <!-- profiles and levels:  ProfileMain : LevelHL -->
            <Limit name="size" min="16x16" max="1920x1088" />
            <Limit name="alignment" value="2x2" />
            <Limit name="block-size" value="16x16" />
            <Limit name="blocks-per-second" range="1-244800" />
            <Limit name="bitrate" range="1-20000000" />
            <Feature name="adaptive-playback" />
        </MediaCodec>
    </Encoders>
</Included>
+0 −9
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@

<Included>
    <Decoders>
        <MediaCodec name="OMX.google.mpeg2.decoder" type="video/mpeg2">
            <!-- profiles and levels:  ProfileMain : LevelHL -->
            <Limit name="size" min="16x16" max="1920x1088" />
            <Limit name="alignment" value="2x2" />
            <Limit name="block-size" value="16x16" />
            <Limit name="blocks-per-second" range="1-244800" />
            <Limit name="bitrate" range="1-20000000" />
            <Feature name="adaptive-playback" />
        </MediaCodec>
        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es">
            <!-- profiles and levels:  ProfileSimple : Level3 -->
            <Limit name="size" min="2x2" max="352x288" />