diff --git a/groups/aaf/cfc/init.rc b/groups/aaf/cfc/init.rc index dbbffb4e2..187602c2e 100644 --- a/groups/aaf/cfc/init.rc +++ b/groups/aaf/cfc/init.rc @@ -3,7 +3,7 @@ on fs mount 9p aaf /mnt/share exec - system system -- /vendor/bin/logwrapper /vendor/bin/sh /vendor/bin/auto_detection.sh setprop ro.hardware.hwcomposer remote - setprop sys.display.size 540x960 + setprop sys.display.size 600x960 setprop ro.hardware.gralloc ${vendor.gralloc.set} setprop ro.power.fixed_performance_scale_factor ${vendor.power.fixed_performance_scale_factor} setprop ro.media.xml_variant.codecs ${ro.vendor.media.target_variant} diff --git a/groups/audio/project-celadon/default/mixer_paths_0.xml b/groups/audio/project-celadon/default/mixer_paths_0.xml index 0be20d7fa..03981de96 100644 --- a/groups/audio/project-celadon/default/mixer_paths_0.xml +++ b/groups/audio/project-celadon/default/mixer_paths_0.xml @@ -18,7 +18,7 @@ - + diff --git a/groups/bluetooth/btusb/product.mk b/groups/bluetooth/btusb/product.mk index 69b51b23d..12da959c0 100644 --- a/groups/bluetooth/btusb/product.mk +++ b/groups/bluetooth/btusb/product.mk @@ -1,12 +1,3 @@ -PRODUCT_PACKAGES += \ - hciconfig - -# Bluetooth tools eng / userdebug -ifneq ($(TARGET_BUILD_VARIANT),user) -PRODUCT_PACKAGES += \ - btmon \ - hcitool -endif PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:vendor/etc/permissions/android.hardware.bluetooth.xml \ diff --git a/groups/boot-arch/project-celadon/BoardConfig.mk b/groups/boot-arch/project-celadon/BoardConfig.mk index c99051ed8..6658f24c2 100644 --- a/groups/boot-arch/project-celadon/BoardConfig.mk +++ b/groups/boot-arch/project-celadon/BoardConfig.mk @@ -19,7 +19,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" # # NOTE: These values must be kept in sync with BOARD_GPT_INI -BOARD_BOOTIMAGE_PARTITION_SIZE ?= 31457280 +BOARD_BOOTIMAGE_PARTITION_SIZE ?= 36700160 SYSTEM_PARTITION_SIZE = $(shell echo {{system_partition_size}}*1024*1024 | bc) {{^dynamic-partitions}} BOARD_SYSTEMIMAGE_PARTITION_SIZE ?= $(SYSTEM_PARTITION_SIZE) diff --git a/groups/boot-arch/project-celadon/gpt.ini b/groups/boot-arch/project-celadon/gpt.ini index ed95c4f14..3f76a4c81 100644 --- a/groups/boot-arch/project-celadon/gpt.ini +++ b/groups/boot-arch/project-celadon/gpt.ini @@ -54,7 +54,7 @@ type = fat [partition.boot] label = boot -len = 30 +len = 35 type = boot {{#slot-ab}} has_slot = true diff --git a/groups/camera-ext/ext-camera-only/product.mk b/groups/camera-ext/ext-camera-only/product.mk index 815464cfb..84cb4adc3 100644 --- a/groups/camera-ext/ext-camera-only/product.mk +++ b/groups/camera-ext/ext-camera-only/product.mk @@ -5,9 +5,22 @@ PRODUCT_COPY_FILES += \ # External camera service PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service \ + android.hardware.camera.provider@2.4-service_64 \ android.hardware.camera.provider@2.4-impl +#VHAL camera +PRODUCT_PACKAGES += camera.$(TARGET_BOARD_PLATFORM) \ + camera.$(TARGET_BOARD_PLATFORM).jpeg +PRODUCT_PROPERTY_OVERRIDES += ro.vendor.remote.sf.fake_camera ="both" \ + ro.vendor.camera.in_frame_format.h264=false \ + ro.vendor.camera.in_frame_format.i420=true \ + ro.vendor.camera.decode.vaapi=false \ + ro.vendor.remote.sf.back_camera_hal= \ + ro.vendor.remote.sf.front_camera_hal= \ + ro.vendor.camera.transference="VSOCK" \ + vendor.camera.external="VHAL" +#removing not required apps # Only include test apps in eng or userdebug builds. -PRODUCT_PACKAGES_DEBUG += TestingCamera +#PRODUCT_PACKAGES_DEBUG += TestingCamera -PRODUCT_PACKAGES += MultiCameraApp +#PRODUCT_PACKAGES += MultiCameraApp diff --git a/groups/codecs/configurable/auto_hal.in b/groups/codecs/configurable/auto_hal.in index eab9dfbf1..82ccfc3a6 100644 --- a/groups/codecs/configurable/auto_hal.in +++ b/groups/codecs/configurable/auto_hal.in @@ -6,6 +6,9 @@ value_model=`grep -i model /proc/cpuinfo | cut -d ':' -f2 | head -n 1` if [ $value_model == 166 ]; then setprop ro.vendor.media.target_variant "_gen9" setprop ro.vendor.media.target_variant_platform "_cml" +elif [ $value_model == 150 ]; then + setprop ro.vendor.media.target_variant "_gen11" + setprop ro.vendor.media.target_variant_platform "_ehl" elif [ $value_model == 141 ]; then setprop ro.vendor.media.target_variant "_gen12" setprop ro.vendor.media.target_variant_platform "_tgl" diff --git a/groups/codecs/configurable/files.spec b/groups/codecs/configurable/files.spec index e462830ef..755d7cd83 100644 --- a/groups/codecs/configurable/files.spec +++ b/groups/codecs/configurable/files.spec @@ -1,10 +1,12 @@ [extrafiles] media_codecs_gen9.xml: "Specific configuration for audio and video codecs for gen9" +media_codecs_gen11.xml: "Specific configuration for audio and video codecs for gen11" media_codecs_gen12.xml: "Specific configuration for audio and video codecs for gen12" mfx_omxil_core.conf: "MSDK configuration for video codecs" media_profiles.xml: "Media profile file" media_profiles_1080p.xml: "Media profile file with 1080p support" media_codecs_performance_cml.xml: "Media codecs performance file for cml" +media_codecs_performance_ehl.xml: "Media codecs performance file for ehl" media_codecs_performance_tgl.xml: "Media codecs performance file for tgl" media_codecs_performance_{{platform}}_xen.xml: "Media codecs performance file for xen" media_codecs_vp9.xml: "vp9 support" diff --git a/groups/codecs/configurable/media_codecs_gen11.xml b/groups/codecs/configurable/media_codecs_gen11.xml new file mode 100644 index 000000000..4b1e0aaf3 --- /dev/null +++ b/groups/codecs/configurable/media_codecs_gen11.xml @@ -0,0 +1,242 @@ + + + + + + +{{#hw_vd_vc1}} + + + + + + + + + + +{{/hw_vd_vc1}} + +{{#sw_vd_h264}} + + + + + + + + + + +{{/sw_vd_h264}} + +{{#hw_vd_h264}} + + + + + + + + + + +{{/hw_vd_h264}} + +{{#hw_vd_h264_secure}} + + + + + + + + + + + +{{/hw_vd_h264_secure}} + +{{#hw_vd_vp8}} + + + + + + + + + +{{/hw_vd_vp8}} + +{{#hw_vd_vp9}} + + + + + + + + + +{{/hw_vd_vp9}} + +{{#hw_vd_h265}} + + + + + + + + + +{{/hw_vd_h265}} + +{{#hw_vd_h265_secure}} + + + + + + + + + + +{{/hw_vd_h265_secure}} + +{{#hw_vd_mp2}} + + + + + + + + + +{{/hw_vd_mp2}} + + + +{{#hw_ve_h264}} + + + + + + + + +{{/hw_ve_h264}} +{{#hw_ve_vp8}} + + + + + + + + +{{/hw_ve_vp8}} +{{#hw_ve_vp9}} + + + + + + + +{{/hw_ve_vp9}} +{{#hw_ve_h265}} + + + + + + + + +{{/hw_ve_h265}} + +{{#sw_omx_video}} + +{{/sw_omx_video}} + + + + + diff --git a/groups/codecs/configurable/media_codecs_gen12.xml b/groups/codecs/configurable/media_codecs_gen12.xml index 50685d347..4b1e0aaf3 100644 --- a/groups/codecs/configurable/media_codecs_gen12.xml +++ b/groups/codecs/configurable/media_codecs_gen12.xml @@ -223,7 +223,7 @@ Only the three quirks included above are recognized at this point: {{/hw_ve_vp9}} {{#hw_ve_h265}} - + diff --git a/groups/codecs/configurable/media_codecs_performance_ehl.xml b/groups/codecs/configurable/media_codecs_performance_ehl.xml new file mode 100644 index 000000000..31a188ef8 --- /dev/null +++ b/groups/codecs/configurable/media_codecs_performance_ehl.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/groups/codecs/configurable/media_profiles_1080p.xml b/groups/codecs/configurable/media_profiles_1080p.xml index f6363eab7..40be47f05 100644 --- a/groups/codecs/configurable/media_profiles_1080p.xml +++ b/groups/codecs/configurable/media_profiles_1080p.xml @@ -145,7 +145,7 @@