Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: Iaf4d48ea9d31b053f78f788e0f651b7ba1c5c8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jayant Chowdhary
2022-07-21 21:06:35 +00:00
committed by Automerger Merge Worker

View File

@@ -26,6 +26,10 @@ import static android.hardware.camera2.marshal.MarshalHelpers.getPrimitiveTypeCl
import java.lang.reflect.Array;
import java.nio.ByteBuffer;
import java.nio.DoubleBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.nio.LongBuffer;
import java.util.ArrayList;
/**
@@ -51,28 +55,36 @@ public class MarshalQueryableArray<T> implements MarshalQueryable<T> {
return new PrimitiveArrayFiller() {
@Override
public void fillArray(Object arr, int size, ByteBuffer buffer) {
buffer.asIntBuffer().get(int[].class.cast(arr), 0, size);
IntBuffer ib = buffer.asIntBuffer().get(int[].class.cast(arr), 0, size);
// Update buffer position since the IntBuffer has independent position.
buffer.position(buffer.position() + ib.position() * Integer.BYTES);
}
};
} else if (componentType == float.class) {
return new PrimitiveArrayFiller() {
@Override
public void fillArray(Object arr, int size, ByteBuffer buffer) {
buffer.asFloatBuffer().get(float[].class.cast(arr), 0, size);
FloatBuffer fb =
buffer.asFloatBuffer().get(float[].class.cast(arr), 0, size);
buffer.position(buffer.position() + fb.position() * Float.BYTES);
}
};
} else if (componentType == long.class) {
return new PrimitiveArrayFiller() {
@Override
public void fillArray(Object arr, int size, ByteBuffer buffer) {
buffer.asLongBuffer().get(long[].class.cast(arr), 0, size);
LongBuffer lb =
buffer.asLongBuffer().get(long[].class.cast(arr), 0, size);
buffer.position(buffer.position() + lb.position() * Long.BYTES);
}
};
} else if (componentType == double.class) {
return new PrimitiveArrayFiller() {
@Override
public void fillArray(Object arr, int size, ByteBuffer buffer) {
buffer.asDoubleBuffer().get(double[].class.cast(arr), 0, size);
DoubleBuffer db =
buffer.asDoubleBuffer().get(double[].class.cast(arr), 0, size);
buffer.position(buffer.position() + db.position() * Double.BYTES);
}
};
} else if (componentType == byte.class) {