Skip to content

Commit 66ab8b4

Browse files
Support camera callback parameter added in r30 (#1163)
Without this change, build fails with NDK r30 due to missing field in initialization of the `ACameraDevice_stateCallbacks` object.
1 parent 65e4ae2 commit 66ab8b4

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

camera/basic/src/main/cpp/camera_listeners.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,22 @@ void OnDeviceStateChanges(void* ctx, ACameraDevice* dev) {
6868
void OnDeviceErrorChanges(void* ctx, ACameraDevice* dev, int err) {
6969
reinterpret_cast<NDKCamera*>(ctx)->OnDeviceError(dev, err);
7070
}
71+
72+
#if __NDK_MAJOR__ >= 30
73+
void OnClientSharedAccessPriorityChanged(void*,
74+
ACameraDevice*, bool) {
75+
// TODO: Implement this.
76+
}
77+
#endif
78+
7179
ACameraDevice_stateCallbacks* NDKCamera::GetDeviceListener() {
7280
static ACameraDevice_stateCallbacks cameraDeviceListener = {
7381
.context = this,
7482
.onDisconnected = ::OnDeviceStateChanges,
7583
.onError = ::OnDeviceErrorChanges,
84+
#if __NDK_MAJOR__ >= 30
85+
.onClientSharedAccessPriorityChanged = ::OnClientSharedAccessPriorityChanged
86+
#endif
7687
};
7788
return &cameraDeviceListener;
7889
}

camera/texture-view/src/main/cpp/camera_listeners.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,22 @@ void OnDeviceStateChanges(void* ctx, ACameraDevice* dev) {
6868
void OnDeviceErrorChanges(void* ctx, ACameraDevice* dev, int err) {
6969
reinterpret_cast<NDKCamera*>(ctx)->OnDeviceError(dev, err);
7070
}
71+
72+
#if __NDK_MAJOR__ >= 30
73+
void OnClientSharedAccessPriorityChanged(void*,
74+
ACameraDevice*, bool) {
75+
// TODO: Implement this.
76+
}
77+
#endif
78+
7179
ACameraDevice_stateCallbacks* NDKCamera::GetDeviceListener() {
7280
static ACameraDevice_stateCallbacks cameraDeviceListener = {
7381
.context = this,
7482
.onDisconnected = ::OnDeviceStateChanges,
7583
.onError = ::OnDeviceErrorChanges,
84+
#if __NDK_MAJOR__ >= 30
85+
.onClientSharedAccessPriorityChanged = ::OnClientSharedAccessPriorityChanged
86+
#endif
7687
};
7788
return &cameraDeviceListener;
7889
}

0 commit comments

Comments
 (0)