diff options
| author | Lajos Molnar <lajos@google.com> | 2015-09-18 17:17:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-18 17:17:03 +0000 |
| commit | c83d228e85b187e3112f10003282c8270d18ef71 (patch) | |
| tree | 6b85f72a71fc39f887b4ee5208a0187ce643856d | |
| parent | c47063966377145dece7e65dca533a9833d1d2e0 (diff) | |
| parent | e1c9766e23a1e5084d9fdbcc0b2005406627f1d4 (diff) | |
| download | frameworks_av-c83d228e85b187e3112f10003282c8270d18ef71.zip frameworks_av-c83d228e85b187e3112f10003282c8270d18ef71.tar.gz frameworks_av-c83d228e85b187e3112f10003282c8270d18ef71.tar.bz2 | |
Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" into mnc-dr-dev
| -rw-r--r-- | media/libstagefright/data/media_codecs_google_tv.xml | 29 | ||||
| -rw-r--r--[-rwxr-xr-x] | media/libstagefright/data/media_codecs_google_video.xml | 9 |
2 files changed, 29 insertions, 9 deletions
diff --git a/media/libstagefright/data/media_codecs_google_tv.xml b/media/libstagefright/data/media_codecs_google_tv.xml new file mode 100644 index 0000000..9b4a1ac --- /dev/null +++ b/media/libstagefright/data/media_codecs_google_tv.xml @@ -0,0 +1,29 @@ +<?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> diff --git a/media/libstagefright/data/media_codecs_google_video.xml b/media/libstagefright/data/media_codecs_google_video.xml index 740f96b..81a6d00 100755..100644 --- a/media/libstagefright/data/media_codecs_google_video.xml +++ b/media/libstagefright/data/media_codecs_google_video.xml @@ -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" /> |