diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-26 07:45:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-26 07:45:00 +0000 |
| commit | 2cdbec4b18e31bd81327936630eef9bdc7660c04 (patch) | |
| tree | 9bfad2f133e606a4034a5b3bb5ce7567b479dd3e | |
| parent | b54e60ae944050bba5f9160e85b1557b313ae8cf (diff) | |
| parent | 8f76762c2c36c3470d5f1ce8eae1faa473d78d51 (diff) | |
| download | ex-busytown-mac-infra-release.tar.gz | |
Merge "Snap for 11878398 from 77c50d3fce4255489bbdc95a9fd66732d7ed1631 to busytown-mac-infra-release" into busytown-mac-infra-releasebusytown-mac-infra-release
3 files changed, 18 insertions, 6 deletions
diff --git a/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java b/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java index 8dbfadc2..d18aa926 100644 --- a/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java +++ b/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java @@ -140,8 +140,12 @@ public interface SessionProcessorImpl { * implementations are provided in the stub for OEM to construct the * {@link Camera2OutputConfigImpl} and {@link Camera2SessionConfigImpl} instances. * - * @param previewSurfaceConfig output surface for preview - * @param imageCaptureSurfaceConfig output surface for image capture. + * @param previewSurfaceConfig output surface for preview, which may contain a + * <code>null</code> surface if the app doesn't specify the + * preview surface. + * @param imageCaptureSurfaceConfig output surface for still capture, which may contain a + * <code>null</code> surface if the app doesn't specify the + * still capture surface. * @param imageAnalysisSurfaceConfig an optional output config for image analysis * (YUV_420_888). * @return a {@link Camera2SessionConfigImpl} consisting of a list of diff --git a/camera2/extensions/service_based_sample/oem_library/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java b/camera2/extensions/service_based_sample/oem_library/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java index fabfc2bf..f470a552 100644 --- a/camera2/extensions/service_based_sample/oem_library/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java +++ b/camera2/extensions/service_based_sample/oem_library/src/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java @@ -89,8 +89,12 @@ public interface SessionProcessorImpl { * implementations are provided in the stub for OEM to construct the * {@link Camera2OutputConfigImpl} and {@link Camera2SessionConfigImpl} instances. * - * @param previewSurfaceConfig output surface for preview - * @param imageCaptureSurfaceConfig output surface for image capture. + * @param previewSurfaceConfig output surface for preview, which may contain a + * <code>null</code> surface if the app doesn't specify the + * preview surface. + * @param imageCaptureSurfaceConfig output surface for still capture, which may contain a + * <code>null</code> surface if the app doesn't specify the + * still capture surface. * @param imageAnalysisSurfaceConfig an optional output config for image analysis * (YUV_420_888). * @return a {@link Camera2SessionConfigImpl} consisting of a list of diff --git a/camera2/extensions/stub/src/main/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java b/camera2/extensions/stub/src/main/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java index 06270812..2e5603b5 100644 --- a/camera2/extensions/stub/src/main/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java +++ b/camera2/extensions/stub/src/main/java/androidx/camera/extensions/impl/advanced/SessionProcessorImpl.java @@ -140,8 +140,12 @@ public interface SessionProcessorImpl { * implementations are provided in the stub for OEM to construct the * {@link Camera2OutputConfigImpl} and {@link Camera2SessionConfigImpl} instances. * - * @param previewSurfaceConfig output surface for preview - * @param imageCaptureSurfaceConfig output surface for image capture. + * @param previewSurfaceConfig output surface for preview, which may contain a + * <code>null</code> surface if the app doesn't specify the + * preview surface. + * @param imageCaptureSurfaceConfig output surface for still capture, which may contain a + * <code>null</code> surface if the app doesn't specify the + * still capture surface. * @param imageAnalysisSurfaceConfig an optional output config for image analysis * (YUV_420_888). * @return a {@link Camera2SessionConfigImpl} consisting of a list of |