diff --git a/include/smolrtsp/nal_transport.h b/include/smolrtsp/nal_transport.h index 271dbb2..6e68be6 100644 --- a/include/smolrtsp/nal_transport.h +++ b/include/smolrtsp/nal_transport.h @@ -42,11 +42,6 @@ typedef struct { * The maximum size of an H.265 NAL unit (including the header). */ size_t max_h265_nalu_size; - - /** - * The encoder uses slice segments. - */ - bool is_coded_slice; } SmolRTSP_NalTransportConfig; /** @@ -56,7 +51,6 @@ typedef struct { * * - `max_h264_nalu_size` is #SMOLRTSP_MAX_H264_NALU_SIZE. * - `max_h265_nalu_size` is #SMOLRTSP_MAX_H265_NALU_SIZE. - * - `is_coded_slice` is `false`. */ SmolRTSP_NalTransportConfig SmolRTSP_NalTransportConfig_default(void) SMOLRTSP_PRIV_MUST_USE; diff --git a/src/nal_transport.c b/src/nal_transport.c index 0fbc226..8ac25a7 100644 --- a/src/nal_transport.c +++ b/src/nal_transport.c @@ -10,7 +10,7 @@ static int send_fragmentized_nal_data( SmolRTSP_RtpTransport *t, SmolRTSP_RtpTimestamp ts, size_t max_packet_size, - SmolRTSP_NalUnit nalu, bool is_coded_slice); + SmolRTSP_NalUnit nalu); static int send_fu( SmolRTSP_RtpTransport *t, SmolRTSP_RtpTimestamp ts, SmolRTSP_NalUnit fu, bool is_first_fragment, bool is_last_fragment); @@ -19,7 +19,6 @@ SmolRTSP_NalTransportConfig SmolRTSP_NalTransportConfig_default(void) { return (SmolRTSP_NalTransportConfig){ .max_h264_nalu_size = SMOLRTSP_MAX_H264_NALU_SIZE, .max_h265_nalu_size = SMOLRTSP_MAX_H265_NALU_SIZE, - .is_coded_slice = false, }; } @@ -89,15 +88,14 @@ int SmolRTSP_NalTransport_send_packet( } return send_fragmentized_nal_data( - self->transport, ts, max_packet_size, nalu, - self->config.is_coded_slice); + self->transport, ts, max_packet_size, nalu); } // See (H.264), // (H.265). static int send_fragmentized_nal_data( SmolRTSP_RtpTransport *t, SmolRTSP_RtpTimestamp ts, size_t max_packet_size, - SmolRTSP_NalUnit nalu, bool is_coded_slice) { + SmolRTSP_NalUnit nalu) { const size_t rem = nalu.payload.len % max_packet_size, packets_count = (nalu.payload.len - rem) / max_packet_size; @@ -122,7 +120,7 @@ static int send_fragmentized_nal_data( U8Slice99_advance(nalu.payload, packets_count * max_packet_size); const SmolRTSP_NalUnit fu = {nalu.header, fu_data}; const bool is_first_fragment = 0 == packets_count, - is_last_fragment = !is_coded_slice; + is_last_fragment = true; if (send_fu(t, ts, fu, is_first_fragment, is_last_fragment) == -1) { return -1;