From f788fab45b3aac7c8bc2cbdb67c46e0ea28d358a Mon Sep 17 00:00:00 2001 From: Amy Zhang Date: Thu, 28 Jan 2021 13:54:50 -0800 Subject: [PATCH] Improve documentation and use Long instead of 64Bits This CL also adds IntRange for getPts and getMpuSequenceNumber of multiple Filter Event interfaces Test: make Bug: 178498822 Change-Id: I20e094189dbd99a872570c99ea31f8e4af7665e5 --- core/api/system-current.txt | 12 ++++++------ media/java/android/media/tv/tuner/Tuner.java | 2 +- .../android/media/tv/tuner/filter/DownloadEvent.java | 2 ++ media/java/android/media/tv/tuner/filter/Filter.java | 8 +++++--- .../android/media/tv/tuner/filter/MediaEvent.java | 2 ++ .../media/tv/tuner/filter/MmtpRecordEvent.java | 2 ++ .../java/android/media/tv/tuner/filter/PesEvent.java | 2 ++ 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 5bb3e05170329..11c6ae5e1e526 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -5644,7 +5644,7 @@ package android.media.tv.tuner { method public void updateResourcePriority(int, int); field public static final int INVALID_AV_SYNC_ID = -1; // 0xffffffff field public static final int INVALID_FILTER_ID = -1; // 0xffffffff - field public static final long INVALID_FILTER_ID_64BIT = -1L; // 0xffffffffffffffffL + field public static final long INVALID_FILTER_ID_LONG = -1L; // 0xffffffffffffffffL field public static final int INVALID_FIRST_MACROBLOCK_IN_SLICE = -1; // 0xffffffff field public static final int INVALID_FRONTEND_ID = -1; // 0xffffffff field public static final int INVALID_FRONTEND_SETTING_FREQUENCY = -1; // 0xffffffff @@ -5825,7 +5825,7 @@ package android.media.tv.tuner.filter { method public int getItemFragmentIndex(); method public int getItemId(); method public int getLastItemFragmentIndex(); - method public int getMpuSequenceNumber(); + method @IntRange(from=0) public int getMpuSequenceNumber(); } public class DownloadSettings extends android.media.tv.tuner.filter.Settings { @@ -5843,7 +5843,7 @@ package android.media.tv.tuner.filter { method public int configure(@NonNull android.media.tv.tuner.filter.FilterConfiguration); method public int flush(); method public int getId(); - method public long getId64Bit(); + method public long getIdLong(); method public int read(@NonNull byte[], long, long); method public int setDataSource(@Nullable android.media.tv.tuner.filter.Filter); method public int setMonitorEventMask(int); @@ -5934,7 +5934,7 @@ package android.media.tv.tuner.filter { 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 @IntRange(from=0) public int getMpuSequenceNumber(); method public long getOffset(); method public long getPts(); method public int getStreamId(); @@ -5959,7 +5959,7 @@ package android.media.tv.tuner.filter { public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent { method public long getDataLength(); method public int getFirstMacroblockInSlice(); - method public int getMpuSequenceNumber(); + method @IntRange(from=0) public int getMpuSequenceNumber(); method public long getPts(); method public int getScHevcIndexMask(); method public int getTsIndexMask(); @@ -5967,7 +5967,7 @@ package android.media.tv.tuner.filter { public class PesEvent extends android.media.tv.tuner.filter.FilterEvent { method public int getDataLength(); - method public int getMpuSequenceNumber(); + method @IntRange(from=0) public int getMpuSequenceNumber(); method public int getStreamId(); } diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index ee0be010c233c..fdec4e4437323 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -149,7 +149,7 @@ public class Tuner implements AutoCloseable { /** * Invalid 64-bit filter ID. */ - public static final long INVALID_FILTER_ID_64BIT = + public static final long INVALID_FILTER_ID_LONG = android.hardware.tv.tuner.V1_1.Constants.Constant64Bit.INVALID_FILTER_ID_64BIT; /** * Invalid frequency that is used as the default frontend frequency setting. diff --git a/media/java/android/media/tv/tuner/filter/DownloadEvent.java b/media/java/android/media/tv/tuner/filter/DownloadEvent.java index 9f97b6141de03..394211be646b3 100644 --- a/media/java/android/media/tv/tuner/filter/DownloadEvent.java +++ b/media/java/android/media/tv/tuner/filter/DownloadEvent.java @@ -16,6 +16,7 @@ package android.media.tv.tuner.filter; +import android.annotation.IntRange; import android.annotation.SystemApi; /** @@ -51,6 +52,7 @@ public class DownloadEvent extends FilterEvent { /** * Gets MPU sequence number of filtered data. */ + @IntRange(from = 0) public int getMpuSequenceNumber() { return mMpuSequenceNumber; } diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 51b685aeb8be0..2f3e2d8d5dd99 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -309,7 +309,8 @@ public class Filter implements AutoCloseable { } /** - * Gets the filter Id. + * Gets the filter Id in 32-bit. For any Tuner SoC that supports 64-bit filter architecture, + * use {@link #getIdLong()}. */ public int getId() { synchronized (mLock) { @@ -319,9 +320,10 @@ public class Filter implements AutoCloseable { } /** - * Gets the 64-bit filter Id. + * Gets the 64-bit filter Id. For any Tuner SoC that supports 32-bit filter architecture, + * use {@link #getId()}. */ - public long getId64Bit() { + public long getIdLong() { synchronized (mLock) { TunerUtils.checkResourceState(TAG, mIsClosed); return nativeGetId64Bit(); diff --git a/media/java/android/media/tv/tuner/filter/MediaEvent.java b/media/java/android/media/tv/tuner/filter/MediaEvent.java index 91be5c38d6938..dbd85e9997d82 100644 --- a/media/java/android/media/tv/tuner/filter/MediaEvent.java +++ b/media/java/android/media/tv/tuner/filter/MediaEvent.java @@ -17,6 +17,7 @@ package android.media.tv.tuner.filter; import android.annotation.BytesLong; +import android.annotation.IntRange; import android.annotation.Nullable; import android.annotation.SystemApi; import android.media.MediaCodec.LinearBlock; @@ -154,6 +155,7 @@ public class MediaEvent extends FilterEvent { /** * Gets MPU sequence number of filtered data. */ + @IntRange(from = 0) public int getMpuSequenceNumber() { return mMpuSequenceNumber; } diff --git a/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java b/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java index 6a41c74ef73aa..58a81d99ff99e 100644 --- a/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java +++ b/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java @@ -17,6 +17,7 @@ package android.media.tv.tuner.filter; import android.annotation.BytesLong; +import android.annotation.IntRange; import android.annotation.SystemApi; import android.media.tv.tuner.filter.RecordSettings.ScHevcIndex; @@ -69,6 +70,7 @@ public class MmtpRecordEvent extends FilterEvent { * {@link android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the version * information. */ + @IntRange(from = 0) public int getMpuSequenceNumber() { return mMpuSequenceNumber; } diff --git a/media/java/android/media/tv/tuner/filter/PesEvent.java b/media/java/android/media/tv/tuner/filter/PesEvent.java index 695e596c98b7d..bfb7460d9c7be 100644 --- a/media/java/android/media/tv/tuner/filter/PesEvent.java +++ b/media/java/android/media/tv/tuner/filter/PesEvent.java @@ -16,6 +16,7 @@ package android.media.tv.tuner.filter; +import android.annotation.IntRange; import android.annotation.SystemApi; /** @@ -53,6 +54,7 @@ public class PesEvent extends FilterEvent { /** * Gets MPU sequence number of filtered data. */ + @IntRange(from = 0) public int getMpuSequenceNumber() { return mMpuSequenceNumber; }