Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main
This commit is contained in:
commit
02b33df6b8
2 changed files with 6 additions and 0 deletions
|
@ -35,5 +35,6 @@ package android.hardware.media.c2;
|
||||||
@VintfStability
|
@VintfStability
|
||||||
union BaseBlock {
|
union BaseBlock {
|
||||||
android.hardware.common.NativeHandle nativeBlock;
|
android.hardware.common.NativeHandle nativeBlock;
|
||||||
|
android.hardware.HardwareBuffer hwbBlock;
|
||||||
android.hardware.media.bufferpool2.BufferStatusMessage pooledBlock;
|
android.hardware.media.bufferpool2.BufferStatusMessage pooledBlock;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
package android.hardware.media.c2;
|
package android.hardware.media.c2;
|
||||||
|
|
||||||
|
import android.hardware.HardwareBuffer;
|
||||||
import android.hardware.common.NativeHandle;
|
import android.hardware.common.NativeHandle;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -31,6 +32,10 @@ union BaseBlock {
|
||||||
* #nativeBlock is the opaque representation of a buffer.
|
* #nativeBlock is the opaque representation of a buffer.
|
||||||
*/
|
*/
|
||||||
NativeHandle nativeBlock;
|
NativeHandle nativeBlock;
|
||||||
|
/**
|
||||||
|
* #hwbBlock is the opaque representation of a GraphicBuffer
|
||||||
|
*/
|
||||||
|
HardwareBuffer hwbBlock;
|
||||||
/**
|
/**
|
||||||
* #pooledBlock is a reference to a buffer handled by a BufferPool.
|
* #pooledBlock is a reference to a buffer handled by a BufferPool.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue