Merge "Add comments for invalid IP/port and add Invalid filterID/avSyncId" (1933b53a) · Commits · e / os / android_hardware_interfaces

tv/tuner/1.0/types.hal

+27 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1954,7 +1954,7 @@ safe_union DemuxPid {
	};		};

	@export		@export
	enum Constant : uint16_t {		enum Constant : uint32_t {
	/**		/**
	* An invalid packet ID in transport stream according to ISO/IEC 13818-1.		* An invalid packet ID in transport stream according to ISO/IEC 13818-1.
	*/		*/
	@@ -1963,6 +1963,14 @@ enum Constant : uint16_t {
	* An invalid Stream ID.		* An invalid Stream ID.
	*/		*/
	INVALID_STREAM_ID = 0xFFFF,		INVALID_STREAM_ID = 0xFFFF,
			/**
			* An invalid Filter ID.
			*/
			INVALID_FILTER_ID = 0xFFFFFFFF,
			/**
			* An invalid AV sync hardware ID.
			*/
			INVALID_AV_SYNC_ID = 0xFFFFFFFF,
	};		};

	/**		/**
	@@ -2181,19 +2189,37 @@ struct DemuxFilterDownloadSettings {
	*/		*/
	struct DemuxIpAddress {		struct DemuxIpAddress {
	safe_union SrcIpAddress {		safe_union SrcIpAddress {
			/**
			* 0.0.0.0 is invalid. should be ignored.
			*/
	uint8_t[4] v4;		uint8_t[4] v4;

			/**
			* 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 is invalid. should be ignored.
			*/
	uint8_t[16] v6;		uint8_t[16] v6;
	} srcIpAddress;		} srcIpAddress;

	safe_union DstIpAddress {		safe_union DstIpAddress {
			/**
			* 0.0.0.0 is invalid. should be ignored.
			*/
	uint8_t[4] v4;		uint8_t[4] v4;

			/**
			* 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 is invalid. should be ignored.
			*/
	uint8_t[16] v6;		uint8_t[16] v6;
	} dstIpAddress;		} dstIpAddress;

			/**
			* 0 is invalid. should be ignored.
			*/
	uint16_t srcPort;		uint16_t srcPort;

			/**
			* 0 is invalid. should be ignored.
			*/
	uint16_t dstPort;		uint16_t dstPort;
	};		};