Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80236207 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "camera2: update original ByteBuffer using bulk get on 'viewed'... 

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

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



Change-Id: Iaf4d48ea9d31b053f78f788e0f651b7ba1c5c8bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27cd8480 138fc75a

core/java/android/hardware/camera2/marshal/impl/MarshalQueryableArray.java

+16 −4
Original line number Diff line number Diff line
@@ -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) {

                          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) {

                          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) {

                          DoubleBuffer db =

                                  buffer.asDoubleBuffer().get(double[].class.cast(arr), 0, size);

                          buffer.position(buffer.position() + db.position() * Double.BYTES);

                      }

                };

            } else if (componentType == byte.class) {