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

Commit b44e3d72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use LinearBlock in MediaEvent"

parents fa75a86d b3f7b9ac
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5013,6 +5013,7 @@ package android.media.tv.tuner.filter {
    method public long getAvDataId();
    method public long getDataLength();
    method @Nullable public android.media.tv.tuner.filter.AudioDescriptor getExtraMetaData();
    method @Nullable public android.media.MediaCodec.LinearBlock getLinearBlock();
    method public int getMpuSequenceNumber();
    method public long getOffset();
    method public long getPts();
+8 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.media.tv.tuner.filter;
import android.annotation.BytesLong;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.media.MediaCodec.LinearBlock;

/**
 * Filter event sent from {@link Filter} objects with media type.
@@ -32,7 +33,7 @@ public class MediaEvent extends FilterEvent{
    private final long mPts;
    private final long mDataLength;
    private final long mOffset;
    private final Object mLinearBuffer;
    private final LinearBlock mLinearBlock;
    private final boolean mIsSecureMemory;
    private final long mDataId;
    private final int mMpuSequenceNumber;
@@ -41,14 +42,14 @@ public class MediaEvent extends FilterEvent{

    // This constructor is used by JNI code only
    private MediaEvent(int streamId, boolean isPtsPresent, long pts, long dataLength, long offset,
            Object buffer, boolean isSecureMemory, long dataId, int mpuSequenceNumber,
            LinearBlock buffer, boolean isSecureMemory, long dataId, int mpuSequenceNumber,
            boolean isPrivateData, AudioDescriptor extraMetaData) {
        mStreamId = streamId;
        mIsPtsPresent = isPtsPresent;
        mPts = pts;
        mDataLength = dataLength;
        mOffset = offset;
        mLinearBuffer = buffer;
        mLinearBlock = buffer;
        mIsSecureMemory = isSecureMemory;
        mDataId = dataId;
        mMpuSequenceNumber = mpuSequenceNumber;
@@ -96,13 +97,11 @@ public class MediaEvent extends FilterEvent{
    }

    /**
     * Gets a linear buffer associated to the memory where audio or video data stays.
     * TODO: use LinearBuffer when it's ready.
     *
     * @hide
     * Gets a linear block associated to the memory where audio or video data stays.
     */
    public Object getLinearBuffer() {
        return mLinearBuffer;
    @Nullable
    public LinearBlock getLinearBlock() {
        return mLinearBlock;
    }

    /**