remove v4l2_codec2

* Raspberry Pi 5 doesn't have H.264 hardware video decoder/encoder.
This commit is contained in:
Konsta
2023-10-28 20:34:23 +03:00
parent ad88537ca5
commit 32979cf0ba
7 changed files with 5 additions and 78 deletions

View File

@@ -253,16 +253,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
# V4L2
PRODUCT_SOONG_NAMESPACES += external/v4l2_codec2
PRODUCT_PACKAGES += \
android.hardware.media.c2@1.0-service-v4l2 \
libc2plugin_store
PRODUCT_COPY_FILES += \
$(DEVICE_PATH)/media/media_codecs_v4l2_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_v4l2_c2_video.xml
# Virtualization
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)

View File

@@ -2,11 +2,10 @@
<hal format="hidl" optional="true">
<name>android.hardware.media.c2</name>
<transport>hwbinder</transport>
<version>1.0-2</version>
<version>1.2</version>
<interface>
<name>IComponentStore</name>
<instance>ffmpeg</instance>
<instance>v4l2</instance>
</interface>
</hal>
</compatibility-matrix>

View File

@@ -18,7 +18,6 @@
<MediaCodecs>
<Include href="media_codecs_ffmpeg_c2.xml" />
<Include href="media_codecs_v4l2_c2_video.xml" />
<Include href="media_codecs_google_c2_audio.xml" />
<Include href="media_codecs_google_c2_tv.xml" />
<Include href="media_codecs_google_c2_video.xml" />

View File

@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2021 The Android Open Source Project
Copyright (C) 2021-2022 KonstaKANG
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>
<Encoders>
<MediaCodec name="c2.v4l2.avc.encoder" type="video/avc">
<Limit name="size" min="32x32" max="4096x4096" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" range="1-983040" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="concurrent-instances" max="8" />
<Limit name="performance-point-1280x720" range="30-30" />
</MediaCodec>
</Encoders>
<Decoders>
<MediaCodec name="c2.v4l2.avc.decoder" type="video/avc">
<Limit name="size" min="16x16" max="4096x4096" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="1879200" />
<Limit name="bitrate" range="1-62500000" />
<Limit name="concurrent-instances" max="8" />
<Limit name="performance-point-3840x2160" range="30-30" />
<Feature name="adaptive-playback" />
</MediaCodec>
</Decoders>
</Included>

View File

@@ -13,18 +13,12 @@
# DMA
/dev/dma_heap/linux,cma 0666 system graphics
# FFmpeg
/dev/media2 0660 media media
/dev/video19 0660 media media
# ION
/dev/ion 0664 system system
# USB
/sys/class/udc/fe980000.usb current_speed 0664 system system
# V4L2
/dev/media0 0660 media media
/dev/media1 0660 media media
/dev/video10 0660 media media
/dev/video11 0660 media media
/dev/video12 0660 media media
/dev/video18 0660 media media
/dev/video19 0660 media media
/dev/video31 0660 media media

View File

@@ -49,6 +49,3 @@
# USB
/vendor/bin/hw/android\.hardware\.usb\.gadget@1\.2-service\.rpi u:object_r:hal_usb_gadget_default_exec:s0
# V4L2
/vendor/bin/hw/android\.hardware\.media\.c2@1\.0-service-v4l2(.*)? u:object_r:mediacodec_exec:s0

View File

@@ -46,7 +46,6 @@ debug.drm.mode.force=1920x1080
# FFmpeg
persist.ffmpeg_codec2.rank.audio=16
persist.ffmpeg_codec2.rank.video=256
persist.ffmpeg_codec2.v4l2.h264=false
persist.ffmpeg_codec2.v4l2.h265=true
# Graphics
@@ -74,13 +73,6 @@ debug.stagefright.c2inputsurface=-1
# MGLRU
persist.device_config.mglru_native.lru_gen_config=core
# V4L2
debug.stagefright.c2-poolmask=0xf50000
persist.v4l2_codec2.rank.decoder=128
persist.v4l2_codec2.rank.encoder=128
ro.vendor.v4l2_codec2.decode_concurrent_instances=8
ro.vendor.v4l2_codec2.encode_concurrent_instances=8
# Wifi
wifi.interface=wlan0