diff --git a/api/system-current.txt b/api/system-current.txt index c6792dda6f0a1..73602ae3bc36d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5309,6 +5309,7 @@ package android.media.tv.tuner.filter { public class Filter implements java.lang.AutoCloseable { method public void close(); method public int configure(@NonNull android.media.tv.tuner.filter.FilterConfiguration); + method public int configureScramblingStatusEvent(int); method public int flush(); method public int getId(); method public long getId64Bit(); @@ -5316,6 +5317,9 @@ package android.media.tv.tuner.filter { method public int setDataSource(@Nullable android.media.tv.tuner.filter.Filter); method public int start(); method public int stop(); + field public static final int SCRAMBLING_STATUS_NOT_SCRAMBLED = 2; // 0x2 + field public static final int SCRAMBLING_STATUS_SCRAMBLED = 4; // 0x4 + field public static final int SCRAMBLING_STATUS_UNKNOWN = 1; // 0x1 field public static final int STATUS_DATA_READY = 1; // 0x1 field public static final int STATUS_HIGH_WATER = 4; // 0x4 field public static final int STATUS_LOW_WATER = 2; // 0x2 @@ -5494,6 +5498,10 @@ package android.media.tv.tuner.filter { method @NonNull public android.media.tv.tuner.filter.RecordSettings.Builder setTsIndexMask(int); } + public final class ScramblingStatusEvent extends android.media.tv.tuner.filter.FilterEvent { + method public int getScramblingStatus(); + } + public class SectionEvent extends android.media.tv.tuner.filter.FilterEvent { method public int getDataLength(); method public int getSectionNumber(); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index e4021b6f2d7a9..37a53897eea51 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -5249,6 +5249,7 @@ package android.media.tv.tuner.filter { public class Filter implements java.lang.AutoCloseable { method public void close(); method public int configure(@NonNull android.media.tv.tuner.filter.FilterConfiguration); + method public int configureScramblingStatusEvent(int); method public int flush(); method public int getId(); method public long getId64Bit(); @@ -5256,6 +5257,9 @@ package android.media.tv.tuner.filter { method public int setDataSource(@Nullable android.media.tv.tuner.filter.Filter); method public int start(); method public int stop(); + field public static final int SCRAMBLING_STATUS_NOT_SCRAMBLED = 2; // 0x2 + field public static final int SCRAMBLING_STATUS_SCRAMBLED = 4; // 0x4 + field public static final int SCRAMBLING_STATUS_UNKNOWN = 1; // 0x1 field public static final int STATUS_DATA_READY = 1; // 0x1 field public static final int STATUS_HIGH_WATER = 4; // 0x4 field public static final int STATUS_LOW_WATER = 2; // 0x2 @@ -5434,6 +5438,10 @@ package android.media.tv.tuner.filter { method @NonNull public android.media.tv.tuner.filter.RecordSettings.Builder setTsIndexMask(int); } + public final class ScramblingStatusEvent extends android.media.tv.tuner.filter.FilterEvent { + method public int getScramblingStatus(); + } + public class SectionEvent extends android.media.tv.tuner.filter.FilterEvent { method public int getDataLength(); method public int getSectionNumber(); diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 2f2d8f74c9083..82cc78d7e47d8 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -25,6 +25,7 @@ import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.Tuner; import android.media.tv.tuner.Tuner.Result; import android.media.tv.tuner.TunerUtils; +import android.media.tv.tuner.TunerVersionChecker; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -148,7 +149,6 @@ public class Filter implements AutoCloseable { public static final int SUBTYPE_PTP = 16; - /** @hide */ @IntDef(flag = true, prefix = "STATUS_", value = {STATUS_DATA_READY, STATUS_LOW_WATER, STATUS_HIGH_WATER, STATUS_OVERFLOW}) @@ -180,6 +180,31 @@ public class Filter implements AutoCloseable { */ public static final int STATUS_OVERFLOW = Constants.DemuxFilterStatus.OVERFLOW; + /** @hide */ + @IntDef(flag = true, + prefix = "SCRAMBLING_STATUS_", + value = {SCRAMBLING_STATUS_UNKNOWN, SCRAMBLING_STATUS_NOT_SCRAMBLED, + SCRAMBLING_STATUS_SCRAMBLED}) + @Retention(RetentionPolicy.SOURCE) + public @interface ScramblingStatusMask {} + + /** + * Content’s scrambling status is unknown + */ + public static final int SCRAMBLING_STATUS_UNKNOWN = + android.hardware.tv.tuner.V1_1.Constants.ScramblingStatus.UNKNOWN; + /** + * Content is not scrambled. + */ + public static final int SCRAMBLING_STATUS_NOT_SCRAMBLED = + android.hardware.tv.tuner.V1_1.Constants.ScramblingStatus.NOT_SCRAMBLED; + /** + * Content is scrambled. + */ + public static final int SCRAMBLING_STATUS_SCRAMBLED = + android.hardware.tv.tuner.V1_1.Constants.ScramblingStatus.SCRAMBLED; + + private static final String TAG = "Filter"; private long mNativeContext; @@ -197,6 +222,7 @@ public class Filter implements AutoCloseable { int type, int subType, FilterConfiguration settings); private native int nativeGetId(); private native long nativeGetId64Bit(); + private native int nativeconfigureScramblingEvent(int scramblingStatusMask); private native int nativeSetDataSource(Filter source); private native int nativeStartFilter(); private native int nativeStopFilter(); @@ -279,6 +305,38 @@ public class Filter implements AutoCloseable { } } + /** + * Configure the Filter to monitor specific Scrambling Status through + * {@link ScramblingStatusEvent}. + * + *

{@link ScramblingStatusEvent} should be sent at the following two scenarios: + * + *