Skip to content

Commit

Permalink
ARCore Android SDK v1.25.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bsanjin committed Jun 17, 2021
1 parent 2b18171 commit 16324af
Show file tree
Hide file tree
Showing 26 changed files with 84 additions and 89 deletions.
69 changes: 32 additions & 37 deletions libraries/include/arcore_c_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
/// @defgroup ArCoreApk ArCoreApk
/// Functions for installing and updating "Google Play Services for AR" (ARCore)
/// and determining whether the current device is an
/// <a href="https://developers.google.com/ar/discover/supported-devices">ARCore
/// <a href="https://developers.google.com/ar/devices">ARCore
/// supported device</a>.

/// @defgroup ArDepthPoint ArDepthPoint
Expand Down Expand Up @@ -1100,7 +1100,7 @@ AR_DEFINE_ENUM(ArDepthMode){
///
/// Provides depth estimation for every pixel in the image, and works best for
/// static scenes. For a list of supported devices, see:
/// https://developers.google.com/ar/discover/supported-devices
/// https://developers.google.com/ar/devices
/// Adds significant computational load.
///
/// With this mode enabled, @c ::ArFrame_hitTest also returns
Expand All @@ -1109,7 +1109,7 @@ AR_DEFINE_ENUM(ArDepthMode){
AR_DEPTH_MODE_AUTOMATIC = 1,
/// @ingroup ArFrame
/// On <a
/// href="https://developers.google.com/ar/discover/supported-devices">ARCore
/// href="https://developers.google.com/ar/devices">ARCore
/// supported devices</a> that also support the Depth API, provides a "raw",
/// mostly unfiltered, depth image
/// (@c ::ArFrame_acquireRawDepthImage) and depth confidence image
Expand Down Expand Up @@ -1432,25 +1432,21 @@ ArStatus ArCoreApk_requestInstallCustom(void *env,
/// the address of the newly allocated session.
/// @return @c #AR_SUCCESS or any of:
/// - @c #AR_ERROR_FATAL if an internal error occurred while creating the
/// session.
/// `adb logcat` may contain useful information.
/// session. `adb logcat` may contain useful information.
/// - @c #AR_ERROR_CAMERA_PERMISSION_NOT_GRANTED if your app does not have the
/// [CAMERA](https://developer.android.com/reference/android/Manifest.permission.html#CAMERA)
/// permission.
/// - @c #AR_UNAVAILABLE_ARCORE_NOT_INSTALLED if the ARCore APK is not present.
/// This can be prevented by the installation check described above.
/// - @c #AR_UNAVAILABLE_DEVICE_NOT_COMPATIBLE if the device is not compatible
/// with
/// ARCore. If encountered after completing the installation check, this
/// with ARCore. If encountered after completing the installation check, this
/// usually indicates a user has side-loaded ARCore onto an incompatible
/// device.
/// - @c #AR_UNAVAILABLE_APK_TOO_OLD if the installed ARCore APK is too old for
/// the
/// ARCore SDK with which this application was built. This can be prevented by
/// the installation check described above.
/// the ARCore SDK with which this application was built. This can be
/// prevented by the installation check described above.
/// - @c #AR_UNAVAILABLE_SDK_TOO_OLD if the ARCore SDK that this app was built
/// with
/// is too old and no longer supported by the installed ARCore APK.
/// with is too old and no longer supported by the installed ARCore APK.
ArStatus ArSession_create(void *env,
void *context,
ArSession **out_session_pointer);
Expand Down Expand Up @@ -1478,8 +1474,7 @@ ArStatus ArSession_create(void *env,
/// the address of the newly allocated session.
/// @return @c #AR_SUCCESS or any of:
/// - @c #AR_ERROR_FATAL if an internal error occurred while creating the
/// session.
/// `adb logcat` may contain useful information.
/// session. `adb logcat` may contain useful information.
/// - @c #AR_ERROR_CAMERA_PERMISSION_NOT_GRANTED if your app does not have the
/// [CAMERA](https://developer.android.com/reference/android/Manifest.permission.html#CAMERA)
/// permission.
Expand All @@ -1488,17 +1483,14 @@ ArStatus ArSession_create(void *env,
/// - @c #AR_UNAVAILABLE_ARCORE_NOT_INSTALLED if the ARCore APK is not present.
/// This can be prevented by the installation check described above.
/// - @c #AR_UNAVAILABLE_DEVICE_NOT_COMPATIBLE if the device is not compatible
/// with
/// ARCore. If encountered after completing the installation check, this
/// with ARCore. If encountered after completing the installation check, this
/// usually indicates a user has side-loaded ARCore onto an incompatible
/// device.
/// - @c #AR_UNAVAILABLE_APK_TOO_OLD if the installed ARCore APK is too old for
/// the
/// ARCore SDK with which this application was built. This can be prevented by
/// the installation check described above.
/// the ARCore SDK with which this application was built. This can be
/// prevented by the installation check described above.
/// - @c #AR_UNAVAILABLE_SDK_TOO_OLD if the ARCore SDK that this app was built
/// with
/// is too old and no longer supported by the installed ARCore APK.
/// with is too old and no longer supported by the installed ARCore APK.
ArStatus ArSession_createWithFeatures(void *env,
void *context,
const ArSessionFeature *features,
Expand Down Expand Up @@ -1617,7 +1609,7 @@ void ArConfig_setAugmentedFaceMode(const ArSession *session,
/// devices, the default desired focus mode is currently @c
/// #AR_FOCUS_MODE_FIXED, although this default might change in the future. See
/// the <a
/// href="https://developers.google.com/ar/discover/supported-devices">ARCore
/// href="https://developers.google.com/ar/devices">ARCore
/// supported devices</a> page for a list of devices on which ARCore does not
/// support changing the desired focus mode.
///
Expand All @@ -1643,7 +1635,7 @@ void ArConfig_setFocusMode(const ArSession *session,
/// Stores the currently configured desired focus mode into @p *focus_mode.
/// Note: The desired focus mode may be different from the actual focus
/// mode. See the
/// <a href="https://developers.google.com/ar/discover/supported-devices">ARCore
/// <a href="https://developers.google.com/ar/devices">ARCore
/// supported devices page</a> for a list of affected devices.
void ArConfig_getFocusMode(const ArSession *session,
ArConfig *config,
Expand Down Expand Up @@ -1799,7 +1791,7 @@ AR_DEFINE_ENUM(ArCameraConfigTargetFps){
/// Increases power consumption and may increase app memory usage.
///
/// See the ARCore supported devices
/// (https://developers.google.com/ar/discover/supported-devices)
/// (https://developers.google.com/ar/devices)
/// page for a list of devices that currently support 60fps.
///
/// Used as a camera filter, via @c ::ArCameraConfigFilter_setTargetFps.
Expand All @@ -1815,7 +1807,7 @@ AR_DEFINE_ENUM(ArCameraConfigDepthSensorUsage){
/// that will be used by ARCore.
///
/// See the ARCore supported devices
/// (https://developers.google.com/ar/discover/supported-devices)
/// (https://developers.google.com/ar/devices)
/// page for a list of devices that currently have supported depth sensors.
///
/// When returned by @c ::ArCameraConfig_getDepthSensorUsage, indicates
Expand Down Expand Up @@ -1851,7 +1843,7 @@ AR_DEFINE_ENUM(ArCameraConfigStereoCameraUsage){
/// devices.
///
/// See the ARCore supported devices
/// (https://developers.google.com/ar/discover/supported-devices)
/// (https://developers.google.com/ar/devices)
/// page for a list of devices that currently have supported stereo camera
/// capability.
///
Expand Down Expand Up @@ -2208,7 +2200,7 @@ ArStatus ArSession_checkSupported(const ArSession *session,
/// @return @c #AR_SUCCESS or any of:
/// - @c #AR_ERROR_FATAL
/// - @c #AR_ERROR_UNSUPPORTED_CONFIGURATION if the requested session config is
/// not supported.
/// not supported.
/// See above restrictions.
/// - @c #AR_ERROR_INTERNET_PERMISSION_NOT_GRANTED
ArStatus ArSession_configure(ArSession *session, const ArConfig *config);
Expand Down Expand Up @@ -2643,12 +2635,12 @@ void ArSession_getCameraConfig(const ArSession *session,
/// configs with lower GPU texture resolutions than the device's default GPU
/// texture resolution. These additional resolutions are only returned when the
/// filter is not a @c nullptr. See the ARCore supported devices
/// (https://developers.google.com/ar/discover/supported-devices) page for
/// (https://developers.google.com/ar/devices) page for
/// an up to date list of supported devices.
///
/// Beginning with ARCore SDK 1.21.0, some devices will return additional camera
/// configs for supported stereo cameras. See the ARCore supported devices
/// (https://developers.google.com/ar/discover/supported-devices) page for
/// (https://developers.google.com/ar/devices) page for
/// available camera configs by device.
///
/// Beginning with ARCore SDK 1.23.0, the list of returned camera configs will
Expand Down Expand Up @@ -2722,7 +2714,7 @@ void ArSession_getSupportedCameraConfigsWithFilter(
/// @return @c #AR_SUCCESS or any of:
/// - @c #AR_ERROR_SESSION_NOT_PAUSED if called when session is not paused.
/// - @c #AR_ERROR_SESSION_UNSUPPORTED if playback is incompatible with selected
/// features.
/// features.
/// - @c #AR_ERROR_PLAYBACK_FAILED if an error occurred with the MP4 dataset
/// file such as not being able to open the file or the file is unable to be
/// decoded.
Expand Down Expand Up @@ -2820,10 +2812,13 @@ void ArSession_getRecordingStatus(ArSession *session,
/// @param[in] payload_size Size in bytes of the payload
///
/// @return #AR_SUCCESS or any of:
/// - #AR_ERROR_ILLEGAL_STATE
/// - #AR_ERROR_INVALID_ARGUMENT
/// - #AR_ERROR_RECORDING_FAILED
/// - #AR_ERROR_DEADLINE_EXCEEDED
/// - #AR_ERROR_ILLEGAL_STATE when either @c ::ArSession_getRecordingStatus is
/// not currently @c ::AR_RECORDING_OK or the system is currently under excess
/// load for images to be produced. The system should not be under such excess
/// load for more than a few frames and an app should try to record the data
/// again during the next frame.
/// - #AR_ERROR_INVALID_ARGUMENT when any argument is invalid, e.g. null
/// - #AR_ERROR_DEADLINE_EXCEEDED when the frame is not the current frame
ArStatus ArFrame_recordTrackData(ArSession *session,
const ArFrame *frame,
const uint8_t *track_id_uuid_16,
Expand All @@ -2834,7 +2829,7 @@ ArStatus ArFrame_recordTrackData(ArSession *session,
/// Checks whether the provided @c ::ArDepthMode is supported on this device
/// with the selected camera configuration. The current list of supported
/// devices is documented on the <a
/// href="https://developers.google.com/ar/discover/supported-devices">ARCore
/// href="https://developers.google.com/ar/devices">ARCore
/// supported devices</a> page.
///
/// @param[in] session The ARCore session.
Expand Down Expand Up @@ -3352,7 +3347,7 @@ void ArFrame_getLightEstimate(const ArSession *session,
/// - @c #AR_ERROR_DEADLINE_EXCEEDED if @p frame is not the latest frame from
/// by @c ::ArSession_update.
/// - @c #AR_ERROR_RESOURCE_EXHAUSTED if too many Point Clouds are currently
/// held.
/// held.
ArStatus ArFrame_acquirePointCloud(const ArSession *session,
const ArFrame *frame,
ArPointCloud **out_point_cloud);
Expand Down Expand Up @@ -3385,7 +3380,7 @@ ArStatus ArFrame_acquireImageMetadata(const ArSession *session,
/// Returns the CPU image for the current frame.
/// Caller is responsible for later releasing the image with
/// @c ::ArImage_release. Not supported on all devices (see
/// https://developers.google.com/ar/discover/supported-devices). Return values:
/// https://developers.google.com/ar/devices). Return values:
/// @return @c #AR_SUCCESS or any of:
/// - @c #AR_ERROR_INVALID_ARGUMENT - one more input arguments are invalid.
/// - @c #AR_ERROR_DEADLINE_EXCEEDED - the input frame is not the current frame.
Expand Down
6 changes: 3 additions & 3 deletions samples/augmented_faces_java/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.google.ar.core.examples.java.augmentedfaces"

// AR Optional apps must declare minSdkVersion >= 14.
// AR Required apps must declare minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName '1.0'
}
Expand All @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.24.0'
implementation 'com.google.ar:core:1.25.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<uses-permission android:name="android.permission.CAMERA"/>
<!-- Limits app visibility in the Google Play Store to ARCore supported devices
(https://developers.google.com/ar/discover/supported-devices). -->
(https://developers.google.com/ar/devices). -->
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />

Expand Down
8 changes: 4 additions & 4 deletions samples/augmented_image_c/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ def arcore_libpath = "${buildDir}/arcore-native"
configurations { natives }

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.google.ar.core.examples.c.augmentedimage"

// "AR Optional" apps must declare minSdkVersion >= 14.
// "AR Required" apps must declare minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName '1.0'

Expand Down Expand Up @@ -53,8 +53,8 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.24.0'
natives 'com.google.ar:core:1.24.0'
implementation 'com.google.ar:core:1.25.0'
natives 'com.google.ar:core:1.25.0'

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
Expand Down
2 changes: 1 addition & 1 deletion samples/augmented_image_c/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<uses-permission android:name="android.permission.CAMERA"/>
<!-- Limits app visibility in the Google Play Store to ARCore supported devices
(https://developers.google.com/ar/discover/supported-devices). -->
(https://developers.google.com/ar/devices). -->
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />

Expand Down
6 changes: 3 additions & 3 deletions samples/augmented_image_java/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.google.ar.core.examples.java.augmentedimage"

// "AR Optional" apps must declare minSdkVersion >= 14.
// "AR Required" apps must declare minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName '1.0'
}
Expand All @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.24.0'
implementation 'com.google.ar:core:1.25.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<uses-permission android:name="android.permission.CAMERA"/>
<!-- Limits app visibility in the Google Play Store to ARCore supported devices
(https://developers.google.com/ar/discover/supported-devices). -->
(https://developers.google.com/ar/devices). -->
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>

<application
Expand Down
6 changes: 3 additions & 3 deletions samples/cloud_anchor_java/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.google.ar.core.examples.java.cloudanchor"

// "AR Optional" apps must declare minSdkVersion >= 14.
// "AR Required" apps must declare minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName '1.0'
}
Expand All @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.24.0'
implementation 'com.google.ar:core:1.25.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down
2 changes: 1 addition & 1 deletion samples/cloud_anchor_java/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<!-- Limits app visibility in the Google Play Store to ARCore supported devices
(https://developers.google.com/ar/discover/supported-devices). -->
(https://developers.google.com/ar/devices). -->
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>

<application
Expand Down
8 changes: 4 additions & 4 deletions samples/computervision_c/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ def arcore_libpath = "${buildDir}/arcore-native"
configurations { natives }

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "com.google.ar.core.examples.c.computervision"

// "AR Optional" apps must declare minSdkVersion >= 14.
// "AR Required" apps must declare minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName '1.0'

Expand Down Expand Up @@ -53,8 +53,8 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.24.0'
natives 'com.google.ar:core:1.24.0'
implementation 'com.google.ar:core:1.25.0'
natives 'com.google.ar:core:1.25.0'

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
Expand Down
2 changes: 1 addition & 1 deletion samples/computervision_c/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<uses-permission android:name="android.permission.CAMERA"/>
<!-- Limits app visibility in the Google Play Store to ARCore supported devices
(https://developers.google.com/ar/discover/supported-devices). -->
(https://developers.google.com/ar/devices). -->
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true" />

Expand Down
Loading

0 comments on commit 16324af

Please sign in to comment.