diff --git a/Android.bp b/Android.bp index 62dce7fab6a12..3afd6ecd5610e 100644 --- a/Android.bp +++ b/Android.bp @@ -101,6 +101,7 @@ filegroup { // AIDL sources from external directories ":android.hardware.security.keymint-V1-java-source", ":android.hardware.security.secureclock-V1-java-source", + ":android.hardware.tv.tuner-V1-java-source", ":android.security.apc-java-source", ":android.security.authorization-java-source", ":android.security.legacykeystore-java-source", @@ -250,8 +251,6 @@ java_library { "android.hardware.thermal-V1.1-java", "android.hardware.thermal-V2.0-java", "android.hardware.tv.input-V1.0-java-constants", - "android.hardware.tv.tuner-V1.0-java-constants", - "android.hardware.tv.tuner-V1.1-java-constants", "android.hardware.usb-V1.0-java-constants", "android.hardware.usb-V1.1-java-constants", "android.hardware.usb-V1.2-java-constants", @@ -331,6 +330,7 @@ java_defaults { ], sdk_version: "core_platform", static_libs: [ + "android.hardware.common.fmq-V1-java", // TODO(b/184162091) "android.hardware.soundtrigger3-V1-java", "bouncycastle-repackaged-unbundled", @@ -559,8 +559,6 @@ stubs_defaults { "android.hardware.thermal-V1.0-java-constants", "android.hardware.thermal-V2.0-java", "android.hardware.tv.input-V1.0-java-constants", - "android.hardware.tv.tuner-V1.0-java-constants", - "android.hardware.tv.tuner-V1.1-java-constants", "android.hardware.usb-V1.0-java-constants", "android.hardware.usb-V1.1-java-constants", "android.hardware.usb.gadget-V1.0-java", diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 96c990d516967..e3e6959288724 100755 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7028,13 +7028,13 @@ package android.media.tv.tuner.frontend { field public static final long FEC_23_36 = 268435456L; // 0x10000000L field public static final long FEC_25_36 = 536870912L; // 0x20000000L field public static final long FEC_26_45 = 1073741824L; // 0x40000000L - field public static final long FEC_28_45 = -2147483648L; // 0xffffffff80000000L - field public static final long FEC_29_45 = 1L; // 0x1L + field public static final long FEC_28_45 = 2147483648L; // 0x80000000L + field public static final long FEC_29_45 = 4294967296L; // 0x100000000L field public static final long FEC_2_3 = 32L; // 0x20L field public static final long FEC_2_5 = 64L; // 0x40L field public static final long FEC_2_9 = 128L; // 0x80L - field public static final long FEC_31_45 = 2L; // 0x2L - field public static final long FEC_32_45 = 4L; // 0x4L + field public static final long FEC_31_45 = 8589934592L; // 0x200000000L + field public static final long FEC_32_45 = 17179869184L; // 0x400000000L field public static final long FEC_3_4 = 256L; // 0x100L field public static final long FEC_3_5 = 512L; // 0x200L field public static final long FEC_4_15 = 2048L; // 0x800L @@ -7042,7 +7042,7 @@ package android.media.tv.tuner.frontend { field public static final long FEC_5_6 = 4096L; // 0x1000L field public static final long FEC_5_9 = 8192L; // 0x2000L field public static final long FEC_6_7 = 16384L; // 0x4000L - field public static final long FEC_77_90 = 8L; // 0x8L + field public static final long FEC_77_90 = 34359738368L; // 0x800000000L field public static final long FEC_7_15 = 131072L; // 0x20000L field public static final long FEC_7_8 = 32768L; // 0x8000L field public static final long FEC_7_9 = 65536L; // 0x10000L diff --git a/media/java/android/media/tv/tuner/Lnb.java b/media/java/android/media/tv/tuner/Lnb.java index 0037b53e541ab..6a6a22c1fc0ec 100644 --- a/media/java/android/media/tv/tuner/Lnb.java +++ b/media/java/android/media/tv/tuner/Lnb.java @@ -20,7 +20,10 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.LnbEventType; +import android.hardware.tv.tuner.LnbPosition; +import android.hardware.tv.tuner.LnbTone; +import android.hardware.tv.tuner.LnbVoltage; import android.media.tv.tuner.Tuner.Result; import java.lang.annotation.Retention; @@ -48,39 +51,39 @@ public class Lnb implements AutoCloseable { /** * LNB power voltage not set. */ - public static final int VOLTAGE_NONE = Constants.LnbVoltage.NONE; + public static final int VOLTAGE_NONE = LnbVoltage.NONE; /** * LNB power voltage 5V. */ - public static final int VOLTAGE_5V = Constants.LnbVoltage.VOLTAGE_5V; + public static final int VOLTAGE_5V = LnbVoltage.VOLTAGE_5V; /** * LNB power voltage 11V. */ - public static final int VOLTAGE_11V = Constants.LnbVoltage.VOLTAGE_11V; + public static final int VOLTAGE_11V = LnbVoltage.VOLTAGE_11V; /** * LNB power voltage 12V. */ - public static final int VOLTAGE_12V = Constants.LnbVoltage.VOLTAGE_12V; + public static final int VOLTAGE_12V = LnbVoltage.VOLTAGE_12V; /** * LNB power voltage 13V. */ - public static final int VOLTAGE_13V = Constants.LnbVoltage.VOLTAGE_13V; + public static final int VOLTAGE_13V = LnbVoltage.VOLTAGE_13V; /** * LNB power voltage 14V. */ - public static final int VOLTAGE_14V = Constants.LnbVoltage.VOLTAGE_14V; + public static final int VOLTAGE_14V = LnbVoltage.VOLTAGE_14V; /** * LNB power voltage 15V. */ - public static final int VOLTAGE_15V = Constants.LnbVoltage.VOLTAGE_15V; + public static final int VOLTAGE_15V = LnbVoltage.VOLTAGE_15V; /** * LNB power voltage 18V. */ - public static final int VOLTAGE_18V = Constants.LnbVoltage.VOLTAGE_18V; + public static final int VOLTAGE_18V = LnbVoltage.VOLTAGE_18V; /** * LNB power voltage 19V. */ - public static final int VOLTAGE_19V = Constants.LnbVoltage.VOLTAGE_19V; + public static final int VOLTAGE_19V = LnbVoltage.VOLTAGE_19V; /** @hide */ @IntDef(prefix = "TONE_", @@ -91,11 +94,11 @@ public class Lnb implements AutoCloseable { /** * LNB tone mode not set. */ - public static final int TONE_NONE = Constants.LnbTone.NONE; + public static final int TONE_NONE = LnbTone.NONE; /** * LNB continuous tone mode. */ - public static final int TONE_CONTINUOUS = Constants.LnbTone.CONTINUOUS; + public static final int TONE_CONTINUOUS = LnbTone.CONTINUOUS; /** @hide */ @IntDef(prefix = "POSITION_", @@ -106,15 +109,15 @@ public class Lnb implements AutoCloseable { /** * LNB position is not defined. */ - public static final int POSITION_UNDEFINED = Constants.LnbPosition.UNDEFINED; + public static final int POSITION_UNDEFINED = LnbPosition.UNDEFINED; /** * Position A of two-band LNBs */ - public static final int POSITION_A = Constants.LnbPosition.POSITION_A; + public static final int POSITION_A = LnbPosition.POSITION_A; /** * Position B of two-band LNBs */ - public static final int POSITION_B = Constants.LnbPosition.POSITION_B; + public static final int POSITION_B = LnbPosition.POSITION_B; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -126,22 +129,19 @@ public class Lnb implements AutoCloseable { /** * Outgoing Diseqc message overflow. */ - public static final int EVENT_TYPE_DISEQC_RX_OVERFLOW = - Constants.LnbEventType.DISEQC_RX_OVERFLOW; + public static final int EVENT_TYPE_DISEQC_RX_OVERFLOW = LnbEventType.DISEQC_RX_OVERFLOW; /** * Outgoing Diseqc message isn't delivered on time. */ - public static final int EVENT_TYPE_DISEQC_RX_TIMEOUT = - Constants.LnbEventType.DISEQC_RX_TIMEOUT; + public static final int EVENT_TYPE_DISEQC_RX_TIMEOUT = LnbEventType.DISEQC_RX_TIMEOUT; /** * Incoming Diseqc message has parity error. */ - public static final int EVENT_TYPE_DISEQC_RX_PARITY_ERROR = - Constants.LnbEventType.DISEQC_RX_PARITY_ERROR; + public static final int EVENT_TYPE_DISEQC_RX_PARITY_ERROR = LnbEventType.DISEQC_RX_PARITY_ERROR; /** * LNB is overload. */ - public static final int EVENT_TYPE_LNB_OVERLOAD = Constants.LnbEventType.LNB_OVERLOAD; + public static final int EVENT_TYPE_LNB_OVERLOAD = LnbEventType.LNB_OVERLOAD; private static final String TAG = "Lnb"; diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index 088b3b6d29498..6d4275c6f9903 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -25,7 +25,9 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.content.Context; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.Constant; +import android.hardware.tv.tuner.Constant64Bit; +import android.hardware.tv.tuner.FrontendScanType; import android.media.tv.TvInputService; import android.media.tv.tuner.dvr.DvrPlayback; import android.media.tv.tuner.dvr.DvrRecorder; @@ -85,19 +87,19 @@ public class Tuner implements AutoCloseable { /** * Invalid TS packet ID. */ - public static final int INVALID_TS_PID = Constants.Constant.INVALID_TS_PID; + public static final int INVALID_TS_PID = Constant.INVALID_TS_PID; /** * Invalid stream ID. */ - public static final int INVALID_STREAM_ID = Constants.Constant.INVALID_STREAM_ID; + public static final int INVALID_STREAM_ID = Constant.INVALID_STREAM_ID; /** * Invalid filter ID. */ - public static final int INVALID_FILTER_ID = Constants.Constant.INVALID_FILTER_ID; + public static final int INVALID_FILTER_ID = Constant.INVALID_FILTER_ID; /** * Invalid AV Sync ID. */ - public static final int INVALID_AV_SYNC_ID = Constants.Constant.INVALID_AV_SYNC_ID; + public static final int INVALID_AV_SYNC_ID = Constant.INVALID_AV_SYNC_ID; /** * Invalid timestamp. * @@ -113,7 +115,7 @@ public class Tuner implements AutoCloseable { * @see android.media.tv.tuner.filter.MmtpRecordEvent#getPts() */ public static final long INVALID_TIMESTAMP = - android.hardware.tv.tuner.V1_1.Constants.Constant64Bit.INVALID_PRESENTATION_TIME_STAMP; + Constant64Bit.INVALID_PRESENTATION_TIME_STAMP; /** * Invalid mpu sequence number in MmtpRecordEvent. * @@ -123,8 +125,7 @@ public class Tuner implements AutoCloseable { * @see android.media.tv.tuner.filter.MmtpRecordEvent#getMpuSequenceNumber() */ public static final int INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM = - android.hardware.tv.tuner.V1_1.Constants.Constant - .INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM; + Constant.INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM; /** * Invalid first macroblock address in MmtpRecordEvent and TsRecordEvent. * @@ -135,7 +136,7 @@ public class Tuner implements AutoCloseable { * @see android.media.tv.tuner.filter.TsRecordEvent#getMbInSlice() */ public static final int INVALID_FIRST_MACROBLOCK_IN_SLICE = - android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_FIRST_MACROBLOCK_IN_SLICE; + Constant.INVALID_FIRST_MACROBLOCK_IN_SLICE; /** * Invalid local transport stream id. * @@ -144,30 +145,26 @@ public class Tuner implements AutoCloseable { * * @see #linkFrontendToCiCam(int) */ - public static final int INVALID_LTS_ID = - android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_LTS_ID; + public static final int INVALID_LTS_ID = Constant.INVALID_LTS_ID; /** * Invalid 64-bit filter ID. */ - public static final long INVALID_FILTER_ID_LONG = - android.hardware.tv.tuner.V1_1.Constants.Constant64Bit.INVALID_FILTER_ID_64BIT; + public static final long INVALID_FILTER_ID_LONG = Constant64Bit.INVALID_FILTER_ID_64BIT; /** * Invalid frequency that is used as the default frontend frequency setting. */ public static final int INVALID_FRONTEND_SETTING_FREQUENCY = - android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_FRONTEND_SETTING_FREQUENCY; + Constant.INVALID_FRONTEND_SETTING_FREQUENCY; /** * Invalid frontend id. */ - public static final int INVALID_FRONTEND_ID = - android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_FRONTEND_ID; + public static final int INVALID_FRONTEND_ID = Constant.INVALID_FRONTEND_ID; /** * Invalid LNB id. * * @hide */ - public static final int INVALID_LNB_ID = - android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_LNB_ID; + public static final int INVALID_LNB_ID = Constant.INVALID_LNB_ID; /** * A void key token. It is used to remove the current key from descrambler. * @@ -175,8 +172,7 @@ public class Tuner implements AutoCloseable { * to use this constant to remove current key before closing MediaCas session. */ @NonNull - public static final byte[] VOID_KEYTOKEN = - {android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_KEYTOKEN}; + public static final byte[] VOID_KEYTOKEN = {Constant.INVALID_KEYTOKEN}; /** @hide */ @IntDef(prefix = "SCAN_TYPE_", value = {SCAN_TYPE_UNDEFINED, SCAN_TYPE_AUTO, SCAN_TYPE_BLIND}) @@ -185,20 +181,20 @@ public class Tuner implements AutoCloseable { /** * Scan type undefined. */ - public static final int SCAN_TYPE_UNDEFINED = Constants.FrontendScanType.SCAN_UNDEFINED; + public static final int SCAN_TYPE_UNDEFINED = FrontendScanType.SCAN_UNDEFINED; /** * Scan type auto. * *

Tuner will send {@link android.media.tv.tuner.frontend.ScanCallback#onLocked} */ - public static final int SCAN_TYPE_AUTO = Constants.FrontendScanType.SCAN_AUTO; + public static final int SCAN_TYPE_AUTO = FrontendScanType.SCAN_AUTO; /** * Blind scan. * *

Frequency range is not specified. The {@link android.media.tv.tuner.Tuner} will scan an * implementation specific range. */ - public static final int SCAN_TYPE_BLIND = Constants.FrontendScanType.SCAN_BLIND; + public static final int SCAN_TYPE_BLIND = FrontendScanType.SCAN_BLIND; /** @hide */ @@ -210,31 +206,33 @@ public class Tuner implements AutoCloseable { /** * Operation succeeded. */ - public static final int RESULT_SUCCESS = Constants.Result.SUCCESS; + public static final int RESULT_SUCCESS = android.hardware.tv.tuner.Result.SUCCESS; /** * Operation failed because the corresponding resources are not available. */ - public static final int RESULT_UNAVAILABLE = Constants.Result.UNAVAILABLE; + public static final int RESULT_UNAVAILABLE = android.hardware.tv.tuner.Result.UNAVAILABLE; /** * Operation failed because the corresponding resources are not initialized. */ - public static final int RESULT_NOT_INITIALIZED = Constants.Result.NOT_INITIALIZED; + public static final int RESULT_NOT_INITIALIZED = + android.hardware.tv.tuner.Result.NOT_INITIALIZED; /** * Operation failed because it's not in a valid state. */ - public static final int RESULT_INVALID_STATE = Constants.Result.INVALID_STATE; + public static final int RESULT_INVALID_STATE = android.hardware.tv.tuner.Result.INVALID_STATE; /** * Operation failed because there are invalid arguments. */ - public static final int RESULT_INVALID_ARGUMENT = Constants.Result.INVALID_ARGUMENT; + public static final int RESULT_INVALID_ARGUMENT = + android.hardware.tv.tuner.Result.INVALID_ARGUMENT; /** * Memory allocation failed. */ - public static final int RESULT_OUT_OF_MEMORY = Constants.Result.OUT_OF_MEMORY; + public static final int RESULT_OUT_OF_MEMORY = android.hardware.tv.tuner.Result.OUT_OF_MEMORY; /** * Operation failed due to unknown errors. */ - public static final int RESULT_UNKNOWN_ERROR = Constants.Result.UNKNOWN_ERROR; + public static final int RESULT_UNKNOWN_ERROR = android.hardware.tv.tuner.Result.UNKNOWN_ERROR; @@ -257,12 +255,12 @@ public class Tuner implements AutoCloseable { * DVR for recording. * @hide */ - public static final int DVR_TYPE_RECORD = Constants.DvrType.RECORD; + public static final int DVR_TYPE_RECORD = android.hardware.tv.tuner.DvrType.RECORD; /** * DVR for playback of recorded programs. * @hide */ - public static final int DVR_TYPE_PLAYBACK = Constants.DvrType.PLAYBACK; + public static final int DVR_TYPE_PLAYBACK = android.hardware.tv.tuner.DvrType.PLAYBACK; static { try { diff --git a/media/java/android/media/tv/tuner/TunerUtils.java b/media/java/android/media/tv/tuner/TunerUtils.java index a13077c77cedb..3a15daf742324 100644 --- a/media/java/android/media/tv/tuner/TunerUtils.java +++ b/media/java/android/media/tv/tuner/TunerUtils.java @@ -17,7 +17,11 @@ package android.media.tv.tuner; import android.annotation.Nullable; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.DemuxAlpFilterType; +import android.hardware.tv.tuner.DemuxIpFilterType; +import android.hardware.tv.tuner.DemuxMmtpFilterType; +import android.hardware.tv.tuner.DemuxTlvFilterType; +import android.hardware.tv.tuner.DemuxTsFilterType; import android.media.tv.tuner.filter.Filter; /** @@ -37,44 +41,44 @@ public final class TunerUtils { if (mainType == Filter.TYPE_TS) { switch (subtype) { case Filter.SUBTYPE_UNDEFINED: - return Constants.DemuxTsFilterType.UNDEFINED; + return DemuxTsFilterType.UNDEFINED; case Filter.SUBTYPE_SECTION: - return Constants.DemuxTsFilterType.SECTION; + return DemuxTsFilterType.SECTION; case Filter.SUBTYPE_PES: - return Constants.DemuxTsFilterType.PES; + return DemuxTsFilterType.PES; case Filter.SUBTYPE_TS: - return Constants.DemuxTsFilterType.TS; + return DemuxTsFilterType.TS; case Filter.SUBTYPE_AUDIO: - return Constants.DemuxTsFilterType.AUDIO; + return DemuxTsFilterType.AUDIO; case Filter.SUBTYPE_VIDEO: - return Constants.DemuxTsFilterType.VIDEO; + return DemuxTsFilterType.VIDEO; case Filter.SUBTYPE_PCR: - return Constants.DemuxTsFilterType.PCR; + return DemuxTsFilterType.PCR; case Filter.SUBTYPE_RECORD: - return Constants.DemuxTsFilterType.RECORD; + return DemuxTsFilterType.RECORD; case Filter.SUBTYPE_TEMI: - return Constants.DemuxTsFilterType.TEMI; + return DemuxTsFilterType.TEMI; default: break; } } else if (mainType == Filter.TYPE_MMTP) { switch (subtype) { case Filter.SUBTYPE_UNDEFINED: - return Constants.DemuxMmtpFilterType.UNDEFINED; + return DemuxMmtpFilterType.UNDEFINED; case Filter.SUBTYPE_SECTION: - return Constants.DemuxMmtpFilterType.SECTION; + return DemuxMmtpFilterType.SECTION; case Filter.SUBTYPE_PES: - return Constants.DemuxMmtpFilterType.PES; + return DemuxMmtpFilterType.PES; case Filter.SUBTYPE_MMTP: - return Constants.DemuxMmtpFilterType.MMTP; + return DemuxMmtpFilterType.MMTP; case Filter.SUBTYPE_AUDIO: - return Constants.DemuxMmtpFilterType.AUDIO; + return DemuxMmtpFilterType.AUDIO; case Filter.SUBTYPE_VIDEO: - return Constants.DemuxMmtpFilterType.VIDEO; + return DemuxMmtpFilterType.VIDEO; case Filter.SUBTYPE_RECORD: - return Constants.DemuxMmtpFilterType.RECORD; + return DemuxMmtpFilterType.RECORD; case Filter.SUBTYPE_DOWNLOAD: - return Constants.DemuxMmtpFilterType.DOWNLOAD; + return DemuxMmtpFilterType.DOWNLOAD; default: break; } @@ -82,43 +86,43 @@ public final class TunerUtils { } else if (mainType == Filter.TYPE_IP) { switch (subtype) { case Filter.SUBTYPE_UNDEFINED: - return Constants.DemuxIpFilterType.UNDEFINED; + return DemuxIpFilterType.UNDEFINED; case Filter.SUBTYPE_SECTION: - return Constants.DemuxIpFilterType.SECTION; + return DemuxIpFilterType.SECTION; case Filter.SUBTYPE_NTP: - return Constants.DemuxIpFilterType.NTP; + return DemuxIpFilterType.NTP; case Filter.SUBTYPE_IP_PAYLOAD: - return Constants.DemuxIpFilterType.IP_PAYLOAD; + return DemuxIpFilterType.IP_PAYLOAD; case Filter.SUBTYPE_IP: - return Constants.DemuxIpFilterType.IP; + return DemuxIpFilterType.IP; case Filter.SUBTYPE_PAYLOAD_THROUGH: - return Constants.DemuxIpFilterType.PAYLOAD_THROUGH; + return DemuxIpFilterType.PAYLOAD_THROUGH; default: break; } } else if (mainType == Filter.TYPE_TLV) { switch (subtype) { case Filter.SUBTYPE_UNDEFINED: - return Constants.DemuxTlvFilterType.UNDEFINED; + return DemuxTlvFilterType.UNDEFINED; case Filter.SUBTYPE_SECTION: - return Constants.DemuxTlvFilterType.SECTION; + return DemuxTlvFilterType.SECTION; case Filter.SUBTYPE_TLV: - return Constants.DemuxTlvFilterType.TLV; + return DemuxTlvFilterType.TLV; case Filter.SUBTYPE_PAYLOAD_THROUGH: - return Constants.DemuxTlvFilterType.PAYLOAD_THROUGH; + return DemuxTlvFilterType.PAYLOAD_THROUGH; default: break; } } else if (mainType == Filter.TYPE_ALP) { switch (subtype) { case Filter.SUBTYPE_UNDEFINED: - return Constants.DemuxAlpFilterType.UNDEFINED; + return DemuxAlpFilterType.UNDEFINED; case Filter.SUBTYPE_SECTION: - return Constants.DemuxAlpFilterType.SECTION; + return DemuxAlpFilterType.SECTION; case Filter.SUBTYPE_PTP: - return Constants.DemuxAlpFilterType.PTP; + return DemuxAlpFilterType.PTP; case Filter.SUBTYPE_PAYLOAD_THROUGH: - return Constants.DemuxAlpFilterType.PAYLOAD_THROUGH; + return DemuxAlpFilterType.PAYLOAD_THROUGH; default: break; } diff --git a/media/java/android/media/tv/tuner/dvr/DvrPlayback.java b/media/java/android/media/tv/tuner/dvr/DvrPlayback.java index 6c2b9e3b99f5d..cfd85834048c2 100644 --- a/media/java/android/media/tv/tuner/dvr/DvrPlayback.java +++ b/media/java/android/media/tv/tuner/dvr/DvrPlayback.java @@ -20,7 +20,6 @@ import android.annotation.BytesLong; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -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; @@ -56,25 +55,27 @@ public class DvrPlayback implements AutoCloseable { /** * The space of the playback is empty. */ - public static final int PLAYBACK_STATUS_EMPTY = Constants.PlaybackStatus.SPACE_EMPTY; + public static final int PLAYBACK_STATUS_EMPTY = + android.hardware.tv.tuner.PlaybackStatus.SPACE_EMPTY; /** * The space of the playback is almost empty. * *

the threshold is set in {@link DvrSettings}. */ public static final int PLAYBACK_STATUS_ALMOST_EMPTY = - Constants.PlaybackStatus.SPACE_ALMOST_EMPTY; + android.hardware.tv.tuner.PlaybackStatus.SPACE_ALMOST_EMPTY; /** * The space of the playback is almost full. * *

the threshold is set in {@link DvrSettings}. */ public static final int PLAYBACK_STATUS_ALMOST_FULL = - Constants.PlaybackStatus.SPACE_ALMOST_FULL; + android.hardware.tv.tuner.PlaybackStatus.SPACE_ALMOST_FULL; /** * The space of the playback is full. */ - public static final int PLAYBACK_STATUS_FULL = Constants.PlaybackStatus.SPACE_FULL; + public static final int PLAYBACK_STATUS_FULL = + android.hardware.tv.tuner.PlaybackStatus.SPACE_FULL; private static final String TAG = "TvTunerPlayback"; diff --git a/media/java/android/media/tv/tuner/dvr/DvrSettings.java b/media/java/android/media/tv/tuner/dvr/DvrSettings.java index 60f0d1686ea79..0c4af4b6da07e 100644 --- a/media/java/android/media/tv/tuner/dvr/DvrSettings.java +++ b/media/java/android/media/tv/tuner/dvr/DvrSettings.java @@ -20,7 +20,7 @@ import android.annotation.BytesLong; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.DataFormat; import android.media.tv.tuner.filter.Filter; import java.lang.annotation.Retention; @@ -43,19 +43,19 @@ public class DvrSettings { /** * Transport Stream. */ - public static final int DATA_FORMAT_TS = Constants.DataFormat.TS; + public static final int DATA_FORMAT_TS = android.hardware.tv.tuner.DataFormat.TS; /** * Packetized Elementary Stream. */ - public static final int DATA_FORMAT_PES = Constants.DataFormat.PES; + public static final int DATA_FORMAT_PES = android.hardware.tv.tuner.DataFormat.PES; /** * Elementary Stream. */ - public static final int DATA_FORMAT_ES = Constants.DataFormat.ES; + public static final int DATA_FORMAT_ES = android.hardware.tv.tuner.DataFormat.ES; /** * TLV (type-length-value) Stream for SHV */ - public static final int DATA_FORMAT_SHV_TLV = Constants.DataFormat.SHV_TLV; + public static final int DATA_FORMAT_SHV_TLV = android.hardware.tv.tuner.DataFormat.SHV_TLV; @Filter.Status diff --git a/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java index 29bc2c9bd9c11..bac3b5674eab5 100644 --- a/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java @@ -20,7 +20,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.DemuxAlpLengthType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -63,17 +63,17 @@ public final class AlpFilterConfiguration extends FilterConfiguration { /** * Length type not defined. */ - public static final int LENGTH_TYPE_UNDEFINED = Constants.DemuxAlpLengthType.UNDEFINED; + public static final int LENGTH_TYPE_UNDEFINED = DemuxAlpLengthType.UNDEFINED; /** * Length does NOT include additional header. */ public static final int LENGTH_TYPE_WITHOUT_ADDITIONAL_HEADER = - Constants.DemuxAlpLengthType.WITHOUT_ADDITIONAL_HEADER; + DemuxAlpLengthType.WITHOUT_ADDITIONAL_HEADER; /** * Length includes additional header. */ public static final int LENGTH_TYPE_WITH_ADDITIONAL_HEADER = - Constants.DemuxAlpLengthType.WITH_ADDITIONAL_HEADER; + DemuxAlpLengthType.WITH_ADDITIONAL_HEADER; private final int mPacketType; diff --git a/media/java/android/media/tv/tuner/filter/AvSettings.java b/media/java/android/media/tv/tuner/filter/AvSettings.java index 25457a7bd4378..8bcf3d268c3f1 100644 --- a/media/java/android/media/tv/tuner/filter/AvSettings.java +++ b/media/java/android/media/tv/tuner/filter/AvSettings.java @@ -19,7 +19,6 @@ package android.media.tv.tuner.filter; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_1.Constants; import android.media.tv.tuner.TunerUtils; import android.media.tv.tuner.TunerVersionChecker; @@ -46,55 +45,60 @@ public class AvSettings extends Settings { /* * Undefined Video stream type */ - public static final int VIDEO_STREAM_TYPE_UNDEFINED = Constants.VideoStreamType.UNDEFINED; + public static final int VIDEO_STREAM_TYPE_UNDEFINED = + android.hardware.tv.tuner.VideoStreamType.UNDEFINED; /* * ITU-T | ISO/IEC Reserved */ - public static final int VIDEO_STREAM_TYPE_RESERVED = Constants.VideoStreamType.RESERVED; + public static final int VIDEO_STREAM_TYPE_RESERVED = + android.hardware.tv.tuner.VideoStreamType.RESERVED; /* * ISO/IEC 11172 */ - public static final int VIDEO_STREAM_TYPE_MPEG1 = Constants.VideoStreamType.MPEG1; + public static final int VIDEO_STREAM_TYPE_MPEG1 = + android.hardware.tv.tuner.VideoStreamType.MPEG1; /* * ITU-T Rec.H.262 and ISO/IEC 13818-2 */ - public static final int VIDEO_STREAM_TYPE_MPEG2 = Constants.VideoStreamType.MPEG2; + public static final int VIDEO_STREAM_TYPE_MPEG2 = + android.hardware.tv.tuner.VideoStreamType.MPEG2; /* * ISO/IEC 14496-2 (MPEG-4 H.263 based video) */ - public static final int VIDEO_STREAM_TYPE_MPEG4P2 = Constants.VideoStreamType.MPEG4P2; + public static final int VIDEO_STREAM_TYPE_MPEG4P2 = + android.hardware.tv.tuner.VideoStreamType.MPEG4P2; /* * ITU-T Rec.H.264 and ISO/IEC 14496-10 */ - public static final int VIDEO_STREAM_TYPE_AVC = Constants.VideoStreamType.AVC; + public static final int VIDEO_STREAM_TYPE_AVC = android.hardware.tv.tuner.VideoStreamType.AVC; /* * ITU-T Rec. H.265 and ISO/IEC 23008-2 */ - public static final int VIDEO_STREAM_TYPE_HEVC = Constants.VideoStreamType.HEVC; + public static final int VIDEO_STREAM_TYPE_HEVC = android.hardware.tv.tuner.VideoStreamType.HEVC; /* * Microsoft VC.1 */ - public static final int VIDEO_STREAM_TYPE_VC1 = Constants.VideoStreamType.VC1; + public static final int VIDEO_STREAM_TYPE_VC1 = android.hardware.tv.tuner.VideoStreamType.VC1; /* * Google VP8 */ - public static final int VIDEO_STREAM_TYPE_VP8 = Constants.VideoStreamType.VP8; + public static final int VIDEO_STREAM_TYPE_VP8 = android.hardware.tv.tuner.VideoStreamType.VP8; /* * Google VP9 */ - public static final int VIDEO_STREAM_TYPE_VP9 = Constants.VideoStreamType.VP9; + public static final int VIDEO_STREAM_TYPE_VP9 = android.hardware.tv.tuner.VideoStreamType.VP9; /* * AOMedia Video 1 */ - public static final int VIDEO_STREAM_TYPE_AV1 = Constants.VideoStreamType.AV1; + public static final int VIDEO_STREAM_TYPE_AV1 = android.hardware.tv.tuner.VideoStreamType.AV1; /* * Chinese Standard */ - public static final int VIDEO_STREAM_TYPE_AVS = Constants.VideoStreamType.AVS; + public static final int VIDEO_STREAM_TYPE_AVS = android.hardware.tv.tuner.VideoStreamType.AVS; /* * New Chinese Standard */ - public static final int VIDEO_STREAM_TYPE_AVS2 = Constants.VideoStreamType.AVS2; + public static final int VIDEO_STREAM_TYPE_AVS2 = android.hardware.tv.tuner.VideoStreamType.AVS2; /** @hide */ @IntDef(prefix = "AUDIO_STREAM_TYPE_", @@ -110,67 +114,73 @@ public class AvSettings extends Settings { /* * Undefined Audio stream type */ - public static final int AUDIO_STREAM_TYPE_UNDEFINED = Constants.AudioStreamType.UNDEFINED; + public static final int AUDIO_STREAM_TYPE_UNDEFINED = + android.hardware.tv.tuner.AudioStreamType.UNDEFINED; /* * Uncompressed Audio */ - public static final int AUDIO_STREAM_TYPE_PCM = Constants.AudioStreamType.PCM; + public static final int AUDIO_STREAM_TYPE_PCM = android.hardware.tv.tuner.AudioStreamType.PCM; /* * MPEG Audio Layer III versions */ - public static final int AUDIO_STREAM_TYPE_MP3 = Constants.AudioStreamType.MP3; + public static final int AUDIO_STREAM_TYPE_MP3 = android.hardware.tv.tuner.AudioStreamType.MP3; /* * ISO/IEC 11172 Audio */ - public static final int AUDIO_STREAM_TYPE_MPEG1 = Constants.AudioStreamType.MPEG1; + public static final int AUDIO_STREAM_TYPE_MPEG1 = + android.hardware.tv.tuner.AudioStreamType.MPEG1; /* * ISO/IEC 13818-3 */ - public static final int AUDIO_STREAM_TYPE_MPEG2 = Constants.AudioStreamType.MPEG2; + public static final int AUDIO_STREAM_TYPE_MPEG2 = + android.hardware.tv.tuner.AudioStreamType.MPEG2; /* * ISO/IEC 23008-3 (MPEG-H Part 3) */ - public static final int AUDIO_STREAM_TYPE_MPEGH = Constants.AudioStreamType.MPEGH; + public static final int AUDIO_STREAM_TYPE_MPEGH = + android.hardware.tv.tuner.AudioStreamType.MPEGH; /* * ISO/IEC 14496-3 */ - public static final int AUDIO_STREAM_TYPE_AAC = Constants.AudioStreamType.AAC; + public static final int AUDIO_STREAM_TYPE_AAC = android.hardware.tv.tuner.AudioStreamType.AAC; /* * Dolby Digital */ - public static final int AUDIO_STREAM_TYPE_AC3 = Constants.AudioStreamType.AC3; + public static final int AUDIO_STREAM_TYPE_AC3 = android.hardware.tv.tuner.AudioStreamType.AC3; /* * Dolby Digital Plus */ - public static final int AUDIO_STREAM_TYPE_EAC3 = Constants.AudioStreamType.EAC3; + public static final int AUDIO_STREAM_TYPE_EAC3 = android.hardware.tv.tuner.AudioStreamType.EAC3; /* * Dolby AC-4 */ - public static final int AUDIO_STREAM_TYPE_AC4 = Constants.AudioStreamType.AC4; + public static final int AUDIO_STREAM_TYPE_AC4 = android.hardware.tv.tuner.AudioStreamType.AC4; /* * Basic DTS */ - public static final int AUDIO_STREAM_TYPE_DTS = Constants.AudioStreamType.DTS; + public static final int AUDIO_STREAM_TYPE_DTS = android.hardware.tv.tuner.AudioStreamType.DTS; /* * High Resolution DTS */ - public static final int AUDIO_STREAM_TYPE_DTS_HD = Constants.AudioStreamType.DTS_HD; + public static final int AUDIO_STREAM_TYPE_DTS_HD = + android.hardware.tv.tuner.AudioStreamType.DTS_HD; /* * Windows Media Audio */ - public static final int AUDIO_STREAM_TYPE_WMA = Constants.AudioStreamType.WMA; + public static final int AUDIO_STREAM_TYPE_WMA = android.hardware.tv.tuner.AudioStreamType.WMA; /* * Opus Interactive Audio Codec */ - public static final int AUDIO_STREAM_TYPE_OPUS = Constants.AudioStreamType.OPUS; + public static final int AUDIO_STREAM_TYPE_OPUS = android.hardware.tv.tuner.AudioStreamType.OPUS; /* * VORBIS Interactive Audio Codec */ - public static final int AUDIO_STREAM_TYPE_VORBIS = Constants.AudioStreamType.VORBIS; + public static final int AUDIO_STREAM_TYPE_VORBIS = + android.hardware.tv.tuner.AudioStreamType.VORBIS; /* * SJ/T 11368-2006 */ - public static final int AUDIO_STREAM_TYPE_DRA = Constants.AudioStreamType.DRA; + public static final int AUDIO_STREAM_TYPE_DRA = android.hardware.tv.tuner.AudioStreamType.DRA; private final boolean mIsPassthrough; diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 3db7047518b8d..e7612bc08e50e 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -21,7 +21,9 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.DemuxFilterMainType; +import android.hardware.tv.tuner.DemuxFilterMonitorEventType; +import android.hardware.tv.tuner.DemuxFilterStatus; import android.media.tv.tuner.Tuner; import android.media.tv.tuner.Tuner.Result; import android.media.tv.tuner.TunerUtils; @@ -53,23 +55,23 @@ public class Filter implements AutoCloseable { /** * TS filter type. */ - public static final int TYPE_TS = Constants.DemuxFilterMainType.TS; + public static final int TYPE_TS = DemuxFilterMainType.TS; /** * MMTP filter type. */ - public static final int TYPE_MMTP = Constants.DemuxFilterMainType.MMTP; + public static final int TYPE_MMTP = DemuxFilterMainType.MMTP; /** * IP filter type. */ - public static final int TYPE_IP = Constants.DemuxFilterMainType.IP; + public static final int TYPE_IP = DemuxFilterMainType.IP; /** * TLV filter type. */ - public static final int TYPE_TLV = Constants.DemuxFilterMainType.TLV; + public static final int TYPE_TLV = DemuxFilterMainType.TLV; /** * ALP filter type. */ - public static final int TYPE_ALP = Constants.DemuxFilterMainType.ALP; + public static final int TYPE_ALP = DemuxFilterMainType.ALP; /** @hide */ @IntDef(prefix = "SUBTYPE_", @@ -158,7 +160,7 @@ public class Filter implements AutoCloseable { /** * The status of a filter that the data in the filter buffer is ready to be read. */ - public static final int STATUS_DATA_READY = Constants.DemuxFilterStatus.DATA_READY; + public static final int STATUS_DATA_READY = DemuxFilterStatus.DATA_READY; /** * The status of a filter that the amount of available data in the filter buffer is at low * level. @@ -166,19 +168,19 @@ public class Filter implements AutoCloseable { * The value is set to 25 percent of the buffer size by default. It can be changed when * configuring the filter. */ - public static final int STATUS_LOW_WATER = Constants.DemuxFilterStatus.LOW_WATER; + public static final int STATUS_LOW_WATER = DemuxFilterStatus.LOW_WATER; /** * The status of a filter that the amount of available data in the filter buffer is at high * level. * The value is set to 75 percent of the buffer size by default. It can be changed when * configuring the filter. */ - public static final int STATUS_HIGH_WATER = Constants.DemuxFilterStatus.HIGH_WATER; + public static final int STATUS_HIGH_WATER = DemuxFilterStatus.HIGH_WATER; /** * The status of a filter that the filter buffer is full and newly filtered data is being * discarded. */ - public static final int STATUS_OVERFLOW = Constants.DemuxFilterStatus.OVERFLOW; + public static final int STATUS_OVERFLOW = DemuxFilterStatus.OVERFLOW; /** @hide */ @IntDef(flag = true, @@ -192,17 +194,17 @@ public class Filter implements AutoCloseable { * Content’s scrambling status is unknown */ public static final int SCRAMBLING_STATUS_UNKNOWN = - android.hardware.tv.tuner.V1_1.Constants.ScramblingStatus.UNKNOWN; + android.hardware.tv.tuner.ScramblingStatus.UNKNOWN; /** * Content is not scrambled. */ public static final int SCRAMBLING_STATUS_NOT_SCRAMBLED = - android.hardware.tv.tuner.V1_1.Constants.ScramblingStatus.NOT_SCRAMBLED; + android.hardware.tv.tuner.ScramblingStatus.NOT_SCRAMBLED; /** * Content is scrambled. */ public static final int SCRAMBLING_STATUS_SCRAMBLED = - android.hardware.tv.tuner.V1_1.Constants.ScramblingStatus.SCRAMBLED; + android.hardware.tv.tuner.ScramblingStatus.SCRAMBLED; /** @hide */ @IntDef(flag = true, @@ -215,12 +217,11 @@ public class Filter implements AutoCloseable { * Monitor scrambling status change. */ public static final int MONITOR_EVENT_SCRAMBLING_STATUS = - android.hardware.tv.tuner.V1_1.Constants.DemuxFilterMonitorEventType.SCRAMBLING_STATUS; + DemuxFilterMonitorEventType.SCRAMBLING_STATUS; /** * Monitor ip cid change. */ - public static final int MONITOR_EVENT_IP_CID_CHANGE = - android.hardware.tv.tuner.V1_1.Constants.DemuxFilterMonitorEventType.IP_CID_CHANGE; + public static final int MONITOR_EVENT_IP_CID_CHANGE = DemuxFilterMonitorEventType.IP_CID_CHANGE; private static final String TAG = "Filter"; diff --git a/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java index 4b69807e50783..657846486158e 100644 --- a/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; import android.annotation.SystemApi; +import android.hardware.tv.tuner.Constant; import android.media.tv.tuner.TunerVersionChecker; /** @@ -33,8 +34,7 @@ public final class IpFilterConfiguration extends FilterConfiguration { /** * Undefined filter type. */ - public static final int INVALID_IP_FILTER_CONTEXT_ID = - android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_IP_FILTER_CONTEXT_ID; + public static final int INVALID_IP_FILTER_CONTEXT_ID = Constant.INVALID_IP_FILTER_CONTEXT_ID; private final byte[] mSrcIpAddress; private final byte[] mDstIpAddress; diff --git a/media/java/android/media/tv/tuner/filter/RecordSettings.java b/media/java/android/media/tv/tuner/filter/RecordSettings.java index 91992afadb3e3..cd703651f2fac 100644 --- a/media/java/android/media/tv/tuner/filter/RecordSettings.java +++ b/media/java/android/media/tv/tuner/filter/RecordSettings.java @@ -19,7 +19,10 @@ package android.media.tv.tuner.filter; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.DemuxRecordScIndexType; +import android.hardware.tv.tuner.DemuxScHevcIndex; +import android.hardware.tv.tuner.DemuxScIndex; +import android.hardware.tv.tuner.DemuxTsIndex; import android.media.tv.tuner.TunerUtils; import java.lang.annotation.Retention; @@ -57,88 +60,80 @@ public class RecordSettings extends Settings { /** * TS index FIRST_PACKET. */ - public static final int TS_INDEX_FIRST_PACKET = Constants.DemuxTsIndex.FIRST_PACKET; + public static final int TS_INDEX_FIRST_PACKET = DemuxTsIndex.FIRST_PACKET; /** * TS index PAYLOAD_UNIT_START_INDICATOR. */ public static final int TS_INDEX_PAYLOAD_UNIT_START_INDICATOR = - Constants.DemuxTsIndex.PAYLOAD_UNIT_START_INDICATOR; + DemuxTsIndex.PAYLOAD_UNIT_START_INDICATOR; /** * TS index CHANGE_TO_NOT_SCRAMBLED. */ - public static final int TS_INDEX_CHANGE_TO_NOT_SCRAMBLED = - Constants.DemuxTsIndex.CHANGE_TO_NOT_SCRAMBLED; + public static final int TS_INDEX_CHANGE_TO_NOT_SCRAMBLED = DemuxTsIndex.CHANGE_TO_NOT_SCRAMBLED; /** * TS index CHANGE_TO_EVEN_SCRAMBLED. */ public static final int TS_INDEX_CHANGE_TO_EVEN_SCRAMBLED = - Constants.DemuxTsIndex.CHANGE_TO_EVEN_SCRAMBLED; + DemuxTsIndex.CHANGE_TO_EVEN_SCRAMBLED; /** * TS index CHANGE_TO_ODD_SCRAMBLED. */ - public static final int TS_INDEX_CHANGE_TO_ODD_SCRAMBLED = - Constants.DemuxTsIndex.CHANGE_TO_ODD_SCRAMBLED; + public static final int TS_INDEX_CHANGE_TO_ODD_SCRAMBLED = DemuxTsIndex.CHANGE_TO_ODD_SCRAMBLED; /** * TS index DISCONTINUITY_INDICATOR. */ - public static final int TS_INDEX_DISCONTINUITY_INDICATOR = - Constants.DemuxTsIndex.DISCONTINUITY_INDICATOR; + public static final int TS_INDEX_DISCONTINUITY_INDICATOR = DemuxTsIndex.DISCONTINUITY_INDICATOR; /** * TS index RANDOM_ACCESS_INDICATOR. */ - public static final int TS_INDEX_RANDOM_ACCESS_INDICATOR = - Constants.DemuxTsIndex.RANDOM_ACCESS_INDICATOR; + public static final int TS_INDEX_RANDOM_ACCESS_INDICATOR = DemuxTsIndex.RANDOM_ACCESS_INDICATOR; /** * TS index PRIORITY_INDICATOR. */ - public static final int TS_INDEX_PRIORITY_INDICATOR = Constants.DemuxTsIndex.PRIORITY_INDICATOR; + public static final int TS_INDEX_PRIORITY_INDICATOR = DemuxTsIndex.PRIORITY_INDICATOR; /** * TS index PCR_FLAG. */ - public static final int TS_INDEX_PCR_FLAG = Constants.DemuxTsIndex.PCR_FLAG; + public static final int TS_INDEX_PCR_FLAG = DemuxTsIndex.PCR_FLAG; /** * TS index OPCR_FLAG. */ - public static final int TS_INDEX_OPCR_FLAG = Constants.DemuxTsIndex.OPCR_FLAG; + public static final int TS_INDEX_OPCR_FLAG = DemuxTsIndex.OPCR_FLAG; /** * TS index SPLICING_POINT_FLAG. */ - public static final int TS_INDEX_SPLICING_POINT_FLAG = - Constants.DemuxTsIndex.SPLICING_POINT_FLAG; + public static final int TS_INDEX_SPLICING_POINT_FLAG = DemuxTsIndex.SPLICING_POINT_FLAG; /** * TS index PRIVATE_DATA. */ - public static final int TS_INDEX_PRIVATE_DATA = Constants.DemuxTsIndex.PRIVATE_DATA; + public static final int TS_INDEX_PRIVATE_DATA = DemuxTsIndex.PRIVATE_DATA; /** * TS index ADAPTATION_EXTENSION_FLAG. */ public static final int TS_INDEX_ADAPTATION_EXTENSION_FLAG = - Constants.DemuxTsIndex.ADAPTATION_EXTENSION_FLAG; + DemuxTsIndex.ADAPTATION_EXTENSION_FLAG; /** * Index the address of MPEG Media Transport Packet Table(MPT). */ - public static final int MPT_INDEX_MPT = - android.hardware.tv.tuner.V1_1.Constants.DemuxTsIndex.MPT_INDEX_MPT; + public static final int MPT_INDEX_MPT = DemuxTsIndex.MPT_INDEX_MPT; /** * Index the address of Video. */ - public static final int MPT_INDEX_VIDEO = - android.hardware.tv.tuner.V1_1.Constants.DemuxTsIndex.MPT_INDEX_VIDEO; + public static final int MPT_INDEX_VIDEO = DemuxTsIndex.MPT_INDEX_VIDEO; /** * Index the address of Audio. */ - public static final int MPT_INDEX_AUDIO = - android.hardware.tv.tuner.V1_1.Constants.DemuxTsIndex.MPT_INDEX_AUDIO; + public static final int MPT_INDEX_AUDIO = DemuxTsIndex.MPT_INDEX_AUDIO; /** * Index to indicate this is a target of timestamp extraction for video. */ public static final int MPT_INDEX_TIMESTAMP_TARGET_VIDEO = - android.hardware.tv.tuner.V1_1.Constants.DemuxTsIndex.MPT_INDEX_TIMESTAMP_TARGET_VIDEO; + DemuxTsIndex.MPT_INDEX_TIMESTAMP_TARGET_VIDEO; /** * Index to indicate this is a target of timestamp extraction for audio. */ public static final int MPT_INDEX_TIMESTAMP_TARGET_AUDIO = - android.hardware.tv.tuner.V1_1.Constants.DemuxTsIndex.MPT_INDEX_TIMESTAMP_TARGET_AUDIO; + DemuxTsIndex.MPT_INDEX_TIMESTAMP_TARGET_AUDIO; /** @hide */ @@ -150,15 +145,15 @@ public class RecordSettings extends Settings { /** * Start Code Index is not used. */ - public static final int INDEX_TYPE_NONE = Constants.DemuxRecordScIndexType.NONE; + public static final int INDEX_TYPE_NONE = DemuxRecordScIndexType.NONE; /** * Start Code index. */ - public static final int INDEX_TYPE_SC = Constants.DemuxRecordScIndexType.SC; + public static final int INDEX_TYPE_SC = DemuxRecordScIndexType.SC; /** * Start Code index for HEVC. */ - public static final int INDEX_TYPE_SC_HEVC = Constants.DemuxRecordScIndexType.SC_HEVC; + public static final int INDEX_TYPE_SC_HEVC = DemuxRecordScIndexType.SC_HEVC; /** * Indexes can be tagged by Start Code in PES (Packetized Elementary Stream) @@ -176,44 +171,39 @@ public class RecordSettings extends Settings { /** * SC index for a new I-frame. */ - public static final int SC_INDEX_I_FRAME = Constants.DemuxScIndex.I_FRAME; + public static final int SC_INDEX_I_FRAME = DemuxScIndex.I_FRAME; /** * SC index for a new P-frame. */ - public static final int SC_INDEX_P_FRAME = Constants.DemuxScIndex.P_FRAME; + public static final int SC_INDEX_P_FRAME = DemuxScIndex.P_FRAME; /** * SC index for a new B-frame. */ - public static final int SC_INDEX_B_FRAME = Constants.DemuxScIndex.B_FRAME; + public static final int SC_INDEX_B_FRAME = DemuxScIndex.B_FRAME; /** * SC index for a new sequence. */ - public static final int SC_INDEX_SEQUENCE = Constants.DemuxScIndex.SEQUENCE; + public static final int SC_INDEX_SEQUENCE = DemuxScIndex.SEQUENCE; /** * All blocks are coded as I blocks. */ - public static final int SC_INDEX_I_SLICE = - android.hardware.tv.tuner.V1_1.Constants.DemuxScIndex.I_SLICE; + public static final int SC_INDEX_I_SLICE = DemuxScIndex.I_SLICE; /** * Blocks are coded as I or P blocks. */ - public static final int SC_INDEX_P_SLICE = - android.hardware.tv.tuner.V1_1.Constants.DemuxScIndex.P_SLICE; + public static final int SC_INDEX_P_SLICE = DemuxScIndex.P_SLICE; /** * Blocks are coded as I, P or B blocks. */ - public static final int SC_INDEX_B_SLICE = - android.hardware.tv.tuner.V1_1.Constants.DemuxScIndex.B_SLICE; + public static final int SC_INDEX_B_SLICE = DemuxScIndex.B_SLICE; /** * A so-called switching I slice that is coded. */ - public static final int SC_INDEX_SI_SLICE = - android.hardware.tv.tuner.V1_1.Constants.DemuxScIndex.SI_SLICE; + public static final int SC_INDEX_SI_SLICE = DemuxScIndex.SI_SLICE; /** * A so-called switching P slice that is coded. */ - public static final int SC_INDEX_SP_SLICE = - android.hardware.tv.tuner.V1_1.Constants.DemuxScIndex.SP_SLICE; + public static final int SC_INDEX_SP_SLICE = DemuxScIndex.SP_SLICE; /** * Indexes can be tagged by NAL unit group in HEVC according to ISO/IEC 23008-2. @@ -231,41 +221,35 @@ public class RecordSettings extends Settings { /** * SC HEVC index SPS. */ - public static final int SC_HEVC_INDEX_SPS = Constants.DemuxScHevcIndex.SPS; + public static final int SC_HEVC_INDEX_SPS = DemuxScHevcIndex.SPS; /** * SC HEVC index AUD. */ - public static final int SC_HEVC_INDEX_AUD = Constants.DemuxScHevcIndex.AUD; + public static final int SC_HEVC_INDEX_AUD = DemuxScHevcIndex.AUD; /** * SC HEVC index SLICE_CE_BLA_W_LP. */ - public static final int SC_HEVC_INDEX_SLICE_CE_BLA_W_LP = - Constants.DemuxScHevcIndex.SLICE_CE_BLA_W_LP; + public static final int SC_HEVC_INDEX_SLICE_CE_BLA_W_LP = DemuxScHevcIndex.SLICE_CE_BLA_W_LP; /** * SC HEVC index SLICE_BLA_W_RADL. */ - public static final int SC_HEVC_INDEX_SLICE_BLA_W_RADL = - Constants.DemuxScHevcIndex.SLICE_BLA_W_RADL; + public static final int SC_HEVC_INDEX_SLICE_BLA_W_RADL = DemuxScHevcIndex.SLICE_BLA_W_RADL; /** * SC HEVC index SLICE_BLA_N_LP. */ - public static final int SC_HEVC_INDEX_SLICE_BLA_N_LP = - Constants.DemuxScHevcIndex.SLICE_BLA_N_LP; + public static final int SC_HEVC_INDEX_SLICE_BLA_N_LP = DemuxScHevcIndex.SLICE_BLA_N_LP; /** * SC HEVC index SLICE_IDR_W_RADL. */ - public static final int SC_HEVC_INDEX_SLICE_IDR_W_RADL = - Constants.DemuxScHevcIndex.SLICE_IDR_W_RADL; + public static final int SC_HEVC_INDEX_SLICE_IDR_W_RADL = DemuxScHevcIndex.SLICE_IDR_W_RADL; /** * SC HEVC index SLICE_IDR_N_LP. */ - public static final int SC_HEVC_INDEX_SLICE_IDR_N_LP = - Constants.DemuxScHevcIndex.SLICE_IDR_N_LP; + public static final int SC_HEVC_INDEX_SLICE_IDR_N_LP = DemuxScHevcIndex.SLICE_IDR_N_LP; /** * SC HEVC index SLICE_TRAIL_CRA. */ - public static final int SC_HEVC_INDEX_SLICE_TRAIL_CRA = - Constants.DemuxScHevcIndex.SLICE_TRAIL_CRA; + public static final int SC_HEVC_INDEX_SLICE_TRAIL_CRA = DemuxScHevcIndex.SLICE_TRAIL_CRA; /** * @hide diff --git a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java index b2c3fd243de01..768f1d389a32d 100644 --- a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java @@ -20,7 +20,9 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendAnalogAftFlag; +import android.hardware.tv.tuner.FrontendAnalogSifStandard; +import android.hardware.tv.tuner.FrontendAnalogType; import android.media.tv.tuner.TunerVersionChecker; import java.lang.annotation.Retention; @@ -45,39 +47,39 @@ public class AnalogFrontendSettings extends FrontendSettings { /** * Undefined analog signal type. */ - public static final int SIGNAL_TYPE_UNDEFINED = Constants.FrontendAnalogType.UNDEFINED; + public static final int SIGNAL_TYPE_UNDEFINED = FrontendAnalogType.UNDEFINED; /** * AUTO analog signal type. */ - public static final int SIGNAL_TYPE_AUTO = Constants.FrontendAnalogType.AUTO; + public static final int SIGNAL_TYPE_AUTO = FrontendAnalogType.AUTO; /** * PAL analog signal type. */ - public static final int SIGNAL_TYPE_PAL = Constants.FrontendAnalogType.PAL; + public static final int SIGNAL_TYPE_PAL = FrontendAnalogType.PAL; /** * PAL M analog signal type. */ - public static final int SIGNAL_TYPE_PAL_M = Constants.FrontendAnalogType.PAL_M; + public static final int SIGNAL_TYPE_PAL_M = FrontendAnalogType.PAL_M; /** * PAL N analog signal type. */ - public static final int SIGNAL_TYPE_PAL_N = Constants.FrontendAnalogType.PAL_N; + public static final int SIGNAL_TYPE_PAL_N = FrontendAnalogType.PAL_N; /** * PAL 60 analog signal type. */ - public static final int SIGNAL_TYPE_PAL_60 = Constants.FrontendAnalogType.PAL_60; + public static final int SIGNAL_TYPE_PAL_60 = FrontendAnalogType.PAL_60; /** * NTSC analog signal type. */ - public static final int SIGNAL_TYPE_NTSC = Constants.FrontendAnalogType.NTSC; + public static final int SIGNAL_TYPE_NTSC = FrontendAnalogType.NTSC; /** * NTSC 443 analog signal type. */ - public static final int SIGNAL_TYPE_NTSC_443 = Constants.FrontendAnalogType.NTSC_443; + public static final int SIGNAL_TYPE_NTSC_443 = FrontendAnalogType.NTSC_443; /** * SECM analog signal type. */ - public static final int SIGNAL_TYPE_SECAM = Constants.FrontendAnalogType.SECAM; + public static final int SIGNAL_TYPE_SECAM = FrontendAnalogType.SECAM; /** @hide */ @IntDef(flag = true, @@ -91,79 +93,79 @@ public class AnalogFrontendSettings extends FrontendSettings { /** * Undefined Analog Standard Interchange Format (SIF). */ - public static final int SIF_UNDEFINED = Constants.FrontendAnalogSifStandard.UNDEFINED; + public static final int SIF_UNDEFINED = FrontendAnalogSifStandard.UNDEFINED; /** * Audo Analog Standard Interchange Format (SIF). */ - public static final int SIF_AUTO = Constants.FrontendAnalogSifStandard.AUTO; + public static final int SIF_AUTO = FrontendAnalogSifStandard.AUTO; /** * BG Analog Standard Interchange Format (SIF). */ - public static final int SIF_BG = Constants.FrontendAnalogSifStandard.BG; + public static final int SIF_BG = FrontendAnalogSifStandard.BG; /** * BG-A2 Analog Standard Interchange Format (SIF). */ - public static final int SIF_BG_A2 = Constants.FrontendAnalogSifStandard.BG_A2; + public static final int SIF_BG_A2 = FrontendAnalogSifStandard.BG_A2; /** * BG-NICAM Analog Standard Interchange Format (SIF). */ - public static final int SIF_BG_NICAM = Constants.FrontendAnalogSifStandard.BG_NICAM; + public static final int SIF_BG_NICAM = FrontendAnalogSifStandard.BG_NICAM; /** * I Analog Standard Interchange Format (SIF). */ - public static final int SIF_I = Constants.FrontendAnalogSifStandard.I; + public static final int SIF_I = FrontendAnalogSifStandard.I; /** * DK Analog Standard Interchange Format (SIF). */ - public static final int SIF_DK = Constants.FrontendAnalogSifStandard.DK; + public static final int SIF_DK = FrontendAnalogSifStandard.DK; /** * DK1 A2 Analog Standard Interchange Format (SIF). */ - public static final int SIF_DK1_A2 = Constants.FrontendAnalogSifStandard.DK1_A2; + public static final int SIF_DK1_A2 = FrontendAnalogSifStandard.DK1_A2; /** * DK2 A2 Analog Standard Interchange Format (SIF). */ - public static final int SIF_DK2_A2 = Constants.FrontendAnalogSifStandard.DK2_A2; + public static final int SIF_DK2_A2 = FrontendAnalogSifStandard.DK2_A2; /** * DK3 A2 Analog Standard Interchange Format (SIF). */ - public static final int SIF_DK3_A2 = Constants.FrontendAnalogSifStandard.DK3_A2; + public static final int SIF_DK3_A2 = FrontendAnalogSifStandard.DK3_A2; /** * DK-NICAM Analog Standard Interchange Format (SIF). */ - public static final int SIF_DK_NICAM = Constants.FrontendAnalogSifStandard.DK_NICAM; + public static final int SIF_DK_NICAM = FrontendAnalogSifStandard.DK_NICAM; /** * L Analog Standard Interchange Format (SIF). */ - public static final int SIF_L = Constants.FrontendAnalogSifStandard.L; + public static final int SIF_L = FrontendAnalogSifStandard.L; /** * M Analog Standard Interchange Format (SIF). */ - public static final int SIF_M = Constants.FrontendAnalogSifStandard.M; + public static final int SIF_M = FrontendAnalogSifStandard.M; /** * M-BTSC Analog Standard Interchange Format (SIF). */ - public static final int SIF_M_BTSC = Constants.FrontendAnalogSifStandard.M_BTSC; + public static final int SIF_M_BTSC = FrontendAnalogSifStandard.M_BTSC; /** * M-A2 Analog Standard Interchange Format (SIF). */ - public static final int SIF_M_A2 = Constants.FrontendAnalogSifStandard.M_A2; + public static final int SIF_M_A2 = FrontendAnalogSifStandard.M_A2; /** * M-EIAJ Analog Standard Interchange Format (SIF). */ - public static final int SIF_M_EIAJ = Constants.FrontendAnalogSifStandard.M_EIAJ; + public static final int SIF_M_EIAJ = FrontendAnalogSifStandard.M_EIAJ; /** * I-NICAM Analog Standard Interchange Format (SIF). */ - public static final int SIF_I_NICAM = Constants.FrontendAnalogSifStandard.I_NICAM; + public static final int SIF_I_NICAM = FrontendAnalogSifStandard.I_NICAM; /** * L-NICAM Analog Standard Interchange Format (SIF). */ - public static final int SIF_L_NICAM = Constants.FrontendAnalogSifStandard.L_NICAM; + public static final int SIF_L_NICAM = FrontendAnalogSifStandard.L_NICAM; /** * L-PRIME Analog Standard Interchange Format (SIF). */ - public static final int SIF_L_PRIME = Constants.FrontendAnalogSifStandard.L_PRIME; + public static final int SIF_L_PRIME = FrontendAnalogSifStandard.L_PRIME; /** @hide */ @IntDef(prefix = "AFT_FLAG_", @@ -174,18 +176,15 @@ public class AnalogFrontendSettings extends FrontendSettings { /** * Aft flag is not defined. */ - public static final int AFT_FLAG_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendAnalogAftFlag.UNDEFINED; + public static final int AFT_FLAG_UNDEFINED = FrontendAnalogAftFlag.UNDEFINED; /** * Aft flag is set true. */ - public static final int AFT_FLAG_TRUE = - android.hardware.tv.tuner.V1_1.Constants.FrontendAnalogAftFlag.AFT_TRUE; + public static final int AFT_FLAG_TRUE = FrontendAnalogAftFlag.AFT_TRUE; /** * Aft flag is not set. */ - public static final int AFT_FLAG_FALSE = - android.hardware.tv.tuner.V1_1.Constants.FrontendAnalogAftFlag.AFT_FALSE; + public static final int AFT_FLAG_FALSE = FrontendAnalogAftFlag.AFT_FALSE; private final int mSignalType; diff --git a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java index ed1ce2d6a566b..52a20cb8b8154 100644 --- a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java @@ -20,7 +20,12 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendAtsc3Bandwidth; +import android.hardware.tv.tuner.FrontendAtsc3CodeRate; +import android.hardware.tv.tuner.FrontendAtsc3DemodOutputFormat; +import android.hardware.tv.tuner.FrontendAtsc3Fec; +import android.hardware.tv.tuner.FrontendAtsc3Modulation; +import android.hardware.tv.tuner.FrontendAtsc3TimeInterleaveMode; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -44,27 +49,23 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** * Bandwidth not defined. */ - public static final int BANDWIDTH_UNDEFINED = - Constants.FrontendAtsc3Bandwidth.UNDEFINED; + public static final int BANDWIDTH_UNDEFINED = FrontendAtsc3Bandwidth.UNDEFINED; /** * Hardware is able to detect and set bandwidth automatically */ - public static final int BANDWIDTH_AUTO = Constants.FrontendAtsc3Bandwidth.AUTO; + public static final int BANDWIDTH_AUTO = FrontendAtsc3Bandwidth.AUTO; /** * 6 MHz bandwidth. */ - public static final int BANDWIDTH_BANDWIDTH_6MHZ = - Constants.FrontendAtsc3Bandwidth.BANDWIDTH_6MHZ; + public static final int BANDWIDTH_BANDWIDTH_6MHZ = FrontendAtsc3Bandwidth.BANDWIDTH_6MHZ; /** * 7 MHz bandwidth. */ - public static final int BANDWIDTH_BANDWIDTH_7MHZ = - Constants.FrontendAtsc3Bandwidth.BANDWIDTH_7MHZ; + public static final int BANDWIDTH_BANDWIDTH_7MHZ = FrontendAtsc3Bandwidth.BANDWIDTH_7MHZ; /** * 8 MHz bandwidth. */ - public static final int BANDWIDTH_BANDWIDTH_8MHZ = - Constants.FrontendAtsc3Bandwidth.BANDWIDTH_8MHZ; + public static final int BANDWIDTH_BANDWIDTH_8MHZ = FrontendAtsc3Bandwidth.BANDWIDTH_8MHZ; /** @hide */ @@ -80,35 +81,35 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** * Modulation undefined. */ - public static final int MODULATION_UNDEFINED = Constants.FrontendAtsc3Modulation.UNDEFINED; + public static final int MODULATION_UNDEFINED = FrontendAtsc3Modulation.UNDEFINED; /** * Hardware is able to detect and set modulation automatically. */ - public static final int MODULATION_AUTO = Constants.FrontendAtsc3Modulation.AUTO; + public static final int MODULATION_AUTO = FrontendAtsc3Modulation.AUTO; /** * QPSK modulation. */ - public static final int MODULATION_MOD_QPSK = Constants.FrontendAtsc3Modulation.MOD_QPSK; + public static final int MODULATION_MOD_QPSK = FrontendAtsc3Modulation.MOD_QPSK; /** * 16QAM modulation. */ - public static final int MODULATION_MOD_16QAM = Constants.FrontendAtsc3Modulation.MOD_16QAM; + public static final int MODULATION_MOD_16QAM = FrontendAtsc3Modulation.MOD_16QAM; /** * 64QAM modulation. */ - public static final int MODULATION_MOD_64QAM = Constants.FrontendAtsc3Modulation.MOD_64QAM; + public static final int MODULATION_MOD_64QAM = FrontendAtsc3Modulation.MOD_64QAM; /** * 256QAM modulation. */ - public static final int MODULATION_MOD_256QAM = Constants.FrontendAtsc3Modulation.MOD_256QAM; + public static final int MODULATION_MOD_256QAM = FrontendAtsc3Modulation.MOD_256QAM; /** * 1024QAM modulation. */ - public static final int MODULATION_MOD_1024QAM = Constants.FrontendAtsc3Modulation.MOD_1024QAM; + public static final int MODULATION_MOD_1024QAM = FrontendAtsc3Modulation.MOD_1024QAM; /** * 4096QAM modulation. */ - public static final int MODULATION_MOD_4096QAM = Constants.FrontendAtsc3Modulation.MOD_4096QAM; + public static final int MODULATION_MOD_4096QAM = FrontendAtsc3Modulation.MOD_4096QAM; /** @hide */ @@ -123,22 +124,19 @@ public class Atsc3FrontendSettings extends FrontendSettings { * Time interleave mode undefined. */ public static final int TIME_INTERLEAVE_MODE_UNDEFINED = - Constants.FrontendAtsc3TimeInterleaveMode.UNDEFINED; + FrontendAtsc3TimeInterleaveMode.UNDEFINED; /** * Hardware is able to detect and set Time Interleave Mode automatically. */ - public static final int TIME_INTERLEAVE_MODE_AUTO = - Constants.FrontendAtsc3TimeInterleaveMode.AUTO; + public static final int TIME_INTERLEAVE_MODE_AUTO = FrontendAtsc3TimeInterleaveMode.AUTO; /** * CTI Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_CTI = - Constants.FrontendAtsc3TimeInterleaveMode.CTI; + public static final int TIME_INTERLEAVE_MODE_CTI = FrontendAtsc3TimeInterleaveMode.CTI; /** * HTI Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_HTI = - Constants.FrontendAtsc3TimeInterleaveMode.HTI; + public static final int TIME_INTERLEAVE_MODE_HTI = FrontendAtsc3TimeInterleaveMode.HTI; /** @hide */ @@ -153,59 +151,59 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** * Code rate undefined. */ - public static final int CODERATE_UNDEFINED = Constants.FrontendAtsc3CodeRate.UNDEFINED; + public static final int CODERATE_UNDEFINED = FrontendAtsc3CodeRate.UNDEFINED; /** * Hardware is able to detect and set code rate automatically */ - public static final int CODERATE_AUTO = Constants.FrontendAtsc3CodeRate.AUTO; + public static final int CODERATE_AUTO = FrontendAtsc3CodeRate.AUTO; /** * 2/15 code rate. */ - public static final int CODERATE_2_15 = Constants.FrontendAtsc3CodeRate.CODERATE_2_15; + public static final int CODERATE_2_15 = FrontendAtsc3CodeRate.CODERATE_2_15; /** * 3/15 code rate. */ - public static final int CODERATE_3_15 = Constants.FrontendAtsc3CodeRate.CODERATE_3_15; + public static final int CODERATE_3_15 = FrontendAtsc3CodeRate.CODERATE_3_15; /** * 4/15 code rate. */ - public static final int CODERATE_4_15 = Constants.FrontendAtsc3CodeRate.CODERATE_4_15; + public static final int CODERATE_4_15 = FrontendAtsc3CodeRate.CODERATE_4_15; /** * 5/15 code rate. */ - public static final int CODERATE_5_15 = Constants.FrontendAtsc3CodeRate.CODERATE_5_15; + public static final int CODERATE_5_15 = FrontendAtsc3CodeRate.CODERATE_5_15; /** * 6/15 code rate. */ - public static final int CODERATE_6_15 = Constants.FrontendAtsc3CodeRate.CODERATE_6_15; + public static final int CODERATE_6_15 = FrontendAtsc3CodeRate.CODERATE_6_15; /** * 7/15 code rate. */ - public static final int CODERATE_7_15 = Constants.FrontendAtsc3CodeRate.CODERATE_7_15; + public static final int CODERATE_7_15 = FrontendAtsc3CodeRate.CODERATE_7_15; /** * 8/15 code rate. */ - public static final int CODERATE_8_15 = Constants.FrontendAtsc3CodeRate.CODERATE_8_15; + public static final int CODERATE_8_15 = FrontendAtsc3CodeRate.CODERATE_8_15; /** * 9/15 code rate. */ - public static final int CODERATE_9_15 = Constants.FrontendAtsc3CodeRate.CODERATE_9_15; + public static final int CODERATE_9_15 = FrontendAtsc3CodeRate.CODERATE_9_15; /** * 10/15 code rate. */ - public static final int CODERATE_10_15 = Constants.FrontendAtsc3CodeRate.CODERATE_10_15; + public static final int CODERATE_10_15 = FrontendAtsc3CodeRate.CODERATE_10_15; /** * 11/15 code rate. */ - public static final int CODERATE_11_15 = Constants.FrontendAtsc3CodeRate.CODERATE_11_15; + public static final int CODERATE_11_15 = FrontendAtsc3CodeRate.CODERATE_11_15; /** * 12/15 code rate. */ - public static final int CODERATE_12_15 = Constants.FrontendAtsc3CodeRate.CODERATE_12_15; + public static final int CODERATE_12_15 = FrontendAtsc3CodeRate.CODERATE_12_15; /** * 13/15 code rate. */ - public static final int CODERATE_13_15 = Constants.FrontendAtsc3CodeRate.CODERATE_13_15; + public static final int CODERATE_13_15 = FrontendAtsc3CodeRate.CODERATE_13_15; /** @hide */ @@ -219,35 +217,35 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** * Forward Error Correction undefined. */ - public static final int FEC_UNDEFINED = Constants.FrontendAtsc3Fec.UNDEFINED; + public static final int FEC_UNDEFINED = FrontendAtsc3Fec.UNDEFINED; /** * Hardware is able to detect and set FEC automatically */ - public static final int FEC_AUTO = Constants.FrontendAtsc3Fec.AUTO; + public static final int FEC_AUTO = FrontendAtsc3Fec.AUTO; /** * BCH LDPC 16K Forward Error Correction */ - public static final int FEC_BCH_LDPC_16K = Constants.FrontendAtsc3Fec.BCH_LDPC_16K; + public static final int FEC_BCH_LDPC_16K = FrontendAtsc3Fec.BCH_LDPC_16K; /** * BCH LDPC 64K Forward Error Correction */ - public static final int FEC_BCH_LDPC_64K = Constants.FrontendAtsc3Fec.BCH_LDPC_64K; + public static final int FEC_BCH_LDPC_64K = FrontendAtsc3Fec.BCH_LDPC_64K; /** * CRC LDPC 16K Forward Error Correction */ - public static final int FEC_CRC_LDPC_16K = Constants.FrontendAtsc3Fec.CRC_LDPC_16K; + public static final int FEC_CRC_LDPC_16K = FrontendAtsc3Fec.CRC_LDPC_16K; /** * CRC LDPC 64K Forward Error Correction */ - public static final int FEC_CRC_LDPC_64K = Constants.FrontendAtsc3Fec.CRC_LDPC_64K; + public static final int FEC_CRC_LDPC_64K = FrontendAtsc3Fec.CRC_LDPC_64K; /** * LDPC 16K Forward Error Correction */ - public static final int FEC_LDPC_16K = Constants.FrontendAtsc3Fec.LDPC_16K; + public static final int FEC_LDPC_16K = FrontendAtsc3Fec.LDPC_16K; /** * LDPC 64K Forward Error Correction */ - public static final int FEC_LDPC_64K = Constants.FrontendAtsc3Fec.LDPC_64K; + public static final int FEC_LDPC_64K = FrontendAtsc3Fec.LDPC_64K; /** @hide */ @@ -262,17 +260,17 @@ public class Atsc3FrontendSettings extends FrontendSettings { * Demod output format undefined. */ public static final int DEMOD_OUTPUT_FORMAT_UNDEFINED = - Constants.FrontendAtsc3DemodOutputFormat.UNDEFINED; + FrontendAtsc3DemodOutputFormat.UNDEFINED; /** * ALP format. Typically used in US region. */ public static final int DEMOD_OUTPUT_FORMAT_ATSC3_LINKLAYER_PACKET = - Constants.FrontendAtsc3DemodOutputFormat.ATSC3_LINKLAYER_PACKET; + FrontendAtsc3DemodOutputFormat.ATSC3_LINKLAYER_PACKET; /** * BaseBand packet format. Typically used in Korea region. */ public static final int DEMOD_OUTPUT_FORMAT_BASEBAND_PACKET = - Constants.FrontendAtsc3DemodOutputFormat.BASEBAND_PACKET; + FrontendAtsc3DemodOutputFormat.BASEBAND_PACKET; private final int mBandwidth; private final int mDemodOutputFormat; diff --git a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java index f7244bbdf9518..042bba890d229 100644 --- a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java @@ -20,7 +20,7 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendAtscModulation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -44,19 +44,19 @@ public class AtscFrontendSettings extends FrontendSettings { /** * Modulation undefined. */ - public static final int MODULATION_UNDEFINED = Constants.FrontendAtscModulation.UNDEFINED; + public static final int MODULATION_UNDEFINED = FrontendAtscModulation.UNDEFINED; /** * Hardware is able to detect and set modulation automatically */ - public static final int MODULATION_AUTO = Constants.FrontendAtscModulation.AUTO; + public static final int MODULATION_AUTO = FrontendAtscModulation.AUTO; /** * 8VSB Modulation. */ - public static final int MODULATION_MOD_8VSB = Constants.FrontendAtscModulation.MOD_8VSB; + public static final int MODULATION_MOD_8VSB = FrontendAtscModulation.MOD_8VSB; /** * 16VSB Modulation. */ - public static final int MODULATION_MOD_16VSB = Constants.FrontendAtscModulation.MOD_16VSB; + public static final int MODULATION_MOD_16VSB = FrontendAtscModulation.MOD_16VSB; private final int mModulation; diff --git a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java index c1d08339c6906..9ba41d5e18519 100644 --- a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java @@ -21,6 +21,12 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SuppressLint; import android.annotation.SystemApi; +import android.hardware.tv.tuner.FrontendDtmbBandwidth; +import android.hardware.tv.tuner.FrontendDtmbCodeRate; +import android.hardware.tv.tuner.FrontendDtmbGuardInterval; +import android.hardware.tv.tuner.FrontendDtmbModulation; +import android.hardware.tv.tuner.FrontendDtmbTimeInterleaveMode; +import android.hardware.tv.tuner.FrontendDtmbTransmissionMode; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -46,23 +52,19 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** * Bandwidth not defined. */ - public static final int BANDWIDTH_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbBandwidth.UNDEFINED; + public static final int BANDWIDTH_UNDEFINED = FrontendDtmbBandwidth.UNDEFINED; /** * Hardware is able to detect and set bandwidth automatically */ - public static final int BANDWIDTH_AUTO = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbBandwidth.AUTO; + public static final int BANDWIDTH_AUTO = FrontendDtmbBandwidth.AUTO; /** * 6 MHz bandwidth. */ - public static final int BANDWIDTH_6MHZ = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbBandwidth.BANDWIDTH_6MHZ; + public static final int BANDWIDTH_6MHZ = FrontendDtmbBandwidth.BANDWIDTH_6MHZ; /** * 8 MHz bandwidth. */ - public static final int BANDWIDTH_8MHZ = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbBandwidth.BANDWIDTH_8MHZ; + public static final int BANDWIDTH_8MHZ = FrontendDtmbBandwidth.BANDWIDTH_8MHZ; /** @hide */ @@ -77,22 +79,21 @@ public final class DtmbFrontendSettings extends FrontendSettings { * Time Interleave Mode undefined. */ public static final int TIME_INTERLEAVE_MODE_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTimeInterleaveMode.UNDEFINED; + FrontendDtmbTimeInterleaveMode.UNDEFINED; /** * Hardware is able to detect and set time interleave mode automatically */ - public static final int TIME_INTERLEAVE_MODE_AUTO = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTimeInterleaveMode.AUTO; + public static final int TIME_INTERLEAVE_MODE_AUTO = FrontendDtmbTimeInterleaveMode.AUTO; /** * Time Interleave Mode timer int 240. */ public static final int TIME_INTERLEAVE_MODE_TIMER_INT_240 = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTimeInterleaveMode.TIMER_INT_240; + FrontendDtmbTimeInterleaveMode.TIMER_INT_240; /** * Time Interleave Mode timer int 720. */ public static final int TIME_INTERLEAVE_MODE_TIMER_INT_720 = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTimeInterleaveMode.TIMER_INT_720; + FrontendDtmbTimeInterleaveMode.TIMER_INT_720; /** @hide */ @@ -108,43 +109,37 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** * Guard Interval undefined. */ - public static final int GUARD_INTERVAL_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.UNDEFINED; + public static final int GUARD_INTERVAL_UNDEFINED = FrontendDtmbGuardInterval.UNDEFINED; /** * Hardware is able to detect and set Guard Interval automatically. */ - public static final int GUARD_INTERVAL_AUTO = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.AUTO; + public static final int GUARD_INTERVAL_AUTO = FrontendDtmbGuardInterval.AUTO; /** * PN_420_VARIOUS Guard Interval. */ public static final int GUARD_INTERVAL_PN_420_VARIOUS = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.PN_420_VARIOUS; + FrontendDtmbGuardInterval.PN_420_VARIOUS; /** * PN_595_CONST Guard Interval. */ - public static final int GUARD_INTERVAL_PN_595_CONST = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.PN_595_CONST; + public static final int GUARD_INTERVAL_PN_595_CONST = FrontendDtmbGuardInterval.PN_595_CONST; /** * PN_945_VARIOUS Guard Interval. */ public static final int GUARD_INTERVAL_PN_945_VARIOUS = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.PN_945_VARIOUS; + FrontendDtmbGuardInterval.PN_945_VARIOUS; /** * PN_420_CONST Guard Interval. */ - public static final int GUARD_INTERVAL_PN_420_CONST = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.PN_420_CONST; + public static final int GUARD_INTERVAL_PN_420_CONST = FrontendDtmbGuardInterval.PN_420_CONST; /** * PN_945_CONST Guard Interval. */ - public static final int GUARD_INTERVAL_PN_945_CONST = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.PN_945_CONST; + public static final int GUARD_INTERVAL_PN_945_CONST = FrontendDtmbGuardInterval.PN_945_CONST; /** * PN_RESERVED Guard Interval. */ - public static final int GUARD_INTERVAL_PN_RESERVED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbGuardInterval.PN_RESERVED; + public static final int GUARD_INTERVAL_PN_RESERVED = FrontendDtmbGuardInterval.PN_RESERVED; /** @hide */ @@ -160,38 +155,36 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** * Constellation not defined. */ - public static final int MODULATION_CONSTELLATION_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbModulation.UNDEFINED; + public static final int MODULATION_CONSTELLATION_UNDEFINED = FrontendDtmbModulation.UNDEFINED; /** * Hardware is able to detect and set Constellation automatically. */ - public static final int MODULATION_CONSTELLATION_AUTO = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbModulation.AUTO; + public static final int MODULATION_CONSTELLATION_AUTO = FrontendDtmbModulation.AUTO; /** * 4QAM Constellation. */ public static final int MODULATION_CONSTELLATION_4QAM = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbModulation.CONSTELLATION_4QAM; + FrontendDtmbModulation.CONSTELLATION_4QAM; /** * 4QAM_NR Constellation. */ public static final int MODULATION_CONSTELLATION_4QAM_NR = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbModulation.CONSTELLATION_4QAM_NR; + FrontendDtmbModulation.CONSTELLATION_4QAM_NR; /** * 16QAM Constellation. */ public static final int MODULATION_CONSTELLATION_16QAM = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbModulation.CONSTELLATION_16QAM; + FrontendDtmbModulation.CONSTELLATION_16QAM; /** * 32QAM Constellation. */ public static final int MODULATION_CONSTELLATION_32QAM = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbModulation.CONSTELLATION_32QAM; + FrontendDtmbModulation.CONSTELLATION_32QAM; /** * 64QAM Constellation. */ public static final int MODULATION_CONSTELLATION_64QAM = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbModulation.CONSTELLATION_64QAM; + FrontendDtmbModulation.CONSTELLATION_64QAM; /** @hide */ @IntDef(flag = true, @@ -203,28 +196,23 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** * Code rate undefined. */ - public static final int CODERATE_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbCodeRate.UNDEFINED; + public static final int CODERATE_UNDEFINED = FrontendDtmbCodeRate.UNDEFINED; /** * Hardware is able to detect and set code rate automatically. */ - public static final int CODERATE_AUTO = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbCodeRate.AUTO; + public static final int CODERATE_AUTO = FrontendDtmbCodeRate.AUTO; /** * 2/5 code rate. */ - public static final int CODERATE_2_5 = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbCodeRate.CODERATE_2_5; + public static final int CODERATE_2_5 = FrontendDtmbCodeRate.CODERATE_2_5; /** * 3/5 code rate. */ - public static final int CODERATE_3_5 = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbCodeRate.CODERATE_3_5; + public static final int CODERATE_3_5 = FrontendDtmbCodeRate.CODERATE_3_5; /** * 4/5 code rate. */ - public static final int CODERATE_4_5 = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbCodeRate.CODERATE_4_5; + public static final int CODERATE_4_5 = FrontendDtmbCodeRate.CODERATE_4_5; /** @hide */ @IntDef(flag = true, @@ -237,23 +225,19 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** * Transmission Mode undefined. */ - public static final int TRANSMISSION_MODE_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTransmissionMode.UNDEFINED; + public static final int TRANSMISSION_MODE_UNDEFINED = FrontendDtmbTransmissionMode.UNDEFINED; /** * Hardware is able to detect and set Transmission Mode automatically */ - public static final int TRANSMISSION_MODE_AUTO = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTransmissionMode.AUTO; + public static final int TRANSMISSION_MODE_AUTO = FrontendDtmbTransmissionMode.AUTO; /** * C1 Transmission Mode. */ - public static final int TRANSMISSION_MODE_C1 = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTransmissionMode.C1; + public static final int TRANSMISSION_MODE_C1 = FrontendDtmbTransmissionMode.C1; /** * C3780 Transmission Mode. */ - public static final int TRANSMISSION_MODE_C3780 = - android.hardware.tv.tuner.V1_1.Constants.FrontendDtmbTransmissionMode.C3780; + public static final int TRANSMISSION_MODE_C3780 = FrontendDtmbTransmissionMode.C3780; private final int mModulation; diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index db28631fe06c8..b209d97feee5a 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -20,7 +20,11 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendCableTimeInterleaveMode; +import android.hardware.tv.tuner.FrontendDvbcAnnex; +import android.hardware.tv.tuner.FrontendDvbcBandwidth; +import android.hardware.tv.tuner.FrontendDvbcModulation; +import android.hardware.tv.tuner.FrontendDvbcOuterFec; import android.media.tv.tuner.TunerVersionChecker; import android.media.tv.tuner.frontend.FrontendSettings.FrontendSpectralInversion; @@ -47,31 +51,31 @@ public class DvbcFrontendSettings extends FrontendSettings { /** * Modulation undefined. */ - public static final int MODULATION_UNDEFINED = Constants.FrontendDvbcModulation.UNDEFINED; + public static final int MODULATION_UNDEFINED = FrontendDvbcModulation.UNDEFINED; /** * Hardware is able to detect and set modulation automatically */ - public static final int MODULATION_AUTO = Constants.FrontendDvbcModulation.AUTO; + public static final int MODULATION_AUTO = FrontendDvbcModulation.AUTO; /** * 16QAM Modulation. */ - public static final int MODULATION_MOD_16QAM = Constants.FrontendDvbcModulation.MOD_16QAM; + public static final int MODULATION_MOD_16QAM = FrontendDvbcModulation.MOD_16QAM; /** * 32QAM Modulation. */ - public static final int MODULATION_MOD_32QAM = Constants.FrontendDvbcModulation.MOD_32QAM; + public static final int MODULATION_MOD_32QAM = FrontendDvbcModulation.MOD_32QAM; /** * 64QAM Modulation. */ - public static final int MODULATION_MOD_64QAM = Constants.FrontendDvbcModulation.MOD_64QAM; + public static final int MODULATION_MOD_64QAM = FrontendDvbcModulation.MOD_64QAM; /** * 128QAM Modulation. */ - public static final int MODULATION_MOD_128QAM = Constants.FrontendDvbcModulation.MOD_128QAM; + public static final int MODULATION_MOD_128QAM = FrontendDvbcModulation.MOD_128QAM; /** * 256QAM Modulation. */ - public static final int MODULATION_MOD_256QAM = Constants.FrontendDvbcModulation.MOD_256QAM; + public static final int MODULATION_MOD_256QAM = FrontendDvbcModulation.MOD_256QAM; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -82,16 +86,15 @@ public class DvbcFrontendSettings extends FrontendSettings { /** * Outer Forward Error Correction (FEC) Type undefined. */ - public static final int OUTER_FEC_UNDEFINED = Constants.FrontendDvbcOuterFec.UNDEFINED; + public static final int OUTER_FEC_UNDEFINED = FrontendDvbcOuterFec.UNDEFINED; /** * None Outer Forward Error Correction (FEC) Type. */ - public static final int OUTER_FEC_OUTER_FEC_NONE = - Constants.FrontendDvbcOuterFec.OUTER_FEC_NONE; + public static final int OUTER_FEC_OUTER_FEC_NONE = FrontendDvbcOuterFec.OUTER_FEC_NONE; /** * RS Outer Forward Error Correction (FEC) Type. */ - public static final int OUTER_FEC_OUTER_FEC_RS = Constants.FrontendDvbcOuterFec.OUTER_FEC_RS; + public static final int OUTER_FEC_OUTER_FEC_RS = FrontendDvbcOuterFec.OUTER_FEC_RS; /** @hide */ @@ -104,19 +107,19 @@ public class DvbcFrontendSettings extends FrontendSettings { /** * Annex Type undefined. */ - public static final int ANNEX_UNDEFINED = Constants.FrontendDvbcAnnex.UNDEFINED; + public static final int ANNEX_UNDEFINED = FrontendDvbcAnnex.UNDEFINED; /** * Annex Type A. */ - public static final int ANNEX_A = Constants.FrontendDvbcAnnex.A; + public static final int ANNEX_A = FrontendDvbcAnnex.A; /** * Annex Type B. */ - public static final int ANNEX_B = Constants.FrontendDvbcAnnex.B; + public static final int ANNEX_B = FrontendDvbcAnnex.B; /** * Annex Type C. */ - public static final int ANNEX_C = Constants.FrontendDvbcAnnex.C; + public static final int ANNEX_C = FrontendDvbcAnnex.C; /** @@ -137,7 +140,7 @@ public class DvbcFrontendSettings extends FrontendSettings { */ @Deprecated public static final int SPECTRAL_INVERSION_UNDEFINED = - Constants.FrontendDvbcSpectralInversion.UNDEFINED; + android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED; /** * Normal Spectral Inversion. * @@ -145,7 +148,7 @@ public class DvbcFrontendSettings extends FrontendSettings { */ @Deprecated public static final int SPECTRAL_INVERSION_NORMAL = - Constants.FrontendDvbcSpectralInversion.NORMAL; + android.hardware.tv.tuner.FrontendSpectralInversion.NORMAL; /** * Inverted Spectral Inversion. * @@ -153,7 +156,7 @@ public class DvbcFrontendSettings extends FrontendSettings { */ @Deprecated public static final int SPECTRAL_INVERSION_INVERTED = - Constants.FrontendDvbcSpectralInversion.INVERTED; + android.hardware.tv.tuner.FrontendSpectralInversion.INVERTED; /** @hide */ @IntDef(flag = true, @@ -171,57 +174,56 @@ public class DvbcFrontendSettings extends FrontendSettings { * Time interleave mode undefined. */ public static final int TIME_INTERLEAVE_MODE_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendCableTimeInterleaveMode.UNDEFINED; + FrontendCableTimeInterleaveMode.UNDEFINED; /** * Hardware is able to detect and set Time Interleave Mode automatically. */ - public static final int TIME_INTERLEAVE_MODE_AUTO = - android.hardware.tv.tuner.V1_1.Constants.FrontendCableTimeInterleaveMode.AUTO; + public static final int TIME_INTERLEAVE_MODE_AUTO = FrontendCableTimeInterleaveMode.AUTO; /** * 128/1/0 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_128_1_0 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_128_1_0; + public static final int TIME_INTERLEAVE_MODE_128_1_0 = + FrontendCableTimeInterleaveMode.INTERLEAVING_128_1_0; /** * 128/1/1 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_128_1_1 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_128_1_1; + public static final int TIME_INTERLEAVE_MODE_128_1_1 = + FrontendCableTimeInterleaveMode.INTERLEAVING_128_1_1; /** * 64/2 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_64_2 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_64_2; + public static final int TIME_INTERLEAVE_MODE_64_2 = + FrontendCableTimeInterleaveMode.INTERLEAVING_64_2; /** * 32/4 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_32_4 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_32_4; + public static final int TIME_INTERLEAVE_MODE_32_4 = + FrontendCableTimeInterleaveMode.INTERLEAVING_32_4; /** * 16/8 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_16_8 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_16_8; + public static final int TIME_INTERLEAVE_MODE_16_8 = + FrontendCableTimeInterleaveMode.INTERLEAVING_16_8; /** * 8/16 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_8_16 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_8_16; + public static final int TIME_INTERLEAVE_MODE_8_16 = + FrontendCableTimeInterleaveMode.INTERLEAVING_8_16; /** * 128/2 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_128_2 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_128_2; + public static final int TIME_INTERLEAVE_MODE_128_2 = + FrontendCableTimeInterleaveMode.INTERLEAVING_128_2; /** * 128/3 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_128_3 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_128_3; + public static final int TIME_INTERLEAVE_MODE_128_3 = + FrontendCableTimeInterleaveMode.INTERLEAVING_128_3; /** * 128/4 Time Interleave Mode. */ - public static final int TIME_INTERLEAVE_MODE_128_4 = android.hardware.tv.tuner.V1_1.Constants - .FrontendCableTimeInterleaveMode.INTERLEAVING_128_4; + public static final int TIME_INTERLEAVE_MODE_128_4 = + FrontendCableTimeInterleaveMode.INTERLEAVING_128_4; /** @hide */ @IntDef(flag = true, @@ -234,28 +236,23 @@ public class DvbcFrontendSettings extends FrontendSettings { /** * Bandwidth undefined. */ - public static final int BANDWIDTH_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbcBandwidth.UNDEFINED; + public static final int BANDWIDTH_UNDEFINED = FrontendDvbcBandwidth.UNDEFINED; /** * 5 MHz bandwidth. */ - public static final int BANDWIDTH_5MHZ = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbcBandwidth.BANDWIDTH_5MHZ; + public static final int BANDWIDTH_5MHZ = FrontendDvbcBandwidth.BANDWIDTH_5MHZ; /** * 6 MHz bandwidth. */ - public static final int BANDWIDTH_6MHZ = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbcBandwidth.BANDWIDTH_6MHZ; + public static final int BANDWIDTH_6MHZ = FrontendDvbcBandwidth.BANDWIDTH_6MHZ; /** * 7 MHz bandwidth. */ - public static final int BANDWIDTH_7MHZ = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbcBandwidth.BANDWIDTH_7MHZ; + public static final int BANDWIDTH_7MHZ = FrontendDvbcBandwidth.BANDWIDTH_7MHZ; /** * 8 MHz bandwidth. */ - public static final int BANDWIDTH_8MHZ = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbcBandwidth.BANDWIDTH_8MHZ; + public static final int BANDWIDTH_8MHZ = FrontendDvbcBandwidth.BANDWIDTH_8MHZ; private final int mModulation; diff --git a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java index f68d554c50c21..6e3d98a11a2b9 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java @@ -21,7 +21,12 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendDvbsModulation; +import android.hardware.tv.tuner.FrontendDvbsPilot; +import android.hardware.tv.tuner.FrontendDvbsRolloff; +import android.hardware.tv.tuner.FrontendDvbsScanType; +import android.hardware.tv.tuner.FrontendDvbsStandard; +import android.hardware.tv.tuner.FrontendDvbsVcmMode; import android.media.tv.tuner.Tuner; import android.media.tv.tuner.TunerVersionChecker; @@ -47,32 +52,27 @@ public class DvbsFrontendSettings extends FrontendSettings { /** * Dvbs scan type undefined. */ - public static final int SCAN_TYPE_UNDEFINED = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbsScanType.UNDEFINED; + public static final int SCAN_TYPE_UNDEFINED = FrontendDvbsScanType.UNDEFINED; /** * Dvbs scan type DIRECT. */ - public static final int SCAN_TYPE_DIRECT = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbsScanType.DIRECT; + public static final int SCAN_TYPE_DIRECT = FrontendDvbsScanType.DIRECT; /** * Dvbs scan type DISEQC. */ - public static final int SCAN_TYPE_DISEQC = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbsScanType.DISEQC; + public static final int SCAN_TYPE_DISEQC = FrontendDvbsScanType.DISEQC; /** * Dvbs scan type UNICABLE. */ - public static final int SCAN_TYPE_UNICABLE = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbsScanType.UNICABLE; + public static final int SCAN_TYPE_UNICABLE = FrontendDvbsScanType.UNICABLE; /** * Dvbs scan type JESS. */ - public static final int SCAN_TYPE_JESS = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbsScanType.JESS; + public static final int SCAN_TYPE_JESS = FrontendDvbsScanType.JESS; /** @hide */ @IntDef(flag = true, @@ -88,63 +88,63 @@ public class DvbsFrontendSettings extends FrontendSettings { /** * Modulation undefined. */ - public static final int MODULATION_UNDEFINED = Constants.FrontendDvbsModulation.UNDEFINED; + public static final int MODULATION_UNDEFINED = FrontendDvbsModulation.UNDEFINED; /** * Hardware is able to detect and set modulation automatically */ - public static final int MODULATION_AUTO = Constants.FrontendDvbsModulation.AUTO; + public static final int MODULATION_AUTO = FrontendDvbsModulation.AUTO; /** * QPSK Modulation. */ - public static final int MODULATION_MOD_QPSK = Constants.FrontendDvbsModulation.MOD_QPSK; + public static final int MODULATION_MOD_QPSK = FrontendDvbsModulation.MOD_QPSK; /** * 8PSK Modulation. */ - public static final int MODULATION_MOD_8PSK = Constants.FrontendDvbsModulation.MOD_8PSK; + public static final int MODULATION_MOD_8PSK = FrontendDvbsModulation.MOD_8PSK; /** * 16QAM Modulation. */ - public static final int MODULATION_MOD_16QAM = Constants.FrontendDvbsModulation.MOD_16QAM; + public static final int MODULATION_MOD_16QAM = FrontendDvbsModulation.MOD_16QAM; /** * 16PSK Modulation. */ - public static final int MODULATION_MOD_16PSK = Constants.FrontendDvbsModulation.MOD_16PSK; + public static final int MODULATION_MOD_16PSK = FrontendDvbsModulation.MOD_16PSK; /** * 32PSK Modulation. */ - public static final int MODULATION_MOD_32PSK = Constants.FrontendDvbsModulation.MOD_32PSK; + public static final int MODULATION_MOD_32PSK = FrontendDvbsModulation.MOD_32PSK; /** * ACM Modulation. */ - public static final int MODULATION_MOD_ACM = Constants.FrontendDvbsModulation.MOD_ACM; + public static final int MODULATION_MOD_ACM = FrontendDvbsModulation.MOD_ACM; /** * 8APSK Modulation. */ - public static final int MODULATION_MOD_8APSK = Constants.FrontendDvbsModulation.MOD_8APSK; + public static final int MODULATION_MOD_8APSK = FrontendDvbsModulation.MOD_8APSK; /** * 16APSK Modulation. */ - public static final int MODULATION_MOD_16APSK = Constants.FrontendDvbsModulation.MOD_16APSK; + public static final int MODULATION_MOD_16APSK = FrontendDvbsModulation.MOD_16APSK; /** * 32APSK Modulation. */ - public static final int MODULATION_MOD_32APSK = Constants.FrontendDvbsModulation.MOD_32APSK; + public static final int MODULATION_MOD_32APSK = FrontendDvbsModulation.MOD_32APSK; /** * 64APSK Modulation. */ - public static final int MODULATION_MOD_64APSK = Constants.FrontendDvbsModulation.MOD_64APSK; + public static final int MODULATION_MOD_64APSK = FrontendDvbsModulation.MOD_64APSK; /** * 128APSK Modulation. */ - public static final int MODULATION_MOD_128APSK = Constants.FrontendDvbsModulation.MOD_128APSK; + public static final int MODULATION_MOD_128APSK = FrontendDvbsModulation.MOD_128APSK; /** * 256APSK Modulation. */ - public static final int MODULATION_MOD_256APSK = Constants.FrontendDvbsModulation.MOD_256APSK; + public static final int MODULATION_MOD_256APSK = FrontendDvbsModulation.MOD_256APSK; /** * Reversed Modulation. */ - public static final int MODULATION_MOD_RESERVED = Constants.FrontendDvbsModulation.MOD_RESERVED; + public static final int MODULATION_MOD_RESERVED = FrontendDvbsModulation.MOD_RESERVED; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -156,31 +156,31 @@ public class DvbsFrontendSettings extends FrontendSettings { /** * Rolloff range undefined. */ - public static final int ROLLOFF_UNDEFINED = Constants.FrontendDvbsRolloff.UNDEFINED; + public static final int ROLLOFF_UNDEFINED = FrontendDvbsRolloff.UNDEFINED; /** * Rolloff range 0,35. */ - public static final int ROLLOFF_0_35 = Constants.FrontendDvbsRolloff.ROLLOFF_0_35; + public static final int ROLLOFF_0_35 = FrontendDvbsRolloff.ROLLOFF_0_35; /** * Rolloff range 0,25. */ - public static final int ROLLOFF_0_25 = Constants.FrontendDvbsRolloff.ROLLOFF_0_25; + public static final int ROLLOFF_0_25 = FrontendDvbsRolloff.ROLLOFF_0_25; /** * Rolloff range 0,20. */ - public static final int ROLLOFF_0_20 = Constants.FrontendDvbsRolloff.ROLLOFF_0_20; + public static final int ROLLOFF_0_20 = FrontendDvbsRolloff.ROLLOFF_0_20; /** * Rolloff range 0,15. */ - public static final int ROLLOFF_0_15 = Constants.FrontendDvbsRolloff.ROLLOFF_0_15; + public static final int ROLLOFF_0_15 = FrontendDvbsRolloff.ROLLOFF_0_15; /** * Rolloff range 0,10. */ - public static final int ROLLOFF_0_10 = Constants.FrontendDvbsRolloff.ROLLOFF_0_10; + public static final int ROLLOFF_0_10 = FrontendDvbsRolloff.ROLLOFF_0_10; /** * Rolloff range 0,5. */ - public static final int ROLLOFF_0_5 = Constants.FrontendDvbsRolloff.ROLLOFF_0_5; + public static final int ROLLOFF_0_5 = FrontendDvbsRolloff.ROLLOFF_0_5; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -191,19 +191,19 @@ public class DvbsFrontendSettings extends FrontendSettings { /** * Pilot mode undefined. */ - public static final int PILOT_UNDEFINED = Constants.FrontendDvbsPilot.UNDEFINED; + public static final int PILOT_UNDEFINED = FrontendDvbsPilot.UNDEFINED; /** * Pilot mode on. */ - public static final int PILOT_ON = Constants.FrontendDvbsPilot.ON; + public static final int PILOT_ON = FrontendDvbsPilot.ON; /** * Pilot mode off. */ - public static final int PILOT_OFF = Constants.FrontendDvbsPilot.OFF; + public static final int PILOT_OFF = FrontendDvbsPilot.OFF; /** * Pilot mode auto. */ - public static final int PILOT_AUTO = Constants.FrontendDvbsPilot.AUTO; + public static final int PILOT_AUTO = FrontendDvbsPilot.AUTO; /** @hide */ @@ -216,19 +216,19 @@ public class DvbsFrontendSettings extends FrontendSettings { /** * Standard undefined. */ - public static final int STANDARD_AUTO = Constants.FrontendDvbsStandard.AUTO; + public static final int STANDARD_AUTO = FrontendDvbsStandard.AUTO; /** * Standard S. */ - public static final int STANDARD_S = Constants.FrontendDvbsStandard.S; + public static final int STANDARD_S = FrontendDvbsStandard.S; /** * Standard S2. */ - public static final int STANDARD_S2 = Constants.FrontendDvbsStandard.S2; + public static final int STANDARD_S2 = FrontendDvbsStandard.S2; /** * Standard S2X. */ - public static final int STANDARD_S2X = Constants.FrontendDvbsStandard.S2X; + public static final int STANDARD_S2X = FrontendDvbsStandard.S2X; /** @hide */ @IntDef(prefix = "VCM_MODE_", @@ -239,15 +239,15 @@ public class DvbsFrontendSettings extends FrontendSettings { /** * VCM mode undefined. */ - public static final int VCM_MODE_UNDEFINED = Constants.FrontendDvbsVcmMode.UNDEFINED; + public static final int VCM_MODE_UNDEFINED = FrontendDvbsVcmMode.UNDEFINED; /** * Auto VCM mode. */ - public static final int VCM_MODE_AUTO = Constants.FrontendDvbsVcmMode.AUTO; + public static final int VCM_MODE_AUTO = FrontendDvbsVcmMode.AUTO; /** * Manual VCM mode. */ - public static final int VCM_MODE_MANUAL = Constants.FrontendDvbsVcmMode.MANUAL; + public static final int VCM_MODE_MANUAL = FrontendDvbsVcmMode.MANUAL; private final int mModulation; diff --git a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java index 536c7b82d0afa..5735b39b0a56f 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java @@ -20,7 +20,14 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendDvbtBandwidth; +import android.hardware.tv.tuner.FrontendDvbtCoderate; +import android.hardware.tv.tuner.FrontendDvbtConstellation; +import android.hardware.tv.tuner.FrontendDvbtGuardInterval; +import android.hardware.tv.tuner.FrontendDvbtHierarchy; +import android.hardware.tv.tuner.FrontendDvbtPlpMode; +import android.hardware.tv.tuner.FrontendDvbtStandard; +import android.hardware.tv.tuner.FrontendDvbtTransmissionMode; import android.media.tv.tuner.TunerVersionChecker; import java.lang.annotation.Retention; @@ -46,51 +53,49 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Transmission Mode undefined. */ - public static final int TRANSMISSION_MODE_UNDEFINED = - Constants.FrontendDvbtTransmissionMode.UNDEFINED; + public static final int TRANSMISSION_MODE_UNDEFINED = FrontendDvbtTransmissionMode.UNDEFINED; /** * Hardware is able to detect and set Transmission Mode automatically */ - public static final int TRANSMISSION_MODE_AUTO = Constants.FrontendDvbtTransmissionMode.AUTO; + public static final int TRANSMISSION_MODE_AUTO = FrontendDvbtTransmissionMode.AUTO; /** * 2K Transmission Mode. */ - public static final int TRANSMISSION_MODE_2K = Constants.FrontendDvbtTransmissionMode.MODE_2K; + public static final int TRANSMISSION_MODE_2K = FrontendDvbtTransmissionMode.MODE_2K; /** * 8K Transmission Mode. */ - public static final int TRANSMISSION_MODE_8K = Constants.FrontendDvbtTransmissionMode.MODE_8K; + public static final int TRANSMISSION_MODE_8K = FrontendDvbtTransmissionMode.MODE_8K; /** * 4K Transmission Mode. */ - public static final int TRANSMISSION_MODE_4K = Constants.FrontendDvbtTransmissionMode.MODE_4K; + public static final int TRANSMISSION_MODE_4K = FrontendDvbtTransmissionMode.MODE_4K; /** * 1K Transmission Mode. */ - public static final int TRANSMISSION_MODE_1K = Constants.FrontendDvbtTransmissionMode.MODE_1K; + public static final int TRANSMISSION_MODE_1K = FrontendDvbtTransmissionMode.MODE_1K; /** * 16K Transmission Mode. */ - public static final int TRANSMISSION_MODE_16K = Constants.FrontendDvbtTransmissionMode.MODE_16K; + public static final int TRANSMISSION_MODE_16K = FrontendDvbtTransmissionMode.MODE_16K; /** * 32K Transmission Mode. */ - public static final int TRANSMISSION_MODE_32K = Constants.FrontendDvbtTransmissionMode.MODE_32K; + public static final int TRANSMISSION_MODE_32K = FrontendDvbtTransmissionMode.MODE_32K; /** * 8K Transmission Extended Mode. */ - public static final int TRANSMISSION_MODE_EXTENDED_8K = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbtTransmissionMode.MODE_8K_E; + public static final int TRANSMISSION_MODE_EXTENDED_8K = FrontendDvbtTransmissionMode.MODE_8K_E; /** * 16K Transmission Extended Mode. */ public static final int TRANSMISSION_MODE_EXTENDED_16K = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbtTransmissionMode.MODE_16K_E; + FrontendDvbtTransmissionMode.MODE_16K_E; /** * 32K Transmission Extended Mode. */ public static final int TRANSMISSION_MODE_EXTENDED_32K = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbtTransmissionMode.MODE_32K_E; + FrontendDvbtTransmissionMode.MODE_32K_E; /** @hide */ @IntDef(flag = true, @@ -103,35 +108,35 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Bandwidth undefined. */ - public static final int BANDWIDTH_UNDEFINED = Constants.FrontendDvbtBandwidth.UNDEFINED; + public static final int BANDWIDTH_UNDEFINED = FrontendDvbtBandwidth.UNDEFINED; /** * Hardware is able to detect and set Bandwidth automatically. */ - public static final int BANDWIDTH_AUTO = Constants.FrontendDvbtBandwidth.AUTO; + public static final int BANDWIDTH_AUTO = FrontendDvbtBandwidth.AUTO; /** * 8 MHz bandwidth. */ - public static final int BANDWIDTH_8MHZ = Constants.FrontendDvbtBandwidth.BANDWIDTH_8MHZ; + public static final int BANDWIDTH_8MHZ = FrontendDvbtBandwidth.BANDWIDTH_8MHZ; /** * 7 MHz bandwidth. */ - public static final int BANDWIDTH_7MHZ = Constants.FrontendDvbtBandwidth.BANDWIDTH_7MHZ; + public static final int BANDWIDTH_7MHZ = FrontendDvbtBandwidth.BANDWIDTH_7MHZ; /** * 6 MHz bandwidth. */ - public static final int BANDWIDTH_6MHZ = Constants.FrontendDvbtBandwidth.BANDWIDTH_6MHZ; + public static final int BANDWIDTH_6MHZ = FrontendDvbtBandwidth.BANDWIDTH_6MHZ; /** * 5 MHz bandwidth. */ - public static final int BANDWIDTH_5MHZ = Constants.FrontendDvbtBandwidth.BANDWIDTH_5MHZ; + public static final int BANDWIDTH_5MHZ = FrontendDvbtBandwidth.BANDWIDTH_5MHZ; /** * 1,7 MHz bandwidth. */ - public static final int BANDWIDTH_1_7MHZ = Constants.FrontendDvbtBandwidth.BANDWIDTH_1_7MHZ; + public static final int BANDWIDTH_1_7MHZ = FrontendDvbtBandwidth.BANDWIDTH_1_7MHZ; /** * 10 MHz bandwidth. */ - public static final int BANDWIDTH_10MHZ = Constants.FrontendDvbtBandwidth.BANDWIDTH_10MHZ; + public static final int BANDWIDTH_10MHZ = FrontendDvbtBandwidth.BANDWIDTH_10MHZ; /** @hide */ @@ -147,55 +152,44 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Constellation not defined. */ - public static final int CONSTELLATION_UNDEFINED = Constants.FrontendDvbtConstellation.UNDEFINED; + public static final int CONSTELLATION_UNDEFINED = FrontendDvbtConstellation.UNDEFINED; /** * Hardware is able to detect and set Constellation automatically. */ - public static final int CONSTELLATION_AUTO = Constants.FrontendDvbtConstellation.AUTO; + public static final int CONSTELLATION_AUTO = FrontendDvbtConstellation.AUTO; /** * QPSK Constellation. */ - public static final int CONSTELLATION_QPSK = - Constants.FrontendDvbtConstellation.CONSTELLATION_QPSK; + public static final int CONSTELLATION_QPSK = FrontendDvbtConstellation.CONSTELLATION_QPSK; /** * 16QAM Constellation. */ - public static final int CONSTELLATION_16QAM = - Constants.FrontendDvbtConstellation.CONSTELLATION_16QAM; + public static final int CONSTELLATION_16QAM = FrontendDvbtConstellation.CONSTELLATION_16QAM; /** * 64QAM Constellation. */ - public static final int CONSTELLATION_64QAM = - Constants.FrontendDvbtConstellation.CONSTELLATION_64QAM; + public static final int CONSTELLATION_64QAM = FrontendDvbtConstellation.CONSTELLATION_64QAM; /** * 256QAM Constellation. */ - public static final int CONSTELLATION_256QAM = - Constants.FrontendDvbtConstellation.CONSTELLATION_256QAM; + public static final int CONSTELLATION_256QAM = FrontendDvbtConstellation.CONSTELLATION_256QAM; /** * QPSK Rotated Constellation. */ - public static final int CONSTELLATION_QPSK_R = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbtConstellation - .CONSTELLATION_QPSK_R; + public static final int CONSTELLATION_QPSK_R = FrontendDvbtConstellation.CONSTELLATION_QPSK_R; /** * 16QAM Rotated Constellation. */ - public static final int CONSTELLATION_16QAM_R = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbtConstellation - .CONSTELLATION_16QAM_R; + public static final int CONSTELLATION_16QAM_R = FrontendDvbtConstellation.CONSTELLATION_16QAM_R; /** * 64QAM Rotated Constellation. */ - public static final int CONSTELLATION_64QAM_R = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbtConstellation - .CONSTELLATION_64QAM_R; + public static final int CONSTELLATION_64QAM_R = FrontendDvbtConstellation.CONSTELLATION_64QAM_R; /** * 256QAM Rotated Constellation. */ public static final int CONSTELLATION_256QAM_R = - android.hardware.tv.tuner.V1_1.Constants.FrontendDvbtConstellation - .CONSTELLATION_256QAM_R; + FrontendDvbtConstellation.CONSTELLATION_256QAM_R; /** @hide */ @IntDef(flag = true, @@ -209,48 +203,43 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Hierarchy undefined. */ - public static final int HIERARCHY_UNDEFINED = Constants.FrontendDvbtHierarchy.UNDEFINED; + public static final int HIERARCHY_UNDEFINED = FrontendDvbtHierarchy.UNDEFINED; /** * Hardware is able to detect and set Hierarchy automatically. */ - public static final int HIERARCHY_AUTO = Constants.FrontendDvbtHierarchy.AUTO; + public static final int HIERARCHY_AUTO = FrontendDvbtHierarchy.AUTO; /** * Non-native Hierarchy */ - public static final int HIERARCHY_NON_NATIVE = - Constants.FrontendDvbtHierarchy.HIERARCHY_NON_NATIVE; + public static final int HIERARCHY_NON_NATIVE = FrontendDvbtHierarchy.HIERARCHY_NON_NATIVE; /** * 1-native Hierarchy */ - public static final int HIERARCHY_1_NATIVE = Constants.FrontendDvbtHierarchy.HIERARCHY_1_NATIVE; + public static final int HIERARCHY_1_NATIVE = FrontendDvbtHierarchy.HIERARCHY_1_NATIVE; /** * 2-native Hierarchy */ - public static final int HIERARCHY_2_NATIVE = Constants.FrontendDvbtHierarchy.HIERARCHY_2_NATIVE; + public static final int HIERARCHY_2_NATIVE = FrontendDvbtHierarchy.HIERARCHY_2_NATIVE; /** * 4-native Hierarchy */ - public static final int HIERARCHY_4_NATIVE = Constants.FrontendDvbtHierarchy.HIERARCHY_4_NATIVE; + public static final int HIERARCHY_4_NATIVE = FrontendDvbtHierarchy.HIERARCHY_4_NATIVE; /** * Non-indepth Hierarchy */ - public static final int HIERARCHY_NON_INDEPTH = - Constants.FrontendDvbtHierarchy.HIERARCHY_NON_INDEPTH; + public static final int HIERARCHY_NON_INDEPTH = FrontendDvbtHierarchy.HIERARCHY_NON_INDEPTH; /** * 1-indepth Hierarchy */ - public static final int HIERARCHY_1_INDEPTH = - Constants.FrontendDvbtHierarchy.HIERARCHY_1_INDEPTH; + public static final int HIERARCHY_1_INDEPTH = FrontendDvbtHierarchy.HIERARCHY_1_INDEPTH; /** * 2-indepth Hierarchy */ - public static final int HIERARCHY_2_INDEPTH = - Constants.FrontendDvbtHierarchy.HIERARCHY_2_INDEPTH; + public static final int HIERARCHY_2_INDEPTH = FrontendDvbtHierarchy.HIERARCHY_2_INDEPTH; /** * 4-indepth Hierarchy */ - public static final int HIERARCHY_4_INDEPTH = - Constants.FrontendDvbtHierarchy.HIERARCHY_4_INDEPTH; + public static final int HIERARCHY_4_INDEPTH = FrontendDvbtHierarchy.HIERARCHY_4_INDEPTH; /** @hide */ @@ -264,48 +253,47 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Code rate undefined. */ - public static final int CODERATE_UNDEFINED = - Constants.FrontendDvbtCoderate.UNDEFINED; + public static final int CODERATE_UNDEFINED = FrontendDvbtCoderate.UNDEFINED; /** * Hardware is able to detect and set code rate automatically. */ - public static final int CODERATE_AUTO = Constants.FrontendDvbtCoderate.AUTO; + public static final int CODERATE_AUTO = FrontendDvbtCoderate.AUTO; /** * 1/2 code rate. */ - public static final int CODERATE_1_2 = Constants.FrontendDvbtCoderate.CODERATE_1_2; + public static final int CODERATE_1_2 = FrontendDvbtCoderate.CODERATE_1_2; /** * 2/3 code rate. */ - public static final int CODERATE_2_3 = Constants.FrontendDvbtCoderate.CODERATE_2_3; + public static final int CODERATE_2_3 = FrontendDvbtCoderate.CODERATE_2_3; /** * 3/4 code rate. */ - public static final int CODERATE_3_4 = Constants.FrontendDvbtCoderate.CODERATE_3_4; + public static final int CODERATE_3_4 = FrontendDvbtCoderate.CODERATE_3_4; /** * 5/6 code rate. */ - public static final int CODERATE_5_6 = Constants.FrontendDvbtCoderate.CODERATE_5_6; + public static final int CODERATE_5_6 = FrontendDvbtCoderate.CODERATE_5_6; /** * 7/8 code rate. */ - public static final int CODERATE_7_8 = Constants.FrontendDvbtCoderate.CODERATE_7_8; + public static final int CODERATE_7_8 = FrontendDvbtCoderate.CODERATE_7_8; /** * 4/5 code rate. */ - public static final int CODERATE_3_5 = Constants.FrontendDvbtCoderate.CODERATE_3_5; + public static final int CODERATE_3_5 = FrontendDvbtCoderate.CODERATE_3_5; /** * 4/5 code rate. */ - public static final int CODERATE_4_5 = Constants.FrontendDvbtCoderate.CODERATE_4_5; + public static final int CODERATE_4_5 = FrontendDvbtCoderate.CODERATE_4_5; /** * 6/7 code rate. */ - public static final int CODERATE_6_7 = Constants.FrontendDvbtCoderate.CODERATE_6_7; + public static final int CODERATE_6_7 = FrontendDvbtCoderate.CODERATE_6_7; /** * 8/9 code rate. */ - public static final int CODERATE_8_9 = Constants.FrontendDvbtCoderate.CODERATE_8_9; + public static final int CODERATE_8_9 = FrontendDvbtCoderate.CODERATE_8_9; /** @hide */ @IntDef(flag = true, @@ -323,46 +311,39 @@ public class DvbtFrontendSettings extends FrontendSettings { * Guard Interval undefined. */ public static final int GUARD_INTERVAL_UNDEFINED = - Constants.FrontendDvbtGuardInterval.UNDEFINED; + FrontendDvbtGuardInterval.UNDEFINED; /** * Hardware is able to detect and set Guard Interval automatically. */ - public static final int GUARD_INTERVAL_AUTO = Constants.FrontendDvbtGuardInterval.AUTO; + public static final int GUARD_INTERVAL_AUTO = FrontendDvbtGuardInterval.AUTO; /** * 1/32 Guard Interval. */ - public static final int GUARD_INTERVAL_1_32 = - Constants.FrontendDvbtGuardInterval.INTERVAL_1_32; + public static final int GUARD_INTERVAL_1_32 = FrontendDvbtGuardInterval.INTERVAL_1_32; /** * 1/16 Guard Interval. */ - public static final int GUARD_INTERVAL_1_16 = - Constants.FrontendDvbtGuardInterval.INTERVAL_1_16; + public static final int GUARD_INTERVAL_1_16 = FrontendDvbtGuardInterval.INTERVAL_1_16; /** * 1/8 Guard Interval. */ - public static final int GUARD_INTERVAL_1_8 = - Constants.FrontendDvbtGuardInterval.INTERVAL_1_8; + public static final int GUARD_INTERVAL_1_8 = FrontendDvbtGuardInterval.INTERVAL_1_8; /** * 1/4 Guard Interval. */ - public static final int GUARD_INTERVAL_1_4 = - Constants.FrontendDvbtGuardInterval.INTERVAL_1_4; + public static final int GUARD_INTERVAL_1_4 = FrontendDvbtGuardInterval.INTERVAL_1_4; /** * 1/128 Guard Interval. */ - public static final int GUARD_INTERVAL_1_128 = - Constants.FrontendDvbtGuardInterval.INTERVAL_1_128; + public static final int GUARD_INTERVAL_1_128 = FrontendDvbtGuardInterval.INTERVAL_1_128; /** * 19/128 Guard Interval. */ - public static final int GUARD_INTERVAL_19_128 = - Constants.FrontendDvbtGuardInterval.INTERVAL_19_128; + public static final int GUARD_INTERVAL_19_128 = FrontendDvbtGuardInterval.INTERVAL_19_128; /** * 19/256 Guard Interval. */ - public static final int GUARD_INTERVAL_19_256 = - Constants.FrontendDvbtGuardInterval.INTERVAL_19_256; + public static final int GUARD_INTERVAL_19_256 = FrontendDvbtGuardInterval.INTERVAL_19_256; /** @hide */ @IntDef(flag = true, @@ -375,15 +356,15 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Hardware is able to detect and set Standard automatically. */ - public static final int STANDARD_AUTO = Constants.FrontendDvbtStandard.AUTO; + public static final int STANDARD_AUTO = FrontendDvbtStandard.AUTO; /** * T standard. */ - public static final int STANDARD_T = Constants.FrontendDvbtStandard.T; + public static final int STANDARD_T = FrontendDvbtStandard.T; /** * T2 standard. */ - public static final int STANDARD_T2 = Constants.FrontendDvbtStandard.T2; + public static final int STANDARD_T2 = FrontendDvbtStandard.T2; /** @hide */ @IntDef(prefix = "PLP_MODE_", @@ -394,15 +375,15 @@ public class DvbtFrontendSettings extends FrontendSettings { /** * Physical Layer Pipe (PLP) Mode undefined. */ - public static final int PLP_MODE_UNDEFINED = Constants.FrontendDvbtPlpMode.UNDEFINED; + public static final int PLP_MODE_UNDEFINED = FrontendDvbtPlpMode.UNDEFINED; /** * Hardware is able to detect and set Physical Layer Pipe (PLP) Mode automatically. */ - public static final int PLP_MODE_AUTO = Constants.FrontendDvbtPlpMode.AUTO; + public static final int PLP_MODE_AUTO = FrontendDvbtPlpMode.AUTO; /** * Physical Layer Pipe (PLP) manual Mode. */ - public static final int PLP_MODE_MANUAL = Constants.FrontendDvbtPlpMode.MANUAL; + public static final int PLP_MODE_MANUAL = FrontendDvbtPlpMode.MANUAL; private int mTransmissionMode; private final int mBandwidth; diff --git a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java index 4bfe8078be35a..4a31686e08957 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java @@ -20,7 +20,8 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.LongDef; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendInnerFec; +import android.hardware.tv.tuner.FrontendType; import android.media.tv.tuner.Tuner; import android.media.tv.tuner.TunerVersionChecker; @@ -44,47 +45,47 @@ public abstract class FrontendSettings { /** * Undefined frontend type. */ - public static final int TYPE_UNDEFINED = Constants.FrontendType.UNDEFINED; + public static final int TYPE_UNDEFINED = FrontendType.UNDEFINED; /** * Analog frontend type. */ - public static final int TYPE_ANALOG = Constants.FrontendType.ANALOG; + public static final int TYPE_ANALOG = FrontendType.ANALOG; /** * Advanced Television Systems Committee (ATSC) frontend type. */ - public static final int TYPE_ATSC = Constants.FrontendType.ATSC; + public static final int TYPE_ATSC = FrontendType.ATSC; /** * Advanced Television Systems Committee 3.0 (ATSC-3) frontend type. */ - public static final int TYPE_ATSC3 = Constants.FrontendType.ATSC3; + public static final int TYPE_ATSC3 = FrontendType.ATSC3; /** * Digital Video Broadcasting-Cable (DVB-C) frontend type. */ - public static final int TYPE_DVBC = Constants.FrontendType.DVBC; + public static final int TYPE_DVBC = FrontendType.DVBC; /** * Digital Video Broadcasting-Satellite (DVB-S) frontend type. */ - public static final int TYPE_DVBS = Constants.FrontendType.DVBS; + public static final int TYPE_DVBS = FrontendType.DVBS; /** * Digital Video Broadcasting-Terrestrial (DVB-T) frontend type. */ - public static final int TYPE_DVBT = Constants.FrontendType.DVBT; + public static final int TYPE_DVBT = FrontendType.DVBT; /** * Integrated Services Digital Broadcasting-Satellite (ISDB-S) frontend type. */ - public static final int TYPE_ISDBS = Constants.FrontendType.ISDBS; + public static final int TYPE_ISDBS = FrontendType.ISDBS; /** * Integrated Services Digital Broadcasting-Satellite 3 (ISDB-S3) frontend type. */ - public static final int TYPE_ISDBS3 = Constants.FrontendType.ISDBS3; + public static final int TYPE_ISDBS3 = FrontendType.ISDBS3; /** * Integrated Services Digital Broadcasting-Terrestrial (ISDB-T) frontend type. */ - public static final int TYPE_ISDBT = Constants.FrontendType.ISDBT; + public static final int TYPE_ISDBT = FrontendType.ISDBT; /** * Digital Terrestrial Multimedia Broadcast standard (DTMB) frontend type. */ - public static final int TYPE_DTMB = android.hardware.tv.tuner.V1_1.Constants.FrontendType.DTMB; + public static final int TYPE_DTMB = FrontendType.DTMB; /** @hide */ @@ -101,151 +102,151 @@ public abstract class FrontendSettings { /** * FEC not defined. */ - public static final long FEC_UNDEFINED = Constants.FrontendInnerFec.FEC_UNDEFINED; + public static final long FEC_UNDEFINED = FrontendInnerFec.FEC_UNDEFINED; /** * hardware is able to detect and set FEC automatically. */ - public static final long FEC_AUTO = Constants.FrontendInnerFec.AUTO; + public static final long FEC_AUTO = FrontendInnerFec.AUTO; /** * 1/2 conv. code rate. */ - public static final long FEC_1_2 = Constants.FrontendInnerFec.FEC_1_2; + public static final long FEC_1_2 = FrontendInnerFec.FEC_1_2; /** * 1/3 conv. code rate. */ - public static final long FEC_1_3 = Constants.FrontendInnerFec.FEC_1_3; + public static final long FEC_1_3 = FrontendInnerFec.FEC_1_3; /** * 1/4 conv. code rate. */ - public static final long FEC_1_4 = Constants.FrontendInnerFec.FEC_1_4; + public static final long FEC_1_4 = FrontendInnerFec.FEC_1_4; /** * 1/5 conv. code rate. */ - public static final long FEC_1_5 = Constants.FrontendInnerFec.FEC_1_5; + public static final long FEC_1_5 = FrontendInnerFec.FEC_1_5; /** * 2/3 conv. code rate. */ - public static final long FEC_2_3 = Constants.FrontendInnerFec.FEC_2_3; + public static final long FEC_2_3 = FrontendInnerFec.FEC_2_3; /** * 2/5 conv. code rate. */ - public static final long FEC_2_5 = Constants.FrontendInnerFec.FEC_2_5; + public static final long FEC_2_5 = FrontendInnerFec.FEC_2_5; /** * 2/9 conv. code rate. */ - public static final long FEC_2_9 = Constants.FrontendInnerFec.FEC_2_9; + public static final long FEC_2_9 = FrontendInnerFec.FEC_2_9; /** * 3/4 conv. code rate. */ - public static final long FEC_3_4 = Constants.FrontendInnerFec.FEC_3_4; + public static final long FEC_3_4 = FrontendInnerFec.FEC_3_4; /** * 3/5 conv. code rate. */ - public static final long FEC_3_5 = Constants.FrontendInnerFec.FEC_3_5; + public static final long FEC_3_5 = FrontendInnerFec.FEC_3_5; /** * 4/5 conv. code rate. */ - public static final long FEC_4_5 = Constants.FrontendInnerFec.FEC_4_5; + public static final long FEC_4_5 = FrontendInnerFec.FEC_4_5; /** * 4/15 conv. code rate. */ - public static final long FEC_4_15 = Constants.FrontendInnerFec.FEC_4_15; + public static final long FEC_4_15 = FrontendInnerFec.FEC_4_15; /** * 5/6 conv. code rate. */ - public static final long FEC_5_6 = Constants.FrontendInnerFec.FEC_5_6; + public static final long FEC_5_6 = FrontendInnerFec.FEC_5_6; /** * 5/9 conv. code rate. */ - public static final long FEC_5_9 = Constants.FrontendInnerFec.FEC_5_9; + public static final long FEC_5_9 = FrontendInnerFec.FEC_5_9; /** * 6/7 conv. code rate. */ - public static final long FEC_6_7 = Constants.FrontendInnerFec.FEC_6_7; + public static final long FEC_6_7 = FrontendInnerFec.FEC_6_7; /** * 7/8 conv. code rate. */ - public static final long FEC_7_8 = Constants.FrontendInnerFec.FEC_7_8; + public static final long FEC_7_8 = FrontendInnerFec.FEC_7_8; /** * 7/9 conv. code rate. */ - public static final long FEC_7_9 = Constants.FrontendInnerFec.FEC_7_9; + public static final long FEC_7_9 = FrontendInnerFec.FEC_7_9; /** * 7/15 conv. code rate. */ - public static final long FEC_7_15 = Constants.FrontendInnerFec.FEC_7_15; + public static final long FEC_7_15 = FrontendInnerFec.FEC_7_15; /** * 8/9 conv. code rate. */ - public static final long FEC_8_9 = Constants.FrontendInnerFec.FEC_8_9; + public static final long FEC_8_9 = FrontendInnerFec.FEC_8_9; /** * 8/15 conv. code rate. */ - public static final long FEC_8_15 = Constants.FrontendInnerFec.FEC_8_15; + public static final long FEC_8_15 = FrontendInnerFec.FEC_8_15; /** * 9/10 conv. code rate. */ - public static final long FEC_9_10 = Constants.FrontendInnerFec.FEC_9_10; + public static final long FEC_9_10 = FrontendInnerFec.FEC_9_10; /** * 9/20 conv. code rate. */ - public static final long FEC_9_20 = Constants.FrontendInnerFec.FEC_9_20; + public static final long FEC_9_20 = FrontendInnerFec.FEC_9_20; /** * 11/15 conv. code rate. */ - public static final long FEC_11_15 = Constants.FrontendInnerFec.FEC_11_15; + public static final long FEC_11_15 = FrontendInnerFec.FEC_11_15; /** * 11/20 conv. code rate. */ - public static final long FEC_11_20 = Constants.FrontendInnerFec.FEC_11_20; + public static final long FEC_11_20 = FrontendInnerFec.FEC_11_20; /** * 11/45 conv. code rate. */ - public static final long FEC_11_45 = Constants.FrontendInnerFec.FEC_11_45; + public static final long FEC_11_45 = FrontendInnerFec.FEC_11_45; /** * 13/18 conv. code rate. */ - public static final long FEC_13_18 = Constants.FrontendInnerFec.FEC_13_18; + public static final long FEC_13_18 = FrontendInnerFec.FEC_13_18; /** * 13/45 conv. code rate. */ - public static final long FEC_13_45 = Constants.FrontendInnerFec.FEC_13_45; + public static final long FEC_13_45 = FrontendInnerFec.FEC_13_45; /** * 14/45 conv. code rate. */ - public static final long FEC_14_45 = Constants.FrontendInnerFec.FEC_14_45; + public static final long FEC_14_45 = FrontendInnerFec.FEC_14_45; /** * 23/36 conv. code rate. */ - public static final long FEC_23_36 = Constants.FrontendInnerFec.FEC_23_36; + public static final long FEC_23_36 = FrontendInnerFec.FEC_23_36; /** * 25/36 conv. code rate. */ - public static final long FEC_25_36 = Constants.FrontendInnerFec.FEC_25_36; + public static final long FEC_25_36 = FrontendInnerFec.FEC_25_36; /** * 26/45 conv. code rate. */ - public static final long FEC_26_45 = Constants.FrontendInnerFec.FEC_26_45; + public static final long FEC_26_45 = FrontendInnerFec.FEC_26_45; /** * 28/45 conv. code rate. */ - public static final long FEC_28_45 = Constants.FrontendInnerFec.FEC_28_45; + public static final long FEC_28_45 = FrontendInnerFec.FEC_28_45; /** * 29/45 conv. code rate. */ - public static final long FEC_29_45 = Constants.FrontendInnerFec.FEC_29_45; + public static final long FEC_29_45 = FrontendInnerFec.FEC_29_45; /** * 31/45 conv. code rate. */ - public static final long FEC_31_45 = Constants.FrontendInnerFec.FEC_31_45; + public static final long FEC_31_45 = FrontendInnerFec.FEC_31_45; /** * 32/45 conv. code rate. */ - public static final long FEC_32_45 = Constants.FrontendInnerFec.FEC_32_45; + public static final long FEC_32_45 = FrontendInnerFec.FEC_32_45; /** * 77/90 conv. code rate. */ - public static final long FEC_77_90 = Constants.FrontendInnerFec.FEC_77_90; + public static final long FEC_77_90 = FrontendInnerFec.FEC_77_90; /** @hide */ @IntDef(prefix = "FRONTEND_SPECTRAL_INVERSION_", @@ -258,17 +259,17 @@ public abstract class FrontendSettings { * Spectral Inversion Type undefined. */ public static final int FRONTEND_SPECTRAL_INVERSION_UNDEFINED = - Constants.FrontendDvbcSpectralInversion.UNDEFINED; + android.hardware.tv.tuner.FrontendSpectralInversion.UNDEFINED; /** * Normal Spectral Inversion. */ public static final int FRONTEND_SPECTRAL_INVERSION_NORMAL = - Constants.FrontendDvbcSpectralInversion.NORMAL; + android.hardware.tv.tuner.FrontendSpectralInversion.NORMAL; /** * Inverted Spectral Inversion. */ public static final int FRONTEND_SPECTRAL_INVERSION_INVERTED = - Constants.FrontendDvbcSpectralInversion.INVERTED; + android.hardware.tv.tuner.FrontendSpectralInversion.INVERTED; diff --git a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java index b82a5a914da87..36fd94234e09f 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java @@ -20,7 +20,6 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; import android.media.tv.tuner.Lnb; import android.media.tv.tuner.TunerVersionChecker; @@ -61,175 +60,188 @@ public class FrontendStatus { * Lock status for Demod. */ public static final int FRONTEND_STATUS_TYPE_DEMOD_LOCK = - Constants.FrontendStatusType.DEMOD_LOCK; + android.hardware.tv.tuner.FrontendStatusType.DEMOD_LOCK; /** * Signal to Noise Ratio. */ - public static final int FRONTEND_STATUS_TYPE_SNR = Constants.FrontendStatusType.SNR; + public static final int FRONTEND_STATUS_TYPE_SNR = + android.hardware.tv.tuner.FrontendStatusType.SNR; /** * Bit Error Ratio. */ - public static final int FRONTEND_STATUS_TYPE_BER = Constants.FrontendStatusType.BER; + public static final int FRONTEND_STATUS_TYPE_BER = + android.hardware.tv.tuner.FrontendStatusType.BER; /** * Packages Error Ratio. */ - public static final int FRONTEND_STATUS_TYPE_PER = Constants.FrontendStatusType.PER; + public static final int FRONTEND_STATUS_TYPE_PER = + android.hardware.tv.tuner.FrontendStatusType.PER; /** * Bit Error Ratio before FEC. */ - public static final int FRONTEND_STATUS_TYPE_PRE_BER = Constants.FrontendStatusType.PRE_BER; + public static final int FRONTEND_STATUS_TYPE_PRE_BER = + android.hardware.tv.tuner.FrontendStatusType.PRE_BER; /** * Signal Quality (0..100). Good data over total data in percent can be * used as a way to present Signal Quality. */ public static final int FRONTEND_STATUS_TYPE_SIGNAL_QUALITY = - Constants.FrontendStatusType.SIGNAL_QUALITY; + android.hardware.tv.tuner.FrontendStatusType.SIGNAL_QUALITY; /** * Signal Strength. */ public static final int FRONTEND_STATUS_TYPE_SIGNAL_STRENGTH = - Constants.FrontendStatusType.SIGNAL_STRENGTH; + android.hardware.tv.tuner.FrontendStatusType.SIGNAL_STRENGTH; /** * Symbol Rate in symbols per second. */ public static final int FRONTEND_STATUS_TYPE_SYMBOL_RATE = - Constants.FrontendStatusType.SYMBOL_RATE; + android.hardware.tv.tuner.FrontendStatusType.SYMBOL_RATE; /** * Forward Error Correction Type. */ - public static final int FRONTEND_STATUS_TYPE_FEC = Constants.FrontendStatusType.FEC; + public static final int FRONTEND_STATUS_TYPE_FEC = + android.hardware.tv.tuner.FrontendStatusType.FEC; /** * Modulation Type. */ public static final int FRONTEND_STATUS_TYPE_MODULATION = - Constants.FrontendStatusType.MODULATION; + android.hardware.tv.tuner.FrontendStatusType.MODULATION; /** * Spectral Inversion Type. */ - public static final int FRONTEND_STATUS_TYPE_SPECTRAL = Constants.FrontendStatusType.SPECTRAL; + public static final int FRONTEND_STATUS_TYPE_SPECTRAL = + android.hardware.tv.tuner.FrontendStatusType.SPECTRAL; /** * LNB Voltage. */ public static final int FRONTEND_STATUS_TYPE_LNB_VOLTAGE = - Constants.FrontendStatusType.LNB_VOLTAGE; + android.hardware.tv.tuner.FrontendStatusType.LNB_VOLTAGE; /** * Physical Layer Pipe ID. */ - public static final int FRONTEND_STATUS_TYPE_PLP_ID = Constants.FrontendStatusType.PLP_ID; + public static final int FRONTEND_STATUS_TYPE_PLP_ID = + android.hardware.tv.tuner.FrontendStatusType.PLP_ID; /** * Status for Emergency Warning Broadcasting System. */ - public static final int FRONTEND_STATUS_TYPE_EWBS = Constants.FrontendStatusType.EWBS; + public static final int FRONTEND_STATUS_TYPE_EWBS = + android.hardware.tv.tuner.FrontendStatusType.EWBS; /** * Automatic Gain Control. */ - public static final int FRONTEND_STATUS_TYPE_AGC = Constants.FrontendStatusType.AGC; + public static final int FRONTEND_STATUS_TYPE_AGC = + android.hardware.tv.tuner.FrontendStatusType.AGC; /** * Low Noise Amplifier. */ - public static final int FRONTEND_STATUS_TYPE_LNA = Constants.FrontendStatusType.LNA; + public static final int FRONTEND_STATUS_TYPE_LNA = + android.hardware.tv.tuner.FrontendStatusType.LNA; /** * Error status by layer. */ public static final int FRONTEND_STATUS_TYPE_LAYER_ERROR = - Constants.FrontendStatusType.LAYER_ERROR; + android.hardware.tv.tuner.FrontendStatusType.LAYER_ERROR; /** * Modulation Error Ratio. */ - public static final int FRONTEND_STATUS_TYPE_MER = Constants.FrontendStatusType.MER; + public static final int FRONTEND_STATUS_TYPE_MER = + android.hardware.tv.tuner.FrontendStatusType.MER; /** * Difference between tuning frequency and actual locked frequency. */ public static final int FRONTEND_STATUS_TYPE_FREQ_OFFSET = - Constants.FrontendStatusType.FREQ_OFFSET; + android.hardware.tv.tuner.FrontendStatusType.FREQ_OFFSET; /** * Hierarchy for DVBT. */ - public static final int FRONTEND_STATUS_TYPE_HIERARCHY = Constants.FrontendStatusType.HIERARCHY; + public static final int FRONTEND_STATUS_TYPE_HIERARCHY = + android.hardware.tv.tuner.FrontendStatusType.HIERARCHY; /** * Lock status for RF. */ - public static final int FRONTEND_STATUS_TYPE_RF_LOCK = Constants.FrontendStatusType.RF_LOCK; + public static final int FRONTEND_STATUS_TYPE_RF_LOCK = + android.hardware.tv.tuner.FrontendStatusType.RF_LOCK; /** * PLP information in a frequency band for ATSC-3.0 frontend. */ public static final int FRONTEND_STATUS_TYPE_ATSC3_PLP_INFO = - Constants.FrontendStatusType.ATSC3_PLP_INFO; + android.hardware.tv.tuner.FrontendStatusType.ATSC3_PLP_INFO; /** * BERS Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_BERS = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.BERS; + android.hardware.tv.tuner.FrontendStatusType.BERS; /** * Coderate Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_CODERATES = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.CODERATES; + android.hardware.tv.tuner.FrontendStatusType.CODERATES; /** * Bandwidth Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_BANDWIDTH = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.BANDWIDTH; + android.hardware.tv.tuner.FrontendStatusType.BANDWIDTH; /** * Guard Interval Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_GUARD_INTERVAL = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.GUARD_INTERVAL; + android.hardware.tv.tuner.FrontendStatusType.GUARD_INTERVAL; /** * Transmission Mode Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_TRANSMISSION_MODE = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.TRANSMISSION_MODE; + android.hardware.tv.tuner.FrontendStatusType.TRANSMISSION_MODE; /** * UEC Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_UEC = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.UEC; + android.hardware.tv.tuner.FrontendStatusType.UEC; /** * T2 System Id Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_T2_SYSTEM_ID = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.T2_SYSTEM_ID; + android.hardware.tv.tuner.FrontendStatusType.T2_SYSTEM_ID; /** * Interleavings Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_INTERLEAVINGS = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.INTERLEAVINGS; + android.hardware.tv.tuner.FrontendStatusType.INTERLEAVINGS; /** * ISDBT Segments Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_ISDBT_SEGMENTS = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.ISDBT_SEGMENTS; + android.hardware.tv.tuner.FrontendStatusType.ISDBT_SEGMENTS; /** * TS Data Rates Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_TS_DATA_RATES = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.TS_DATA_RATES; + android.hardware.tv.tuner.FrontendStatusType.TS_DATA_RATES; /** * Extended Modulations Type. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_MODULATIONS_EXT = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.MODULATIONS; + android.hardware.tv.tuner.FrontendStatusType.MODULATIONS; /** * Roll Off Type status of the frontend. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_ROLL_OFF = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.ROLL_OFF; + android.hardware.tv.tuner.FrontendStatusType.ROLL_OFF; /** * If the frontend currently supports MISO or not. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_IS_MISO_ENABLED = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.IS_MISO; + android.hardware.tv.tuner.FrontendStatusType.IS_MISO; /** * If the frontend code rate is linear or not. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_IS_LINEAR = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.IS_LINEAR; + android.hardware.tv.tuner.FrontendStatusType.IS_LINEAR; /** * If short frames is enabled or not. Only supported in Tuner HAL 1.1 or higher. */ public static final int FRONTEND_STATUS_TYPE_IS_SHORT_FRAMES_ENABLED = - android.hardware.tv.tuner.V1_1.Constants.FrontendStatusTypeExt1_1.IS_SHORT_FRAMES; + android.hardware.tv.tuner.FrontendStatusType.IS_SHORT_FRAMES; /** @hide */ @IntDef(value = { diff --git a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java index 02cdb96285e35..14b0b029ab377 100644 --- a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java @@ -20,7 +20,9 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendIsdbs3Coderate; +import android.hardware.tv.tuner.FrontendIsdbs3Modulation; +import android.hardware.tv.tuner.FrontendIsdbs3Rolloff; import android.media.tv.tuner.Tuner; import java.lang.annotation.Retention; @@ -45,31 +47,31 @@ public class Isdbs3FrontendSettings extends FrontendSettings { /** * Modulation undefined. */ - public static final int MODULATION_UNDEFINED = Constants.FrontendIsdbs3Modulation.UNDEFINED; + public static final int MODULATION_UNDEFINED = FrontendIsdbs3Modulation.UNDEFINED; /** * Hardware is able to detect and set modulation automatically. */ - public static final int MODULATION_AUTO = Constants.FrontendIsdbs3Modulation.AUTO; + public static final int MODULATION_AUTO = FrontendIsdbs3Modulation.AUTO; /** * BPSK Modulation. */ - public static final int MODULATION_MOD_BPSK = Constants.FrontendIsdbs3Modulation.MOD_BPSK; + public static final int MODULATION_MOD_BPSK = FrontendIsdbs3Modulation.MOD_BPSK; /** * QPSK Modulation. */ - public static final int MODULATION_MOD_QPSK = Constants.FrontendIsdbs3Modulation.MOD_QPSK; + public static final int MODULATION_MOD_QPSK = FrontendIsdbs3Modulation.MOD_QPSK; /** * 8PSK Modulation. */ - public static final int MODULATION_MOD_8PSK = Constants.FrontendIsdbs3Modulation.MOD_8PSK; + public static final int MODULATION_MOD_8PSK = FrontendIsdbs3Modulation.MOD_8PSK; /** * 16APSK Modulation. */ - public static final int MODULATION_MOD_16APSK = Constants.FrontendIsdbs3Modulation.MOD_16APSK; + public static final int MODULATION_MOD_16APSK = FrontendIsdbs3Modulation.MOD_16APSK; /** * 32APSK Modulation. */ - public static final int MODULATION_MOD_32APSK = Constants.FrontendIsdbs3Modulation.MOD_32APSK; + public static final int MODULATION_MOD_32APSK = FrontendIsdbs3Modulation.MOD_32APSK; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -83,55 +85,55 @@ public class Isdbs3FrontendSettings extends FrontendSettings { /** * Code rate undefined. */ - public static final int CODERATE_UNDEFINED = Constants.FrontendIsdbs3Coderate.UNDEFINED; + public static final int CODERATE_UNDEFINED = FrontendIsdbs3Coderate.UNDEFINED; /** * Hardware is able to detect and set code rate automatically. */ - public static final int CODERATE_AUTO = Constants.FrontendIsdbs3Coderate.AUTO; + public static final int CODERATE_AUTO = FrontendIsdbs3Coderate.AUTO; /** * 1/3 code rate. */ - public static final int CODERATE_1_3 = Constants.FrontendIsdbs3Coderate.CODERATE_1_3; + public static final int CODERATE_1_3 = FrontendIsdbs3Coderate.CODERATE_1_3; /** * 2/5 code rate. */ - public static final int CODERATE_2_5 = Constants.FrontendIsdbs3Coderate.CODERATE_2_5; + public static final int CODERATE_2_5 = FrontendIsdbs3Coderate.CODERATE_2_5; /** * 1/2 code rate. */ - public static final int CODERATE_1_2 = Constants.FrontendIsdbs3Coderate.CODERATE_1_2; + public static final int CODERATE_1_2 = FrontendIsdbs3Coderate.CODERATE_1_2; /** * 3/5 code rate. */ - public static final int CODERATE_3_5 = Constants.FrontendIsdbs3Coderate.CODERATE_3_5; + public static final int CODERATE_3_5 = FrontendIsdbs3Coderate.CODERATE_3_5; /** * 2/3 code rate. */ - public static final int CODERATE_2_3 = Constants.FrontendIsdbs3Coderate.CODERATE_2_3; + public static final int CODERATE_2_3 = FrontendIsdbs3Coderate.CODERATE_2_3; /** * 3/4 code rate. */ - public static final int CODERATE_3_4 = Constants.FrontendIsdbs3Coderate.CODERATE_3_4; + public static final int CODERATE_3_4 = FrontendIsdbs3Coderate.CODERATE_3_4; /** * 7/9 code rate. */ - public static final int CODERATE_7_9 = Constants.FrontendIsdbs3Coderate.CODERATE_7_9; + public static final int CODERATE_7_9 = FrontendIsdbs3Coderate.CODERATE_7_9; /** * 4/5 code rate. */ - public static final int CODERATE_4_5 = Constants.FrontendIsdbs3Coderate.CODERATE_4_5; + public static final int CODERATE_4_5 = FrontendIsdbs3Coderate.CODERATE_4_5; /** * 5/6 code rate. */ - public static final int CODERATE_5_6 = Constants.FrontendIsdbs3Coderate.CODERATE_5_6; + public static final int CODERATE_5_6 = FrontendIsdbs3Coderate.CODERATE_5_6; /** * 7/8 code rate. */ - public static final int CODERATE_7_8 = Constants.FrontendIsdbs3Coderate.CODERATE_7_8; + public static final int CODERATE_7_8 = FrontendIsdbs3Coderate.CODERATE_7_8; /** * 9/10 code rate. */ - public static final int CODERATE_9_10 = Constants.FrontendIsdbs3Coderate.CODERATE_9_10; + public static final int CODERATE_9_10 = FrontendIsdbs3Coderate.CODERATE_9_10; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -142,11 +144,11 @@ public class Isdbs3FrontendSettings extends FrontendSettings { /** * Rolloff type undefined. */ - public static final int ROLLOFF_UNDEFINED = Constants.FrontendIsdbs3Rolloff.UNDEFINED; + public static final int ROLLOFF_UNDEFINED = FrontendIsdbs3Rolloff.UNDEFINED; /** * 0,03 Rolloff. */ - public static final int ROLLOFF_0_03 = Constants.FrontendIsdbs3Rolloff.ROLLOFF_0_03; + public static final int ROLLOFF_0_03 = FrontendIsdbs3Rolloff.ROLLOFF_0_03; private final int mStreamId; diff --git a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java index 3cc1aab6a9a65..aab6408e4f428 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java @@ -20,7 +20,10 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendIsdbsCoderate; +import android.hardware.tv.tuner.FrontendIsdbsModulation; +import android.hardware.tv.tuner.FrontendIsdbsRolloff; +import android.hardware.tv.tuner.FrontendIsdbsStreamIdType; import android.media.tv.tuner.Tuner; import java.lang.annotation.Retention; @@ -42,12 +45,12 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** * Uses stream ID. */ - public static final int STREAM_ID_TYPE_ID = Constants.FrontendIsdbsStreamIdType.STREAM_ID; + public static final int STREAM_ID_TYPE_ID = FrontendIsdbsStreamIdType.STREAM_ID; /** * Uses relative number. */ public static final int STREAM_ID_TYPE_RELATIVE_NUMBER = - Constants.FrontendIsdbsStreamIdType.RELATIVE_STREAM_NUMBER; + FrontendIsdbsStreamIdType.RELATIVE_STREAM_NUMBER; /** @hide */ @@ -61,23 +64,23 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** * Modulation undefined. */ - public static final int MODULATION_UNDEFINED = Constants.FrontendIsdbsModulation.UNDEFINED; + public static final int MODULATION_UNDEFINED = FrontendIsdbsModulation.UNDEFINED; /** * Hardware is able to detect and set modulation automatically */ - public static final int MODULATION_AUTO = Constants.FrontendIsdbsModulation.AUTO; + public static final int MODULATION_AUTO = FrontendIsdbsModulation.AUTO; /** * BPSK Modulation. */ - public static final int MODULATION_MOD_BPSK = Constants.FrontendIsdbsModulation.MOD_BPSK; + public static final int MODULATION_MOD_BPSK = FrontendIsdbsModulation.MOD_BPSK; /** * QPSK Modulation. */ - public static final int MODULATION_MOD_QPSK = Constants.FrontendIsdbsModulation.MOD_QPSK; + public static final int MODULATION_MOD_QPSK = FrontendIsdbsModulation.MOD_QPSK; /** * TC8PSK Modulation. */ - public static final int MODULATION_MOD_TC8PSK = Constants.FrontendIsdbsModulation.MOD_TC8PSK; + public static final int MODULATION_MOD_TC8PSK = FrontendIsdbsModulation.MOD_TC8PSK; /** @hide */ @@ -91,31 +94,31 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** * Code rate undefined. */ - public static final int CODERATE_UNDEFINED = Constants.FrontendIsdbsCoderate.UNDEFINED; + public static final int CODERATE_UNDEFINED = FrontendIsdbsCoderate.UNDEFINED; /** * Hardware is able to detect and set code rate automatically. */ - public static final int CODERATE_AUTO = Constants.FrontendIsdbsCoderate.AUTO; + public static final int CODERATE_AUTO = FrontendIsdbsCoderate.AUTO; /** * 1/2 code rate. */ - public static final int CODERATE_1_2 = Constants.FrontendIsdbsCoderate.CODERATE_1_2; + public static final int CODERATE_1_2 = FrontendIsdbsCoderate.CODERATE_1_2; /** * 2/3 code rate. */ - public static final int CODERATE_2_3 = Constants.FrontendIsdbsCoderate.CODERATE_2_3; + public static final int CODERATE_2_3 = FrontendIsdbsCoderate.CODERATE_2_3; /** * 3/4 code rate. */ - public static final int CODERATE_3_4 = Constants.FrontendIsdbsCoderate.CODERATE_3_4; + public static final int CODERATE_3_4 = FrontendIsdbsCoderate.CODERATE_3_4; /** * 5/6 code rate. */ - public static final int CODERATE_5_6 = Constants.FrontendIsdbsCoderate.CODERATE_5_6; + public static final int CODERATE_5_6 = FrontendIsdbsCoderate.CODERATE_5_6; /** * 7/8 code rate. */ - public static final int CODERATE_7_8 = Constants.FrontendIsdbsCoderate.CODERATE_7_8; + public static final int CODERATE_7_8 = FrontendIsdbsCoderate.CODERATE_7_8; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -126,11 +129,11 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** * Rolloff type undefined. */ - public static final int ROLLOFF_UNDEFINED = Constants.FrontendIsdbsRolloff.UNDEFINED; + public static final int ROLLOFF_UNDEFINED = FrontendIsdbsRolloff.UNDEFINED; /** * 0,35 rolloff. */ - public static final int ROLLOFF_0_35 = Constants.FrontendIsdbsRolloff.ROLLOFF_0_35; + public static final int ROLLOFF_0_35 = FrontendIsdbsRolloff.ROLLOFF_0_35; private final int mStreamId; diff --git a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java index 6a14d08a4248d..de2476a6ba20c 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java @@ -20,7 +20,9 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendIsdbtBandwidth; +import android.hardware.tv.tuner.FrontendIsdbtMode; +import android.hardware.tv.tuner.FrontendIsdbtModulation; import android.media.tv.tuner.frontend.DvbtFrontendSettings.CodeRate; import java.lang.annotation.Retention; @@ -44,27 +46,27 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** * Modulation undefined. */ - public static final int MODULATION_UNDEFINED = Constants.FrontendIsdbtModulation.UNDEFINED; + public static final int MODULATION_UNDEFINED = FrontendIsdbtModulation.UNDEFINED; /** * Hardware is able to detect and set modulation automatically */ - public static final int MODULATION_AUTO = Constants.FrontendIsdbtModulation.AUTO; + public static final int MODULATION_AUTO = FrontendIsdbtModulation.AUTO; /** * DQPSK Modulation. */ - public static final int MODULATION_MOD_DQPSK = Constants.FrontendIsdbtModulation.MOD_DQPSK; + public static final int MODULATION_MOD_DQPSK = FrontendIsdbtModulation.MOD_DQPSK; /** * QPSK Modulation. */ - public static final int MODULATION_MOD_QPSK = Constants.FrontendIsdbtModulation.MOD_QPSK; + public static final int MODULATION_MOD_QPSK = FrontendIsdbtModulation.MOD_QPSK; /** * 16QAM Modulation. */ - public static final int MODULATION_MOD_16QAM = Constants.FrontendIsdbtModulation.MOD_16QAM; + public static final int MODULATION_MOD_16QAM = FrontendIsdbtModulation.MOD_16QAM; /** * 64QAM Modulation. */ - public static final int MODULATION_MOD_64QAM = Constants.FrontendIsdbtModulation.MOD_64QAM; + public static final int MODULATION_MOD_64QAM = FrontendIsdbtModulation.MOD_64QAM; /** @hide */ @@ -77,23 +79,23 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** * Mode undefined. */ - public static final int MODE_UNDEFINED = Constants.FrontendIsdbtMode.UNDEFINED; + public static final int MODE_UNDEFINED = FrontendIsdbtMode.UNDEFINED; /** * Hardware is able to detect and set Mode automatically. */ - public static final int MODE_AUTO = Constants.FrontendIsdbtMode.AUTO; + public static final int MODE_AUTO = FrontendIsdbtMode.AUTO; /** * Mode 1 */ - public static final int MODE_1 = Constants.FrontendIsdbtMode.MODE_1; + public static final int MODE_1 = FrontendIsdbtMode.MODE_1; /** * Mode 2 */ - public static final int MODE_2 = Constants.FrontendIsdbtMode.MODE_2; + public static final int MODE_2 = FrontendIsdbtMode.MODE_2; /** * Mode 3 */ - public static final int MODE_3 = Constants.FrontendIsdbtMode.MODE_3; + public static final int MODE_3 = FrontendIsdbtMode.MODE_3; /** @hide */ @@ -107,23 +109,23 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** * Bandwidth undefined. */ - public static final int BANDWIDTH_UNDEFINED = Constants.FrontendIsdbtBandwidth.UNDEFINED; + public static final int BANDWIDTH_UNDEFINED = FrontendIsdbtBandwidth.UNDEFINED; /** * Hardware is able to detect and set Bandwidth automatically. */ - public static final int BANDWIDTH_AUTO = Constants.FrontendIsdbtBandwidth.AUTO; + public static final int BANDWIDTH_AUTO = FrontendIsdbtBandwidth.AUTO; /** * 8 MHz bandwidth. */ - public static final int BANDWIDTH_8MHZ = Constants.FrontendIsdbtBandwidth.BANDWIDTH_8MHZ; + public static final int BANDWIDTH_8MHZ = FrontendIsdbtBandwidth.BANDWIDTH_8MHZ; /** * 7 MHz bandwidth. */ - public static final int BANDWIDTH_7MHZ = Constants.FrontendIsdbtBandwidth.BANDWIDTH_7MHZ; + public static final int BANDWIDTH_7MHZ = FrontendIsdbtBandwidth.BANDWIDTH_7MHZ; /** * 6 MHz bandwidth. */ - public static final int BANDWIDTH_6MHZ = Constants.FrontendIsdbtBandwidth.BANDWIDTH_6MHZ; + public static final int BANDWIDTH_6MHZ = FrontendIsdbtBandwidth.BANDWIDTH_6MHZ; private final int mModulation; private final int mBandwidth; diff --git a/media/java/android/media/tv/tuner/frontend/OnTuneEventListener.java b/media/java/android/media/tv/tuner/frontend/OnTuneEventListener.java index 5cf0d319c7c96..3b5419e747693 100644 --- a/media/java/android/media/tv/tuner/frontend/OnTuneEventListener.java +++ b/media/java/android/media/tv/tuner/frontend/OnTuneEventListener.java @@ -18,7 +18,7 @@ package android.media.tv.tuner.frontend; import android.annotation.IntDef; import android.annotation.SystemApi; -import android.hardware.tv.tuner.V1_0.Constants; +import android.hardware.tv.tuner.FrontendEventType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -37,11 +37,11 @@ public interface OnTuneEventListener { @interface TuneEvent {} /** The frontend has locked to the signal specified by the tune method. */ - int SIGNAL_LOCKED = Constants.FrontendEventType.LOCKED; + int SIGNAL_LOCKED = FrontendEventType.LOCKED; /** The frontend is unable to lock to the signal specified by the tune method. */ - int SIGNAL_NO_SIGNAL = Constants.FrontendEventType.NO_SIGNAL; + int SIGNAL_NO_SIGNAL = FrontendEventType.NO_SIGNAL; /** The frontend has lost the lock to the signal specified by the tune method. */ - int SIGNAL_LOST_LOCK = Constants.FrontendEventType.LOST_LOCK; + int SIGNAL_LOST_LOCK = FrontendEventType.LOST_LOCK; /** Tune Event from the frontend */ void onTuneEvent(@TuneEvent int tuneEvent); diff --git a/services/core/Android.bp b/services/core/Android.bp index 282b868a4ecb7..689890f3ce775 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -92,6 +92,7 @@ java_library_static { name: "services.core.unboosted", defaults: ["platform_service_defaults"], srcs: [ + ":android.hardware.biometrics.face-V1-java-source", ":statslog-art-java-gen", ":services.core-sources", ":services.core.protologsrc", @@ -116,6 +117,7 @@ java_library_static { libs: [ "services.net", + "android.hardware.common-V2-java", "android.hardware.light-V2.0-java", "android.hardware.gnss-V1-java", "android.hardware.power-V1-java", @@ -145,7 +147,6 @@ java_library_static { "android.hardware.light-V1-java", "android.hardware.tv.cec-V1.1-java", "android.hardware.weaver-V1.0-java", - "android.hardware.biometrics.face-V1-java", "android.hardware.biometrics.face-V1.0-java", "android.hardware.biometrics.fingerprint-V2.3-java", "android.hardware.biometrics.fingerprint-V1-java",