diff options
author | Emilian Peev <epeev@google.com> | 2022-06-14 22:59:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-14 22:59:35 +0000 |
commit | 24e1a0ff9e34c4947b1588a5b6d26a41f8eff366 (patch) | |
tree | c7f586426833a83034b1f4349e9d14aa22724336 | |
parent | 6bdbdd880c2f4bf1967094c736e683123b16661b (diff) | |
parent | 8e6f66de1d175b7738fa4df542e8945e2cd00768 (diff) | |
download | ex-android13-qpr2-release.tar.gz |
Camera: Add support for latency query interface am: 3f9efa8b73 am: 8e6f66de1dandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/18767220
Change-Id: I7911064b02346f18b239ca6ef83586d5ce49aba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
6 files changed, 47 insertions, 0 deletions
diff --git a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java index 8844461e..5f6cb2ba 100755 --- a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java +++ b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/AutoImageCaptureExtenderImpl.java @@ -25,6 +25,7 @@ import android.media.ImageWriter; import android.os.Build; import android.util.Log; import android.util.Pair; +import android.util.Range; import android.util.Size; import android.view.Surface; @@ -243,6 +244,11 @@ public final class AutoImageCaptureExtenderImpl implements ImageCaptureExtenderI } @Override + public Range<Long> getEstimatedCaptureLatencyRange(Size captureOutputSize) { + return null; + } + + @Override public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() { return new ArrayList<>(); } diff --git a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java index 21a3646a..5c9b2d39 100755 --- a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java +++ b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BeautyImageCaptureExtenderImpl.java @@ -27,6 +27,7 @@ import android.media.ImageWriter; import android.os.Build; import android.util.Log; import android.util.Pair; +import android.util.Range; import android.util.Size; import android.view.Surface; @@ -266,6 +267,11 @@ public final class BeautyImageCaptureExtenderImpl implements ImageCaptureExtende } @Override + public Range<Long> getEstimatedCaptureLatencyRange(Size captureOutputSize) { + return null; + } + + @Override public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() { return new ArrayList<>(); } diff --git a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java index 51a86540..5c3882b8 100644 --- a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java +++ b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/BokehImageCaptureExtenderImpl.java @@ -25,6 +25,7 @@ import android.media.ImageWriter; import android.os.Build; import android.util.Log; import android.util.Pair; +import android.util.Range; import android.util.Size; import android.view.Surface; @@ -320,6 +321,11 @@ public final class BokehImageCaptureExtenderImpl implements ImageCaptureExtender } @Override + public Range<Long> getEstimatedCaptureLatencyRange(Size captureOutputSize) { + return null; + } + + @Override public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() { final CaptureRequest.Key [] CAPTURE_REQUEST_SET = {CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, CaptureRequest.CONTROL_AE_LOCK, diff --git a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java index 5f745e96..57b7fe65 100644 --- a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java +++ b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/HdrImageCaptureExtenderImpl.java @@ -26,6 +26,7 @@ import android.media.ImageWriter; import android.os.Build; import android.util.Log; import android.util.Pair; +import android.util.Range; import android.util.Size; import android.view.Surface; @@ -331,6 +332,11 @@ public final class HdrImageCaptureExtenderImpl implements ImageCaptureExtenderIm } @Override + public Range<Long> getEstimatedCaptureLatencyRange(Size captureOutputSize) { + return null; + } + + @Override public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() { final CaptureRequest.Key [] CAPTURE_REQUEST_SET = {CaptureRequest.CONTROL_ZOOM_RATIO, CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_REGIONS, diff --git a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java index 5b144179..c27a5dbb 100644 --- a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java +++ b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/ImageCaptureExtenderImpl.java @@ -21,6 +21,7 @@ import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureResult; import android.util.Pair; +import android.util.Range; import android.util.Size; import java.util.List; @@ -90,6 +91,22 @@ public interface ImageCaptureExtenderImpl extends ExtenderStateListener { List<Pair<Integer, Size[]>> getSupportedResolutions(); /** + * Returns the estimated capture latency range in milliseconds for the target capture + * resolution. + * + * <p>This includes the time spent processing the multi-frame capture request along with any + * additional time for encoding of the processed buffer in the framework if necessary.</p> + * + * @param captureOutputSize size of the capture output surface. If it is null or not in the + * supported output sizes, maximum capture output size is used for + * the estimation. + * @return the range of estimated minimal and maximal capture latency in milliseconds, or + * null if no capture latency info can be provided. + * @since 1.2 + */ + Range<Long> getEstimatedCaptureLatencyRange(Size captureOutputSize); + + /** * Return a list of orthogonal capture request keys. * * <p>Any keys included in the list will be configurable by clients of the extension and will diff --git a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java index f27f48e4..f0821ed7 100755 --- a/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java +++ b/camera2/extensions/sample/src/java/androidx/camera/extensions/impl/NightImageCaptureExtenderImpl.java @@ -25,6 +25,7 @@ import android.media.ImageWriter; import android.os.Build; import android.util.Log; import android.util.Pair; +import android.util.Range; import android.util.Size; import android.view.Surface; @@ -243,6 +244,11 @@ public final class NightImageCaptureExtenderImpl implements ImageCaptureExtender } @Override + public Range<Long> getEstimatedCaptureLatencyRange(Size captureOutputSize) { + return null; + } + + @Override public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() { return new ArrayList<>(); } |