Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ImageWriter: Do not override UNKNOWN format twice" into qt-qpr1-dev am: b78d7355b7

Browse Source 
am: eae340df69

Change-Id: I5fddcb6d0f55d88712b4d97c76234eea0c1a5f2c
This commit is contained in:
Shuzhen Wang
2019-10-31 08:07:59 -07:00
committed by android-build-merger
parent a6507293a5 eae340df69
commit 0ed11d0244
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/ImageWriter.java
View File

@@ -192,13 +192,15 @@ public class ImageWriter implements AutoCloseable {
mMaxImages = maxImages;
if (format == ImageFormat.UNKNOWN) {
format = SurfaceUtils.getSurfaceFormat(surface);
}
// Note that the underlying BufferQueue is working in synchronous mode
// to avoid dropping any buffers.
mNativeContext = nativeInit(new WeakReference<>(this), surface, maxImages, format);
// nativeInit internally overrides UNKNOWN format. So does surface format query after
// nativeInit and before getEstimatedNativeAllocBytes().
if (format == ImageFormat.UNKNOWN) {
format = SurfaceUtils.getSurfaceFormat(surface);
}
// Estimate the native buffer allocation size and register it so it gets accounted for
// during GC. Note that this doesn't include the buffers required by the buffer queue
// itself and the buffers requested by the producer.