Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5579a652 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 5544 into donut 

* changes:
  Pipe all the camera callbacks to Java to facilitate the addition of new features. This will make it easy to add things like zoom callbacks without modifying the entire camera stack. Bug 1837832.
parents 899543b0 c06b7cb6

include/ui/Camera.h

+3 −7
Original line number Original line Diff line number Diff line
@@ -63,16 +63,12 @@ namespace android { 
#define FRAME_CALLBACK_FLAG_CAMERA                   0x05

#define FRAME_CALLBACK_FLAG_CAMERA                   0x05

#define FRAME_CALLBACK_FLAG_BARCODE_SCANNER          0x07

#define FRAME_CALLBACK_FLAG_BARCODE_SCANNER          0x07





// msgType in notifyCallback function

// msgType in notifyCallback and dataCallback functions

enum {

enum {

    CAMERA_MSG_ERROR,

    CAMERA_MSG_ERROR = 0,

    CAMERA_MSG_SHUTTER,

    CAMERA_MSG_SHUTTER,

    CAMERA_MSG_FOCUS,

    CAMERA_MSG_FOCUS,

    CAMERA_MSG_ZOOM

    CAMERA_MSG_ZOOM,

};



// msgType in dataCallback function

enum {

    CAMERA_MSG_PREVIEW_FRAME,

    CAMERA_MSG_PREVIEW_FRAME,

    CAMERA_MSG_VIDEO_FRAME,

    CAMERA_MSG_VIDEO_FRAME,

    CAMERA_MSG_POSTVIEW_FRAME,

    CAMERA_MSG_POSTVIEW_FRAME,