Merge "Revert "Switch back from DMABUF to ION/BLOB allocator"" into sc-dev

This commit is contained in:
Charlie Chen 2021-03-16 14:56:57 +00:00 committed by Android (Google) Code Review
commit 8b400f943c
3 changed files with 8 additions and 5 deletions

View file

@ -171,7 +171,7 @@ BOARD_USE_CSC_FILTER := false
BOARD_USE_DEC_SW_CSC := true BOARD_USE_DEC_SW_CSC := true
BOARD_USE_ENC_SW_CSC := true BOARD_USE_ENC_SW_CSC := true
BOARD_SUPPORT_MFC_ENC_RGB := true BOARD_SUPPORT_MFC_ENC_RGB := true
BOARD_USE_BLOB_ALLOCATOR := true BOARD_USE_BLOB_ALLOCATOR := false
######################## ########################
BOARD_SUPER_PARTITION_SIZE := 8531214336 BOARD_SUPER_PARTITION_SIZE := 8531214336

View file

@ -190,9 +190,9 @@
/dev/dma_heap/farawimg-secure 0444 system graphics /dev/dma_heap/farawimg-secure 0444 system graphics
/dev/dma_heap/tui 0444 system graphics /dev/dma_heap/tui 0444 system graphics
/dev/dma_heap/tui-uncached 0444 system graphics /dev/dma_heap/tui-uncached 0444 system graphics
/dev/dma_heap/vframe-secure 0444 system graphics /dev/dma_heap/vframe-secure 0444 system drmrpc
/dev/dma_heap/video_system 0444 system graphics /dev/dma_heap/video_system 0444 system drmrpc
/dev/dma_heap/video_system-uncached 0444 system graphics /dev/dma_heap/video_system-uncached 0444 system drmrpc
/dev/dma_heap/vscaler-secure 0444 system graphics /dev/dma_heap/vscaler-secure 0444 system graphics
/dev/dma_heap/vstream-secure 0444 system graphics /dev/dma_heap/vstream-secure 0444 system drmrpc
/dev/dma_heap/sensor_direct_heap 0444 system graphics /dev/dma_heap/sensor_direct_heap 0444 system graphics

View file

@ -700,6 +700,9 @@ PRODUCT_PACKAGES += \
libExynosC2Vp9Dec \ libExynosC2Vp9Dec \
libExynosC2Vp9Enc libExynosC2Vp9Enc
PRODUCT_PROPERTY_OVERRIDES += \
debug.c2.use_dmabufheaps=1
# 2. OpenMAX IL # 2. OpenMAX IL
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \