diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-15 04:56:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-15 04:56:03 +0000 |
| commit | ff5b74654d2d069a853bf648c258e626233c3a54 (patch) | |
| tree | 9bfad2f133e606a4034a5b3bb5ce7567b479dd3e | |
| parent | 2fd626392981bdfe387cea32e9096e27c3c64913 (diff) | |
| parent | cdd46b77a38dbc086ba66fb3697838dcc252ca04 (diff) | |
| download | ex-master.tar.gz | |
Merge "Improve doc of Extensions: OutputSurfaceImp.getSurface() could be null in preview output surface or image capture surface" into mainHEADmastermain
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 |