Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

common.xml: Add "encoding" field to VIDEO_STREAM_INFORMATION #364

Merged
merged 2 commits into from
Jul 22, 2024
Merged

common.xml: Add "encoding" field to VIDEO_STREAM_INFORMATION #364

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9196684
common.xml: Add "encoding" field to VIDEO_STREAM_INFORMATION
nexton-winjeel Jun 25, 2024
d0f045a
common.xml: Remove encodings from video stream type
nexton-winjeel Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions message_definitions/v1.0/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3331,8 +3331,20 @@
<entry value="2" name="VIDEO_STREAM_TYPE_TCP_MPEG">
<description>Stream is MPEG on TCP</description>
</entry>
<entry value="3" name="VIDEO_STREAM_TYPE_MPEG_TS_H264">
<description>Stream is h.264 on MPEG TS (URI gives the port number)</description>
<entry value="3" name="VIDEO_STREAM_TYPE_MPEG_TS">
<description>Stream is MPEG TS (URI gives the port number)</description>
</entry>
</enum>
<enum name="VIDEO_STREAM_ENCODING">
<description>Video stream encodings</description>
<entry value="0" name="VIDEO_STREAM_ENCODING_UNKNOWN">
<description>Stream encoding is unknown</description>
</entry>
<entry value="1" name="VIDEO_STREAM_ENCODING_H264">
<description>Stream encoding is H.264</description>
</entry>
<entry value="2" name="VIDEO_STREAM_ENCODING_H265">
<description>Stream encoding is H.265</description>
</entry>
</enum>
<enum name="CAMERA_TRACKING_STATUS_FLAGS">
Expand Down Expand Up @@ -6037,6 +6049,8 @@
<field type="uint16_t" name="hfov" units="deg">Horizontal Field of view.</field>
<field type="char[32]" name="name">Stream name.</field>
<field type="char[160]" name="uri">Video stream URI (TCP or RTSP URI ground station should connect to) or port number (UDP port ground station should listen to).</field>
<extensions/>
<field type="uint8_t" name="encoding" enum="VIDEO_STREAM_ENCODING">Encoding of stream.</field>
</message>
<message id="270" name="VIDEO_STREAM_STATUS">
<description>Information about the status of a video stream. It may be requested using MAV_CMD_REQUEST_MESSAGE.</description>
Expand Down
Loading