From b838fbf8aaaeb6e85c3b8e4e3c5d7baf6728c086 Mon Sep 17 00:00:00 2001 From: shubang Date: Mon, 2 Mar 2020 13:38:41 -0800 Subject: [PATCH] Tuner API: remove @FilterConfiguration.PacketType There are some valid and reserved packet type values, so packet type should not be enum. According to specs ITU-R BT.1869, https://screenshot.googleplex.com/HhktwijUqBF.png ATSC A/330:2019,https://screenshot.googleplex.com/6ZQdO6HrmAS.png Bug: 150639580 Test: mmm Change-Id: Ie879a518635707dc71837fda12d90866faf35dc1 --- api/system-current.txt | 13 +++++++-- .../tuner/filter/AlpFilterConfiguration.java | 28 +++++++++++++++++-- .../tv/tuner/filter/FilterConfiguration.java | 24 ---------------- .../tuner/filter/TlvFilterConfiguration.java | 28 +++++++++++++++++-- 4 files changed, 62 insertions(+), 31 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 379ae579e8b75..2edb0ddb3b1ad 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5000,6 +5000,11 @@ package android.media.tv.tuner.filter { field public static final int LENGTH_TYPE_UNDEFINED = 0; // 0x0 field public static final int LENGTH_TYPE_WITHOUT_ADDITIONAL_HEADER = 1; // 0x1 field public static final int LENGTH_TYPE_WITH_ADDITIONAL_HEADER = 2; // 0x2 + field public static final int PACKET_TYPE_COMPRESSED = 2; // 0x2 + field public static final int PACKET_TYPE_EXTENSION = 6; // 0x6 + field public static final int PACKET_TYPE_IPV4 = 0; // 0x0 + field public static final int PACKET_TYPE_MPEG2_TS = 7; // 0x7 + field public static final int PACKET_TYPE_SIGNALING = 4; // 0x4 } public static class AlpFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder { @@ -5090,9 +5095,6 @@ package android.media.tv.tuner.filter { public abstract class FilterConfiguration { method @Nullable public android.media.tv.tuner.filter.Settings getSettings(); method public abstract int getType(); - field public static final int PACKET_TYPE_COMPRESSED = 2; // 0x2 - field public static final int PACKET_TYPE_IPV4 = 0; // 0x0 - field public static final int PACKET_TYPE_SIGNALING = 4; // 0x4 } public abstract static class FilterConfiguration.Builder> { @@ -5290,6 +5292,11 @@ package android.media.tv.tuner.filter { method public int getType(); method public boolean isCompressedIpPacket(); method public boolean isPassthrough(); + field public static final int PACKET_TYPE_COMPRESSED = 3; // 0x3 + field public static final int PACKET_TYPE_IPV4 = 1; // 0x1 + field public static final int PACKET_TYPE_IPV6 = 2; // 0x2 + field public static final int PACKET_TYPE_NULL = 255; // 0xff + field public static final int PACKET_TYPE_SIGNALING = 254; // 0xfe } public static class TlvFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder { diff --git a/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java index 064ab80efb5c8..7b2949472396d 100644 --- a/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java @@ -34,6 +34,27 @@ import java.lang.annotation.RetentionPolicy; */ @SystemApi public class AlpFilterConfiguration extends FilterConfiguration { + /** + * IPv4 packet type. + */ + public static final int PACKET_TYPE_IPV4 = 0; + /** + * Compressed packet type. + */ + public static final int PACKET_TYPE_COMPRESSED = 2; + /** + * Signaling packet type. + */ + public static final int PACKET_TYPE_SIGNALING = 4; + /** + * Extension packet type. + */ + public static final int PACKET_TYPE_EXTENSION = 6; + /** + * MPEG-2 TS packet type. + */ + public static final int PACKET_TYPE_MPEG2_TS = 7; + /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = "LENGTH_TYPE_", value = @@ -73,8 +94,9 @@ public class AlpFilterConfiguration extends FilterConfiguration { /** * Gets packet type. + * + *

The meaning of each packet type value is shown in ATSC A/330:2019 table 5.2. */ - @FilterConfiguration.PacketType public int getPacketType() { return mPacketType; } @@ -110,9 +132,11 @@ public class AlpFilterConfiguration extends FilterConfiguration { /** * Sets packet type. + * + *

The meaning of each packet type value is shown in ATSC A/330:2019 table 5.2. */ @NonNull - public Builder setPacketType(@FilterConfiguration.PacketType int packetType) { + public Builder setPacketType(int packetType) { mPacketType = packetType; return this; } diff --git a/media/java/android/media/tv/tuner/filter/FilterConfiguration.java b/media/java/android/media/tv/tuner/filter/FilterConfiguration.java index c1d2275d3bdb8..a8c9356b570aa 100644 --- a/media/java/android/media/tv/tuner/filter/FilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/FilterConfiguration.java @@ -16,14 +16,10 @@ package android.media.tv.tuner.filter; -import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - /** * Filter configuration used to configure filters. * @@ -32,26 +28,6 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public abstract class FilterConfiguration { - /** @hide */ - @IntDef(prefix = "PACKET_TYPE_", value = - {PACKET_TYPE_IPV4, PACKET_TYPE_COMPRESSED, PACKET_TYPE_SIGNALING}) - @Retention(RetentionPolicy.SOURCE) - public @interface PacketType {} - - /** - * IP v4 packet type. - */ - public static final int PACKET_TYPE_IPV4 = 0; - /** - * Compressed packet type. - */ - public static final int PACKET_TYPE_COMPRESSED = 2; - /** - * Signaling packet type. - */ - public static final int PACKET_TYPE_SIGNALING = 4; - - @Nullable /* package */ final Settings mSettings; diff --git a/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java index 3d83a74a500cb..ac4fc83134608 100644 --- a/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/TlvFilterConfiguration.java @@ -29,6 +29,27 @@ import android.media.tv.tuner.TunerUtils; */ @SystemApi public class TlvFilterConfiguration extends FilterConfiguration { + /** + * IPv4 packet type. + */ + public static final int PACKET_TYPE_IPV4 = 0x01; + /** + * IPv6 packet type. + */ + public static final int PACKET_TYPE_IPV6 = 0x02; + /** + * Compressed packet type. + */ + public static final int PACKET_TYPE_COMPRESSED = 0x03; + /** + * Signaling packet type. + */ + public static final int PACKET_TYPE_SIGNALING = 0xFE; + /** + * NULL packet type. + */ + public static final int PACKET_TYPE_NULL = 0xFF; + private final int mPacketType; private final boolean mIsCompressedIpPacket; private final boolean mPassthrough; @@ -48,8 +69,9 @@ public class TlvFilterConfiguration extends FilterConfiguration { /** * Gets packet type. + * + *

The description of each packet type value is shown in ITU-R BT.1869 table 2. */ - @FilterConfiguration.PacketType public int getPacketType() { return mPacketType; } @@ -96,9 +118,11 @@ public class TlvFilterConfiguration extends FilterConfiguration { /** * Sets packet type. + * + *

The description of each packet type value is shown in ITU-R BT.1869 table 2. */ @NonNull - public Builder setPacketType(@FilterConfiguration.PacketType int packetType) { + public Builder setPacketType(int packetType) { mPacketType = packetType; return this; }