diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-07-28 18:32:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 18:32:11 +0000 |
| commit | 9e4c8a4e3016ec0bb95708e341abebc677ea7f79 (patch) | |
| tree | 04177a5466b0083d151e0276ff37d1ad3da6404b /camera/EmulatedCameraFactory.h | |
| parent | 150fe17c1c48e14dcce91e26e2ff68c348b9aa36 (diff) | |
| parent | 79f8dcdb2da221f2e6992f53a83c36b95332fc2e (diff) | |
| download | android_device_generic_goldfish-9e4c8a4e3016ec0bb95708e341abebc677ea7f79.tar.gz android_device_generic_goldfish-9e4c8a4e3016ec0bb95708e341abebc677ea7f79.tar.bz2 android_device_generic_goldfish-9e4c8a4e3016ec0bb95708e341abebc677ea7f79.zip | |
Merge "Camera: Update emulator camera v3 HAL to v3.3, module to v2.3" into mnc-dev
Diffstat (limited to 'camera/EmulatedCameraFactory.h')
| -rwxr-xr-x | camera/EmulatedCameraFactory.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/camera/EmulatedCameraFactory.h b/camera/EmulatedCameraFactory.h index 470f5ea..3f19be1 100755 --- a/camera/EmulatedCameraFactory.h +++ b/camera/EmulatedCameraFactory.h @@ -80,6 +80,11 @@ public: */ int setCallbacks(const camera_module_callbacks_t *callbacks); + /* Fill in vendor tags for the module + * This method is called in response to camera_module_t::get_vendor_tag_ops callback. + */ + void getVendorTagOps(vendor_tag_ops_t* ops); + /**************************************************************************** * Camera HAL API callbacks. ***************************************************************************/ @@ -94,6 +99,13 @@ public: /* camera_module_t::set_callbacks callback entry point. */ static int set_callbacks(const camera_module_callbacks_t *callbacks); + /* camera_module_t::get_vendor_tag_ops callback entry point */ + static void get_vendor_tag_ops(vendor_tag_ops_t* ops); + + /* camera_module_t::open_legacy callback entry point */ + static int open_legacy(const struct hw_module_t* module, const char* id, + uint32_t halVersion, struct hw_device_t** device); + private: /* hw_module_methods_t::open callback entry point. */ static int device_open(const hw_module_t* module, |