H265RtpDepacketizer: Make start sequence configurable

Per PR review feedback, add a parameter to the constructor for
configuring the start sequence to use when writing NALUs.

Author: edmonds

include/rtc/h265rtpdepacketizer.hpp

@@ -13,6 +13,7 @@
 #if RTC_ENABLE_MEDIA
 
 #include "common.hpp"
+#include "h265nalunit.hpp"
 #include "mediahandler.hpp"
 #include "message.hpp"
 #include "rtp.hpp"
@@ -24,14 +25,18 @@ namespace rtc {
 /// RTP depacketization for H265
 class RTC_CPP_EXPORT H265RtpDepacketizer : public MediaHandler {
 public:
-	H265RtpDepacketizer() = default;
+	using Separator = NalUnit::Separator;
+
+	H265RtpDepacketizer(Separator separator = Separator::LongStartSequence);
 	virtual ~H265RtpDepacketizer() = default;
 
 	void incoming(message_vector &messages, const message_callback &send) override;
 
 private:
 	std::vector<message_ptr> mRtpBuffer;
+	const NalUnit::Separator separator;
 
+	void addSeparator(binary& accessUnit);
 	message_vector buildFrames(message_vector::iterator firstPkt, message_vector::iterator lastPkt,
 	                           uint32_t timestamp);
 };

src/h265rtpdepacketizer.cpp

@@ -15,11 +15,44 @@
 
 namespace rtc {
 
-const binary naluStartCode = {byte{0}, byte{0}, byte{0}, byte{1}};
+const binary naluLongStartCode = {byte{0}, byte{0}, byte{0}, byte{1}};
+const binary naluShortStartCode = {byte{0}, byte{0}, byte{1}};
 
 const uint8_t naluTypeAP = 48;
 const uint8_t naluTypeFU = 49;
 
+H265RtpDepacketizer::H265RtpDepacketizer(Separator separator) : separator(separator) {
+	switch (separator) {
+	case Separator::StartSequence: [[fallthrough]];
+	case Separator::LongStartSequence: [[fallthrough]];
+	case Separator::ShortStartSequence:
+		break;
+	case Separator::Length: [[fallthrough]];
+	default:
+		throw std::invalid_argument("Invalid separator");
+	}
+}
+
+void H265RtpDepacketizer::addSeparator(binary& accessUnit)
+{
+	switch (separator) {
+	case Separator::StartSequence: [[fallthrough]];
+	case Separator::LongStartSequence:
+		accessUnit.insert(accessUnit.end(),
+		                  naluLongStartCode.begin(),
+		                  naluLongStartCode.end());
+		break;
+	case Separator::ShortStartSequence:
+		accessUnit.insert(accessUnit.end(),
+		                  naluShortStartCode.begin(),
+		                  naluShortStartCode.end());
+		break;
+	case Separator::Length: [[fallthrough]];
+	default:
+		throw std::invalid_argument("Invalid separator");
+	}
+}
+
 message_vector H265RtpDepacketizer::buildFrames(message_vector::iterator begin,
                                                 message_vector::iterator end, uint32_t timestamp) {
 	message_vector out = {};
@@ -51,8 +84,7 @@ message_vector H265RtpDepacketizer::buildFrames(message_vector::iterator begin,
 			    std::to_integer<uint8_t>(pkt->at(rtpHeaderSize + sizeof(H265NalUnitHeader)))};
 
 			if (nFrags++ == 0) {
-				accessUnit.insert(accessUnit.end(), naluStartCode.begin(), naluStartCode.end());
-
+				addSeparator(accessUnit);
 				nalUnitHeader.setUnitType(nalUnitFragmentHeader.unitType());
 				accessUnit.emplace_back(byte(nalUnitHeader._first));
 				accessUnit.emplace_back(byte(nalUnitHeader._second));
@@ -75,8 +107,7 @@ message_vector H265RtpDepacketizer::buildFrames(message_vector::iterator begin,
 					throw std::runtime_error("H265 AP declared size is larger than buffer");
 				}
 
-				accessUnit.insert(accessUnit.end(), naluStartCode.begin(), naluStartCode.end());
-
+				addSeparator(accessUnit);
 				accessUnit.insert(accessUnit.end(), pkt->begin() + currOffset,
 				                  pkt->begin() + currOffset + naluSize);
 
@@ -85,7 +116,7 @@ message_vector H265RtpDepacketizer::buildFrames(message_vector::iterator begin,
 		} else if (nalUnitHeader.unitType() < naluTypeAP) {
 			// "NAL units with NAL unit type values in the range of 0 to 47, inclusive, may be
 			// passed to the decoder."
-			accessUnit.insert(accessUnit.end(), naluStartCode.begin(), naluStartCode.end());
+			addSeparator(accessUnit);
 			accessUnit.insert(accessUnit.end(), pkt->begin() + rtpHeaderSize, pkt->end());
 		} else {
 			// "NAL-unit-like structures with NAL unit type values in the range of 48 to 63,