Update to upstream
This commit is contained in:
@@ -9,7 +9,7 @@ DEVICE_PATH := device/brcm/rpi4
|
|||||||
# Inherit device configuration
|
# Inherit device configuration
|
||||||
$(call inherit-product, device/brcm/rpi4/device.mk)
|
$(call inherit-product, device/brcm/rpi4/device.mk)
|
||||||
|
|
||||||
PRODUCT_AAPT_PREF_CONFIG := tvdpi
|
PRODUCT_AAPT_PREF_CONFIG := xhdpi
|
||||||
PRODUCT_CHARACTERISTICS := tv
|
PRODUCT_CHARACTERISTICS := tv
|
||||||
|
|
||||||
$(call inherit-product, device/google/atv/products/atv_base.mk)
|
$(call inherit-product, device/google/atv/products/atv_base.mk)
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ disable_overscan=1
|
|||||||
|
|
||||||
# Display panel
|
# Display panel
|
||||||
#dtoverlay=vc4-kms-dsi-7inch
|
#dtoverlay=vc4-kms-dsi-7inch
|
||||||
|
#dtoverlay=vc4-kms-dsi-ili9881-5inch
|
||||||
#dtoverlay=vc4-kms-dsi-ili9881-7inch
|
#dtoverlay=vc4-kms-dsi-ili9881-7inch
|
||||||
|
|
||||||
# Graphics acceleration
|
# Graphics acceleration
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ PRODUCT_COPY_FILES += \
|
|||||||
|
|
||||||
# FFmpeg
|
# FFmpeg
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.media.c2@1.2-service-ffmpeg
|
com.android.hardware.media.c2.ffmpeg
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(DEVICE_PATH)/media/media_codecs_ffmpeg_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_ffmpeg_c2.xml \
|
$(DEVICE_PATH)/media/media_codecs_ffmpeg_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_ffmpeg_c2.xml \
|
||||||
@@ -223,8 +223,8 @@ PRODUCT_COPY_FILES += \
|
|||||||
PRODUCT_SOONG_NAMESPACES += external/v4l2_codec2
|
PRODUCT_SOONG_NAMESPACES += external/v4l2_codec2
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.media.c2@1.2-service-v4l2 \
|
android.hardware.media.c2-default-seccomp_policy \
|
||||||
libc2plugin_store
|
com.android.hardware.media.c2.v4l2
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(DEVICE_PATH)/media/media_codecs_v4l2_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_v4l2_c2_video.xml \
|
$(DEVICE_PATH)/media/media_codecs_v4l2_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_v4l2_c2_video.xml \
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
<compatibility-matrix version="1.0" type="framework">
|
<compatibility-matrix version="1.0" type="framework">
|
||||||
<hal format="hidl" optional="true">
|
<hal format="aidl">
|
||||||
<name>android.hardware.media.c2</name>
|
<name>android.hardware.media.c2</name>
|
||||||
<transport>hwbinder</transport>
|
<version>1</version>
|
||||||
<version>1.2</version>
|
|
||||||
<interface>
|
<interface>
|
||||||
<name>IComponentStore</name>
|
<name>IComponentStore</name>
|
||||||
<instance>ffmpeg</instance>
|
<instance>ffmpeg</instance>
|
||||||
|
|||||||
@@ -8,9 +8,6 @@
|
|||||||
# DRM
|
# DRM
|
||||||
/data/vendor/mediadrm(/.*)? u:object_r:mediadrm_vendor_data_file:s0
|
/data/vendor/mediadrm(/.*)? u:object_r:mediadrm_vendor_data_file:s0
|
||||||
|
|
||||||
# FFmpeg
|
|
||||||
/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg u:object_r:mediacodec_exec:s0
|
|
||||||
|
|
||||||
# Graphics
|
# Graphics
|
||||||
/dev/dri(/.*)? u:object_r:gpu_device:s0
|
/dev/dri(/.*)? u:object_r:gpu_device:s0
|
||||||
/vendor/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm_gbm_mesa u:object_r:hal_graphics_allocator_default_exec:s0
|
/vendor/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm_gbm_mesa u:object_r:hal_graphics_allocator_default_exec:s0
|
||||||
@@ -30,6 +27,3 @@
|
|||||||
/dev/block/mmcblk0p2 u:object_r:system_block_device:s0
|
/dev/block/mmcblk0p2 u:object_r:system_block_device:s0
|
||||||
/dev/block/mmcblk0p3 u:object_r:system_block_device:s0
|
/dev/block/mmcblk0p3 u:object_r:system_block_device:s0
|
||||||
/dev/block/mmcblk0p4 u:object_r:userdata_block_device:s0
|
/dev/block/mmcblk0p4 u:object_r:userdata_block_device:s0
|
||||||
|
|
||||||
# V4L2
|
|
||||||
/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-v4l2(.*)? u:object_r:mediacodec_exec:s0
|
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ ro.lockscreen.disable.default=true
|
|||||||
|
|
||||||
# Media
|
# Media
|
||||||
debug.stagefright.c2inputsurface=-1
|
debug.stagefright.c2inputsurface=-1
|
||||||
|
media.c2.hal.selection=aidl
|
||||||
|
|
||||||
# MGLRU
|
# MGLRU
|
||||||
persist.device_config.mglru_native.lru_gen_config=core
|
persist.device_config.mglru_native.lru_gen_config=core
|
||||||
|
|||||||
Reference in New Issue
Block a user