Skip to content

Commit 69186c9

Browse files
authored
Revert "Add support for slice segments" (#21)
1 parent e683263 commit 69186c9

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

include/smolrtsp/nal_transport.h

-6
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ typedef struct {
4242
* The maximum size of an H.265 NAL unit (including the header).
4343
*/
4444
size_t max_h265_nalu_size;
45-
46-
/**
47-
* The encoder uses slice segments.
48-
*/
49-
bool is_coded_slice;
5045
} SmolRTSP_NalTransportConfig;
5146

5247
/**
@@ -56,7 +51,6 @@ typedef struct {
5651
*
5752
* - `max_h264_nalu_size` is #SMOLRTSP_MAX_H264_NALU_SIZE.
5853
* - `max_h265_nalu_size` is #SMOLRTSP_MAX_H265_NALU_SIZE.
59-
* - `is_coded_slice` is `false`.
6054
*/
6155
SmolRTSP_NalTransportConfig
6256
SmolRTSP_NalTransportConfig_default(void) SMOLRTSP_PRIV_MUST_USE;

src/nal_transport.c

+4-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
static int send_fragmentized_nal_data(
1212
SmolRTSP_RtpTransport *t, SmolRTSP_RtpTimestamp ts, size_t max_packet_size,
13-
SmolRTSP_NalUnit nalu, bool is_coded_slice);
13+
SmolRTSP_NalUnit nalu);
1414
static int send_fu(
1515
SmolRTSP_RtpTransport *t, SmolRTSP_RtpTimestamp ts, SmolRTSP_NalUnit fu,
1616
bool is_first_fragment, bool is_last_fragment);
@@ -19,7 +19,6 @@ SmolRTSP_NalTransportConfig SmolRTSP_NalTransportConfig_default(void) {
1919
return (SmolRTSP_NalTransportConfig){
2020
.max_h264_nalu_size = SMOLRTSP_MAX_H264_NALU_SIZE,
2121
.max_h265_nalu_size = SMOLRTSP_MAX_H265_NALU_SIZE,
22-
.is_coded_slice = false,
2322
};
2423
}
2524

@@ -89,15 +88,14 @@ int SmolRTSP_NalTransport_send_packet(
8988
}
9089

9190
return send_fragmentized_nal_data(
92-
self->transport, ts, max_packet_size, nalu,
93-
self->config.is_coded_slice);
91+
self->transport, ts, max_packet_size, nalu);
9492
}
9593

9694
// See <https://tools.ietf.org/html/rfc6184#section-5.8> (H.264),
9795
// <https://tools.ietf.org/html/rfc7798#section-4.4.3> (H.265).
9896
static int send_fragmentized_nal_data(
9997
SmolRTSP_RtpTransport *t, SmolRTSP_RtpTimestamp ts, size_t max_packet_size,
100-
SmolRTSP_NalUnit nalu, bool is_coded_slice) {
98+
SmolRTSP_NalUnit nalu) {
10199
const size_t rem = nalu.payload.len % max_packet_size,
102100
packets_count = (nalu.payload.len - rem) / max_packet_size;
103101

@@ -122,7 +120,7 @@ static int send_fragmentized_nal_data(
122120
U8Slice99_advance(nalu.payload, packets_count * max_packet_size);
123121
const SmolRTSP_NalUnit fu = {nalu.header, fu_data};
124122
const bool is_first_fragment = 0 == packets_count,
125-
is_last_fragment = !is_coded_slice;
123+
is_last_fragment = true;
126124

127125
if (send_fu(t, ts, fu, is_first_fragment, is_last_fragment) == -1) {
128126
return -1;

0 commit comments

Comments
 (0)