diff options
| author | Powei Feng <powei@google.com> | 2021-05-05 19:29:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-05 19:29:06 +0000 |
| commit | f8d58215dcfcc5ee1969512a29a4167f66c38de4 (patch) | |
| tree | 25efc59e34a81dfdc48ef3dd6cf202b130b48745 | |
| parent | d01665b501ed84980188bcfa18acbc3f848be847 (diff) | |
| parent | c335ef6c9a784c41ec977d27526f9ddfbea14e43 (diff) | |
| download | yukawa-f8d58215dcfcc5ee1969512a29a4167f66c38de4.tar.gz | |
Add configuration to enable USB camera am: 49195a97c7 am: c335ef6c9a
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/1696574
Change-Id: Iecfdf3ae79109092c90ffee816c9ee1de53fde24
| -rw-r--r-- | device-common.mk | 6 | ||||
| -rw-r--r-- | hal/camera/external_camera_config.xml | 17 | ||||
| -rwxr-xr-x | manifest.xml | 10 | ||||
| -rw-r--r-- | ueventd.rc | 4 |
4 files changed, 37 insertions, 0 deletions
diff --git a/device-common.mk b/device-common.mk index e4bf0ae..45ad9e6 100644 --- a/device-common.mk +++ b/device-common.mk @@ -362,5 +362,11 @@ PRODUCT_PACKAGES += \ android.hardware.light-service \ lights-yukawa +# Enable USB Camera +PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-impl +PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service +PRODUCT_COPY_FILES += \ + device/amlogic/yukawa/hal/camera/external_camera_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/external_camera_config.xml + # Include Virtualization APEX $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) diff --git a/hal/camera/external_camera_config.xml b/hal/camera/external_camera_config.xml new file mode 100644 index 0000000..d6c14c5 --- /dev/null +++ b/hal/camera/external_camera_config.xml @@ -0,0 +1,17 @@ +<ExternalCamera> + <Provider> + <ignore> <!-- Internal video devices to be ignored by external camera HAL --> + <id>0</id> + </ignore> + </Provider> + <Device> + <MaxJpegBufferSize bytes="3145728"/> + <NumVideoBuffers count="4"/> + <NumStillBuffers count="2"/> + <FpsList> + <Limit width="640" height="480" fpsBound="30.0"/> + <Limit width="1280" height="720" fpsBound="30.0"/> + <Limit width="1920" height="1080" fpsBound="30.0"/> + </FpsList> + </Device> +</ExternalCamera> diff --git a/manifest.xml b/manifest.xml index 6a7c191..b4f22f8 100755 --- a/manifest.xml +++ b/manifest.xml @@ -173,4 +173,14 @@ <instance>default</instance> </interface> </hal> + <hal format="hidl"> + <name>android.hardware.camera.provider</name> + <transport>hwbinder</transport> + <impl level="generic"></impl> + <version>2.4</version> + <interface> + <name>ICameraProvider</name> + <instance>external/0</instance> + </interface> + </hal> </manifest> @@ -11,5 +11,9 @@ subsystem usbmisc /dev/nanohub 0660 system system /dev/nanohub_comms 0660 system system +/dev/video1 0660 system camera +/dev/video2 0660 system camera +/dev/video3 0660 system camera + /sys/class/leds/sei610\:red\:power brightness 0666 system system /sys/class/leds/sei610\:blue\:bt brightness 0666 system system |