author | Dan Zhang <danielzhang@google.com> | 2019-12-05 06:45:48 (GMT) |
---|---|---|
committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2019-12-05 06:45:48 (GMT) |
commit | ee5a0040f6795fc29cde90f1982b5b1857a85c5d (patch) | |
tree | c05639c9194a8541ab7a861df5809a19b7d26c2c | |
parent | 599555b5726da0045ee26025ddfca948dde21132 (diff) | |
parent | 5d00b670b2bbc2f960e1a4576d39b8ad8425fb20 (diff) | |
download | common-ee5a0040f6795fc29cde90f1982b5b1857a85c5d.zip common-ee5a0040f6795fc29cde90f1982b5b1857a85c5d.tar.gz common-ee5a0040f6795fc29cde90f1982b5b1857a85c5d.tar.bz2 |
Merge "sm1: shared common code in newton and elektra [1/3]" into q-tv-dev
-rw-r--r-- | products/mbox/sm1/device.mk | 8 | ||||
-rw-r--r-- | products/mbox/sm1/files/media_codecs.xml | 306 | ||||
-rw-r--r-- | products/mbox/sm1/files/media_codecs_ext.xml | 163 | ||||
-rw-r--r-- | products/mbox/sm1/files/media_codecs_performance.xml | 224 | ||||
-rw-r--r-- | products/mbox/sm1/files/tv/tvconfig/dtvkit/config.xml | 17 | ||||
-rw-r--r-- | products/mbox/sm1/files/tv/tvconfig/tvconfig.conf | 44 | ||||
-rw-r--r-- | products/mbox/sm1/sm1.mk | 19 | ||||
-rw-r--r-- | products/mbox/sm1/vendor_prop.mk | 6 |
8 files changed, 2 insertions, 785 deletions
diff --git a/products/mbox/sm1/device.mk b/products/mbox/sm1/device.mk index 13936f0..a21c681 100644 --- a/products/mbox/sm1/device.mk +++ b/products/mbox/sm1/device.mk @@ -69,14 +69,8 @@ PRODUCT_COPY_FILES += \ ######################################################################### PRODUCT_COPY_FILES += \ device/amlogic/common/products/mbox/sm1/files/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - device/amlogic/common/products/mbox/sm1/files/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ - device/amlogic/common/products/mbox/sm1/files/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - device/amlogic/common/products/mbox/sm1/files/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml + device/amlogic/common/products/mbox/sm1/files/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml -ifeq ($(TARGET_WITH_MEDIA_EXT), true) -PRODUCT_COPY_FILES += \ - device/amlogic/common/products/mbox/sm1/files/media_codecs_ext.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_ext.xml -endif ######################################################################### # diff --git a/products/mbox/sm1/files/media_codecs.xml b/products/mbox/sm1/files/media_codecs.xml deleted file mode 100644 index 03dcac9..0000000 --- a/products/mbox/sm1/files/media_codecs.xml +++ b/dev/null @@ -1,306 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright (C) 2012 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. ---> - -<!-- -<!DOCTYPE MediaCodecs [ -<!ELEMENT MediaCodecs (Decoders,Encoders)> -<!ELEMENT Decoders (MediaCodec*)> -<!ELEMENT Encoders (MediaCodec*)> -<!ELEMENT MediaCodec (Type*,Quirk*)> -<!ATTLIST MediaCodec name CDATA #REQUIRED> -<!ATTLIST MediaCodec type CDATA> -<!ELEMENT Type EMPTY> -<!ATTLIST Type name CDATA #REQUIRED> -<!ELEMENT Quirk EMPTY> -<!ATTLIST Quirk name CDATA #REQUIRED> -]> - -There's a simple and a complex syntax to declare the availability of a -media codec: - -A codec that properly follows the OpenMax spec and therefore doesn't have any -quirks and that only supports a single content type can be declared like so: - - <MediaCodec name="OMX.foo.bar" type="something/interesting" /> - -If a codec has quirks OR supports multiple content types, the following syntax -can be used: - - <MediaCodec name="OMX.foo.bar" > - <Type name="something/interesting" /> - <Type name="something/else" /> - ... - <Quirk name="requires-allocate-on-input-ports" /> - <Quirk name="requires-allocate-on-output-ports" /> - <Quirk name="output-buffers-are-unreadable" /> - </MediaCodec> - -Only the three quirks included above are recognized at this point: - -"requires-allocate-on-input-ports" - must be advertised if the component does not properly support specification - of input buffers using the OMX_UseBuffer(...) API but instead requires - OMX_AllocateBuffer to be used. - -"requires-allocate-on-output-ports" - must be advertised if the component does not properly support specification - of output buffers using the OMX_UseBuffer(...) API but instead requires - OMX_AllocateBuffer to be used. - -"output-buffers-are-unreadable" - must be advertised if the emitted output buffers of a decoder component - are not readable, i.e. use a custom format even though abusing one of - the official OMX colorspace constants. - Clients of such decoders will not be able to access the decoded data, - naturally making the component much less useful. The only use for - a component with this quirk is to render the output to the screen. - Audio decoders MUST NOT advertise this quirk. - Video decoders that advertise this quirk must be accompanied by a - corresponding color space converter for thumbnail extraction, - matching surfaceflinger support that can render the custom format to - a texture and possibly other code, so just DON'T USE THIS QUIRK. - ---> - -<MediaCodecs> - <Decoders> - <MediaCodec name="OMX.amlogic.dolby-vision.decoder.awesome" type="video/dolby-vision" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Feature name="tunneled-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.dolby-vision.decoder.awesome.secure" type="video/dolby-vision" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Feature name="secure-playback" required="true" /> - <Feature name="tunneled-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.hevc.decoder.awesome2" type="video/hevc" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Feature name="tunneled-playback" /> - <Limit name="concurrent-instances" max="9" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.hevc.decoder.awesome2.secure" type="video/hevc" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Feature name="secure-playback" required="true" /> - <Feature name="tunneled-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avc.decoder.awesome2" type="video/avc" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="9" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avc.decoder.awesome2.secure" type="video/avc" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Feature name="secure-playback" required="true" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.mpeg4.decoder.awesome" type="video/mp4v-es" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.h263.decoder.awesome" type="video/3gpp" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.mpeg2.decoder.awesome" type="video/mpeg2" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp9.decoder.awesome2" type="video/x-vnd.on2.vp9" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Feature name="tunneled-playback" /> - <Limit name="concurrent-instances" max="9" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp9.decoder.awesome2.secure" type="video/x-vnd.on2.vp9" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Feature name="secure-playback" required="true" /> - <Feature name="tunneled-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <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="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" /> - <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" /> - <MediaCodec name="OMX.google.adpcm.ima.decoder" type="audio/adpcm-ima" /> - <MediaCodec name="OMX.google.adpcm.ms.decoder" type="audio/adpcm-ms" /> - <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" /> - <MediaCodec name="OMX.google.alac.decoder" type="audio/alac" /> - <MediaCodec name="OMX.google.ape.decoder" type="audio/ape" /> - <MediaCodec name="OMX.google.raw.decoder" type="audio/raw" /> - <MediaCodec name="OMX.amlogic.audio.decoder.ac3" type="audio/ac3" /> - <MediaCodec name="OMX.amlogic.audio.decoder.eac3" type="audio/eac3" /> - <MediaCodec name="OMX.amlogic.audio.decoder.dtshd" type="audio/dtshd" /> - <MediaCodec name="OMX.google.opus.decoder" type="audio/opus"> - <Limit name="channel-count" max="8" /> - <Limit name="sample-rate" ranges="48000" /> - <Limit name="bitrate" range="6000-510000" /> - </MediaCodec> - <MediaCodec name="OMX.google.flac.decoder" type="audio/flac" /> - - <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" /> - <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" /> - <MediaCodec name="OMX.google.h264.decoder" type="video/avc"> - <!-- profiles and levels: ProfileBaseline : Level51 --> - <Limit name="size" min="2x2" max="2048x2048" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="block-count" range="1-8160" /> - <Limit name="blocks-per-second" range="1-489600" /> - <Limit name="bitrate" range="1-40000000" /> - <Feature name="adaptive-playback" /> - </MediaCodec> - <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc"> - <!-- profiles and levels: ProfileMain : MainTierLevel51 --> - <Limit name="size" min="2x2" max="4096x4096" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="8x8" /> - <Limit name="block-count" range="1-196608" /> <!-- max 4096x3072 --> - <Limit name="blocks-per-second" range="1-2000000" /> - <Limit name="bitrate" range="1-10000000" /> - <Feature name="adaptive-playback" /> - </MediaCodec> - <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8"> - <Limit name="size" min="2x2" max="2048x2048" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="block-count" range="1-8160" /> - <Limit name="blocks-per-second" range="1-500000" /> - <Limit name="bitrate" range="1-40000000" /> - <Feature name="adaptive-playback" /> - </MediaCodec> - <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9"> - <Limit name="size" min="2x2" max="1280x1280" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="block-count" range="1-3600" /> - <Limit name="blocks-per-second" range="1-108000" /> - <Limit name="bitrate" range="1-5000000" /> - <Feature name="adaptive-playback" /> - </MediaCodec> - <MediaCodec name="OMX.google.mp3.decoder" > - <Type name="audio/mpeg" /> - <Quirk name="needs-flush-before-disable" /> - <Quirk name="requires-flush-complete-emulation" /> - </MediaCodec> - - </Decoders> - - <Settings> - <Setting name="max-video-encoder-input-buffers" value="9" /> - <Setting name="supports-multiple-secure-codecs" value="false" /> - <Setting name="supports-secure-with-non-secure-codec" value="true" /> - <Variant name="slow-cpu" enabled="true" /> - </Settings> - - <Encoders> - <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" /> - <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" /> - <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" /> - <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" /> - - <MediaCodec name="OMX.amlogic.video.encoder.hevc" type="video/hevc" > - <Limit name="size" min="176x144" max="1920x1088" /> - <Limit name="alignment" value="16x16" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="244800" /> - <Limit name="bitrate" range="1-10000000" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.video.encoder.avc" type="video/avc" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="16x16" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="244800" /> - <Limit name="bitrate" range="1-20000000" /> - <Limit name="concurrent-instances" max="3" /> - </MediaCodec> - <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" > - <Limit name="size" min="176x144" max="640x480" /> - <Limit name="alignment" value="16x16" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="1485" /> - <Limit name="bitrate" range="192000-1440000" /> - </MediaCodec> - <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" > - <Limit name="size" min="176x144" max="352x288" /> - <Limit name="alignment" value="16x16" /> - </MediaCodec> - <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8"> - <!-- profiles and levels: ProfileMain : Level_Version0-3 --> - <Limit name="size" min="2x2" max="896x896" /> - <Limit name="alignment" value="2x2" /> - <Limit name="bitrate" range="1-40000000" /> - <Feature name="bitrate-modes" value="VBR,CBR" /> - </MediaCodec> - </Encoders> -</MediaCodecs> diff --git a/products/mbox/sm1/files/media_codecs_ext.xml b/products/mbox/sm1/files/media_codecs_ext.xml deleted file mode 100644 index d5d1269..0000000 --- a/products/mbox/sm1/files/media_codecs_ext.xml +++ b/dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright (C) 2012 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. ---> - -<!-- -<!DOCTYPE MediaCodecs [ -<!ELEMENT MediaCodecs (Decoders,Encoders)> -<!ELEMENT Decoders (MediaCodec*)> -<!ELEMENT Encoders (MediaCodec*)> -<!ELEMENT MediaCodec (Type*,Quirk*)> -<!ATTLIST MediaCodec name CDATA #REQUIRED> -<!ATTLIST MediaCodec type CDATA> -<!ELEMENT Type EMPTY> -<!ATTLIST Type name CDATA #REQUIRED> -<!ELEMENT Quirk EMPTY> -<!ATTLIST Quirk name CDATA #REQUIRED> -]> - -There's a simple and a complex syntax to declare the availability of a -media codec: - -A codec that properly follows the OpenMax spec and therefore doesn't have any -quirks and that only supports a single content type can be declared like so: - - <MediaCodec name="OMX.foo.bar" type="something/interesting" /> - -If a codec has quirks OR supports multiple content types, the following syntax -can be used: - - <MediaCodec name="OMX.foo.bar" > - <Type name="something/interesting" /> - <Type name="something/else" /> - ... - <Quirk name="requires-allocate-on-input-ports" /> - <Quirk name="requires-allocate-on-output-ports" /> - <Quirk name="output-buffers-are-unreadable" /> - </MediaCodec> - -Only the three quirks included above are recognized at this point: - -"requires-allocate-on-input-ports" - must be advertised if the component does not properly support specification - of input buffers using the OMX_UseBuffer(...) API but instead requires - OMX_AllocateBuffer to be used. - -"requires-allocate-on-output-ports" - must be advertised if the component does not properly support specification - of output buffers using the OMX_UseBuffer(...) API but instead requires - OMX_AllocateBuffer to be used. - -"output-buffers-are-unreadable" - must be advertised if the emitted output buffers of a decoder component - are not readable, i.e. use a custom format even though abusing one of - the official OMX colorspace constants. - Clients of such decoders will not be able to access the decoded data, - naturally making the component much less useful. The only use for - a component with this quirk is to render the output to the screen. - Audio decoders MUST NOT advertise this quirk. - Video decoders that advertise this quirk must be accompanied by a - corresponding color space converter for thumbnail extraction, - matching surfaceflinger support that can render the custom format to - a texture and possibly other code, so just DON'T USE THIS QUIRK. - ---> - -<MediaCodecs> - <Decoders> - <MediaCodec name="OMX.amlogic.vc1.decoder.awesome" type="video/vc1" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.wvc1.decoder.awesome" type="video/wvc1" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.wmv3.decoder.awesome" type="video/wmv3" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.mswmv3.decoder.awesome" type="video/x-ms-wmv" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.mjpeg.decoder.awesome" type="video/mjpeg" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avs.decoder.awesome" type="video/avs" > - <Limit name="size" min="64x64" max="1920x1088" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - <Limit name="concurrent-instances" max="1" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avs2.decoder.awesome" type="video/avs2" > - <Limit name="size" min="64x64" max="3840x2160" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-300000000" /> - <Feature name="adaptive-playback" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp6a.decoder.sw" type="video/x-vnd.on2.vp6a" /> - <MediaCodec name="OMX.amlogic.vp6f.decoder.sw" type="video/x-vnd.on2.vp6f" /> - <MediaCodec name="OMX.amlogic.rm10.decoder.sw" type="video/rm10" /> - <MediaCodec name="OMX.amlogic.rm20.decoder.sw" type="video/rm20" /> - <MediaCodec name="OMX.amlogic.rm30.decoder.sw" type="video/rm30" /> - <MediaCodec name="OMX.amlogic.rm40.decoder.sw" type="video/rm40" /> - <MediaCodec name="OMX.amlogic.wmv2.decoder.sw" type="video/wmv2" /> - <MediaCodec name="OMX.amlogic.wmv1.decoder.sw" type="video/wmv1" /> - <!-- - <MediaCodec name="OMX.amlogic.vp8.decoder.sw" type="video/x-vnd.on2.vp8"> - <Limit name="size" min="2x2" max="2048x2048" /> - <Limit name="alignment" value="2x2" /> - <Limit name="block-size" value="16x16" /> - <Limit name="block-count" range="1-8160" /> - <Limit name="blocks-per-second" range="1-500000" /> - <Limit name="bitrate" range="1-40000000" /> - <Feature name="adaptive-playback" /> - </MediaCodec> - --> - <MediaCodec name="OMX.amlogic.audio.decoder.ffmpeg" type="audio/ffmpeg" /> - </Decoders> - -</MediaCodecs> diff --git a/products/mbox/sm1/files/media_codecs_performance.xml b/products/mbox/sm1/files/media_codecs_performance.xml deleted file mode 100644 index 3c9142f..0000000 --- a/products/mbox/sm1/files/media_codecs_performance.xml +++ b/dev/null @@ -1,224 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 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. ---> - -<MediaCodecs> - <Encoders> - <MediaCodec name="OMX.amlogic.video.encoder.avc" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="500-500" /> - <Limit name="measured-frame-rate-720x480" range="188-188" /> - <Limit name="measured-frame-rate-1280x720" range="66-66" /> - <Limit name="performance-point-1280x720" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.video.encoder.hevc" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-320x240" range="500-500" /> - <Limit name="measured-frame-rate-720x480" range="188-188" /> - <Limit name="measured-frame-rate-1280x720" range="66-66" /> - <Limit name="performance-point-1280x720" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true"> - <Limit name="measured-frame-rate-176x144" range="267-267" /> - </MediaCodec> - <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true"> - <Limit name="measured-frame-rate-176x144" range="223-223" /> - </MediaCodec> - <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="120-120" /> - <Limit name="measured-frame-rate-640x360" range="37-37" /> - </MediaCodec> - <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true"> - <Limit name="measured-frame-rate-176x144" range="450-450" /> - </MediaCodec> - <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true"> - <Limit name="measured-frame-rate-176x144" range="450-450" /> - </MediaCodec> - <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="255-255" /> - <Limit name="measured-frame-rate-720x480" range="98-98" /> - <Limit name="measured-frame-rate-1280x720" range="60-60" /> - <Limit name="measured-frame-rate-1920x1080" range="30-30" /> - </MediaCodec> - <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="76-76" /> - <Limit name="measured-frame-rate-640x360" range="38-38" /> - <Limit name="measured-frame-rate-1280x720" range="16-16" /> - <Limit name="measured-frame-rate-1920x1080" range="6-6" /> - </MediaCodec> - </Encoders> - <Decoders> - <MediaCodec name="OMX.amlogic.h263.decoder.awesome" type="video/3gpp" update="true"> - <Limit name="measured-frame-rate-176x144" range="197-197" /> - <Limit name="measured-frame-rate-352x288" range="195-195" /> - <Limit name="performance-point-352x288" range="200-200" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avc.decoder.awesome2" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="399-399" /> - <Limit name="measured-frame-rate-720x480" range="580-580" /> - <Limit name="measured-frame-rate-1280x720" range="290-290" /> - <Limit name="measured-frame-rate-1920x1080" range="135-135" /> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avc.decoder.awesome2.secure" type="video/avc" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp6a.decoder.sw" type="video/x-vnd.on2.vp6a" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp6f.decoder.sw" type="video/x-vnd.on2.vp6f" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avs.decoder.awesome" type="video/avs" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.avs2.decoder.awesome" type="video/avs2" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.rm10.decoder.sw" type="video/rm10" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.rm20.decoder.sw" type="video/rm20" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.rm30.decoder.sw" type="video/rm30" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.rm40.decoder.sw" type="video/rm40" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vc1.decoder.awesome" type="video/vc1" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.wmv1.decoder.sw" type="video/wmv1" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.wmv2.decoder.sw" type="video/wmv2" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.wmv3.decoder.awesome" type="video/wmv3" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.mswmv3.decoder.awesome" type="video/x-ms-wmv" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.wvc1.decoder.awesome" type="video/wvc1" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp9.decoder.awesome2" type="video/x-vnd.on2.vp9" update="true"> - <Limit name="measured-frame-rate-320x180" range="1194-1194" /> - <Limit name="measured-frame-rate-640x360" range="816-816" /> - <Limit name="measured-frame-rate-1280x720" range="290-290" /> - <Limit name="measured-frame-rate-1920x1080" range="133-133" /> - <Limit name="measured-frame-rate-3840x2160" range="62-62" /> - <Limit name="performance-point-3840x2160" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp9.decoder.awesome2.secure" type="video/x-vnd.on2.vp9" update="true"> - <Limit name="performance-point-3840x2160" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.hevc.decoder.awesome2" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-352x288" range="1304-1304" /> - <Limit name="measured-frame-rate-640x360" range="500-500" /> - <Limit name="measured-frame-rate-720x480" range="516-516" /> - <Limit name="measured-frame-rate-1280x720" range="294-294" /> - <Limit name="measured-frame-rate-1920x1080" range="132-132" /> - <Limit name="measured-frame-rate-3840x2160" range="72-72" /> - <Limit name="performance-point-3840x2160" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.hevc.decoder.awesome2.secure" type="video/hevc" update="true"> - <Limit name="performance-point-3840x2160" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.dolby-vision.decoder.awesome" type="video/dolby-vision" update="true"> - <Limit name="performance-point-3840x2160" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.dolby-vision.decoder.awesome.secure" type="video/dolby-vision" update="true"> - <Limit name="performance-point-3840x2160" range="60-60" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.mpeg4.decoder.awesome" type="video/mp4v-es" update="true"> - <Limit name="measured-frame-rate-176x144" range="1040-1040" /> - <Limit name="measured-frame-rate-480x360" range="700-700" /> - <Limit name="performance-point-480x360" range="700-700" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.mpeg2.decoder.awesome" type="video/mpeg2" update="true"> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true"> - <Limit name="measured-frame-rate-176x144" range="451-451" /> - <Limit name="measured-frame-rate-352x288" range="795-795" /> - </MediaCodec> - <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="318-318" /> - <Limit name="measured-frame-rate-720x480" range="115-115" /> - <Limit name="measured-frame-rate-1280x720" range="43-43" /> - <Limit name="measured-frame-rate-1920x1080" range="18-18" /> - </MediaCodec> - <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-352x288" range="604-604" /> - <Limit name="measured-frame-rate-640x360" range="151-151" /> - <Limit name="measured-frame-rate-720x480" range="137-137" /> - <Limit name="measured-frame-rate-1280x720" range="62-62" /> - <Limit name="measured-frame-rate-1920x1080" range="35-35" /> - </MediaCodec> - <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true"> - <Limit name="measured-frame-rate-176x144" range="594-594" /> - </MediaCodec> - <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="676-676" /> - <Limit name="measured-frame-rate-640x360" range="130-130" /> - <Limit name="measured-frame-rate-1280x720" range="26-26" /> - <Limit name="measured-frame-rate-1920x1080" range="11-11" /> - </MediaCodec> - <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true"> - <Limit name="measured-frame-rate-320x180" range="265-265" /> - <Limit name="measured-frame-rate-640x360" range="115-115" /> - <Limit name="measured-frame-rate-1280x720" range="49-49" /> - </MediaCodec> - <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true"> - <Limit name="measured-frame-rate-176x144" range="333-333" /> - </MediaCodec> - <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true"> - <Limit name="measured-frame-rate-176x144" range="368-368" /> - </MediaCodec> - <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true"> - <Limit name="measured-frame-rate-320x240" range="177-177" /> - <Limit name="measured-frame-rate-720x480" range="85-85" /> - <Limit name="measured-frame-rate-1280x720" range="33-33" /> - <Limit name="measured-frame-rate-1920x1080" range="15-15" /> - </MediaCodec> - <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="266-266" /> - <Limit name="measured-frame-rate-640x360" range="97-97" /> - <Limit name="measured-frame-rate-1920x1080" range="9-9" /> - </MediaCodec> - <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true"> - <Limit name="measured-frame-rate-320x180" range="209-209" /> - <Limit name="measured-frame-rate-640x360" range="106-106" /> - <Limit name="measured-frame-rate-1280x720" range="62-62" /> - <Limit name="measured-frame-rate-1920x1080" range="38-38" /> - </MediaCodec> - <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true"> - <Limit name="measured-frame-rate-352x288" range="165-165" /> - <Limit name="measured-frame-rate-640x360" range="96-96" /> - <Limit name="measured-frame-rate-720x480" range="87-87" /> - <Limit name="measured-frame-rate-1280x720" range="48-48" /> - <Limit name="measured-frame-rate-1920x1080" range="30-30" /> - </MediaCodec> - <MediaCodec name="OMX.amlogic.vp8.decoder.sw" type="video/x-vnd.on2.vp8" update="true"> - <Limit name="measured-frame-rate-320x180" range="676-676" /> - <Limit name="measured-frame-rate-640x360" range="130-130" /> - <Limit name="measured-frame-rate-1280x720" range="93-93" /> - <Limit name="measured-frame-rate-1920x1080" range="42-42" /> - <Limit name="performance-point-1920x1080" range="120-120" /> - </MediaCodec> - </Decoders> -</MediaCodecs> diff --git a/products/mbox/sm1/files/tv/tvconfig/dtvkit/config.xml b/products/mbox/sm1/files/tv/tvconfig/dtvkit/config.xml deleted file mode 100644 index b77ca2f..0000000 --- a/products/mbox/sm1/files/tv/tvconfig/dtvkit/config.xml +++ b/dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<dtvkit> - <tuner ts_input="0" dvbt2="yes" dvbs2="yes" dvbc="yes"/> - <demux live="yes" pip="yes" rec="yes" playback="yes" si="yes"/> - <demux live="yes" pip="yes" rec="yes" playback="yes" si="yes"/> - <demux live="yes" pip="yes" rec="yes" playback="yes" si="yes"/> - <recorder/> - <recorder/> - <recorder/> - <vdec/> - <adec/> - <adec/> - <av demux="0"/> - <ci_source is_set_tsout="0" tsout_source="0" is_set_tssource="0" camPlug_tssource="3" camUnPlug_tssource="0" is_changeTo_utf8="0" encodec_source="gb2312"/> - <pvr encrypt="0x0" /> - <country code="deu" /> -</dtvkit> diff --git a/products/mbox/sm1/files/tv/tvconfig/tvconfig.conf b/products/mbox/sm1/files/tv/tvconfig/tvconfig.conf deleted file mode 100644 index 19e2baf..0000000 --- a/products/mbox/sm1/files/tv/tvconfig/tvconfig.conf +++ b/dev/null @@ -1,44 +0,0 @@ -[TV] -#default source input ids 16:ADTV, 19:DTVKit -tv.source.input.ids.default=19 -#tv support country -tv.support.country.name=US,IN,ID,MX,DE,CN -#ssm configure -platform.havefbc=false -ssm.handle.hdcpkey.en = 1 -#ssm.handle.hdcpkey.demo.en = 1 -ssm.macaddr.startwork.en = 1 -ssm.handle.hdmi.edid.en=1 -ssm.hdmi_av.hotplug.detect.en = 1 - -#tvin config -#tvin.autoset.displayfreq = enable -tvin.aud.insource.atv = TV_AUDIO_IN_SOURCE_TYPE_ATV -tvin.db.reg.en = enable -tvin.atv.display.snow = enable -tvin.bluescreen.color = black - -#dtv config -dtv.scan.sort.mode=lcn - -#FBC -fbc.get.panelinfo=uart - -#frontend ts source -frontend.ts.source=0 - -[SETTING] - -[ATV] -atv.get.min.max.freq = 44250000,868250000 -#atv scan mode 0: freq table list mode, 1: all band mode -atv.auto.scan.mode=0 - -[SourceInputMap] -ro.tv.tvinchannel.atv=TVIN_PORT_CVBS3 -ro.tv.tvinchannel.av1=TVIN_PORT_CVBS1 -ro.tv.tvinchannel.av2=TVIN_PORT_CVBS2 -ro.tv.tvinchannel.hdmi1=TVIN_PORT_HDMI0 -ro.tv.tvinchannel.hdmi2=TVIN_PORT_HDMI2 -ro.tv.tvinchannel.hdmi3=TVIN_PORT_HDMI1 -ro.tv.tvinchannel.hdmi4=TVIN_PORT_HDMI3 diff --git a/products/mbox/sm1/sm1.mk b/products/mbox/sm1/sm1.mk index 0385f09..c28e89f 100644 --- a/products/mbox/sm1/sm1.mk +++ b/products/mbox/sm1/sm1.mk @@ -17,26 +17,7 @@ # build for Meson reference board. # -######################################################################## -# -# TV -# -######################################################################## -TARGET_BUILD_LIVETV := true -ifeq ($(TARGET_BUILD_LIVETV),true) -PRODUCT_PACKAGES += \ - droidlogic.tv.software.core.xml - -#dvbstack -BOARD_HAS_ADTV := true -#tuner -TUNER_MODULE := cxd2856 -include device/amlogic/common/tuner/tuner.mk - -#dtvkit -PRODUCT_SUPPORT_DTVKIT := true -endif ######################################################################## # diff --git a/products/mbox/sm1/vendor_prop.mk b/products/mbox/sm1/vendor_prop.mk index 69329fe..74c3e95 100644 --- a/products/mbox/sm1/vendor_prop.mk +++ b/products/mbox/sm1/vendor_prop.mk @@ -165,8 +165,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ tv.dtv.tf.disable=true -#omx2 -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.media.support.omx2=true \ - vendor.media.omx2.in_buffer=5 \ - vendor.ionvideo.enable=1 + |