Add FrameInfo

Depacketizers will include metadata about assembled frame.

Author: Sean-Der

CMakeLists.txt

@@ -67,6 +67,7 @@ set(LIBDATACHANNEL_SOURCES
 	${CMAKE_CURRENT_SOURCE_DIR}/src/mediahandler.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/global.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/message.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/src/frameinfo.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/peerconnection.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/rtcpreceivingsession.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/track.cpp
@@ -99,6 +100,7 @@ set(LIBDATACHANNEL_HEADERS
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/common.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/global.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/message.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/frameinfo.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/peerconnection.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/reliability.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtc.h

include/rtc/frameinfo.hpp

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2019-2020 Paul-Louis Ageneau
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef RTC_FRAMEINFO_H
+#define RTC_FRAMEINFO_H
+
+#if RTC_ENABLE_MEDIA
+
+#include "common.hpp"
+#include "message.hpp"
+
+namespace rtc {
+
+struct RTC_CPP_EXPORT FrameInfo : Message {
+	FrameInfo(binary &&data, uint32_t timestamp) : Message(std::move(data)), timestamp(timestamp) {}
+
+	template <typename Iterator>
+	FrameInfo(Iterator begin_, Iterator end_, uint32_t timestamp)
+	    : Message(begin_, end_, Binary), timestamp(timestamp) {}
+
+	uint32_t timestamp = 0; // RTP Timestamp
+};
+
+using frame_info_ptr = shared_ptr<FrameInfo>;
+using frame_info_callback = std::function<void(frame_info_ptr)>;
+using frame_info_vector = std::vector<frame_info_ptr>;
+
+template <typename Iterator>
+frame_info_ptr make_frame_info(Iterator begin, Iterator end, uint32_t timestamp) {
+	auto frame_info = std::make_shared<FrameInfo>(begin, end, timestamp);
+	frame_info->stream = 0;
+	frame_info->reliability = nullptr;
+	return frame_info;
+}
+
+RTC_CPP_EXPORT frame_info_ptr make_frame_info(binary &&data, uint32_t timestamp);
+
+} // namespace rtc
+
+#endif // RTC_ENABLE_MEDIA
+#endif // RTC_FRAMEINFO_H

include/rtc/h264rtpdepacketizer.hpp

@@ -13,8 +13,8 @@
 #if RTC_ENABLE_MEDIA
 
 #include "common.hpp"
+#include "frameinfo.hpp"
 #include "mediahandler.hpp"
-#include "message.hpp"
 #include "rtp.hpp"
 
 #include <iterator>
@@ -32,7 +32,8 @@ class RTC_CPP_EXPORT H264RtpDepacketizer : public MediaHandler {
 private:
 	std::vector<message_ptr> mRtpBuffer;
 
-	message_vector buildFrames(message_vector::iterator firstPkt, message_vector::iterator lastPkt);
+	frame_info_vector buildFrameInfos(message_vector::iterator firstPkt,
+	                                  message_vector::iterator lastPkt, uint32_t timestamp);
 };
 
 } // namespace rtc

src/frameinfo.cpp

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2019-2020 Paul-Louis Ageneau
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#if RTC_ENABLE_MEDIA
+
+#include "frameinfo.hpp"
+
+namespace rtc {
+
+frame_info_ptr make_frame_info(binary &&data, uint32_t timestamp) {
+	auto frame_info = std::make_shared<FrameInfo>(std::move(data), timestamp);
+	frame_info->stream = 0;
+	frame_info->reliability = nullptr;
+	return frame_info;
+}
+
+} // namespace rtc
+
+#endif // RTC_ENABLE_MEDIA
+

src/h264rtpdepacketizer.cpp

@@ -31,9 +31,10 @@ const auto fuaHeaderSize = 2;
 const uint8_t naluTypeSTAPA = 24;
 const uint8_t naluTypeFUA = 28;
 
-message_vector H264RtpDepacketizer::buildFrames(message_vector::iterator begin,
-                                                message_vector::iterator end) {
-	message_vector out = {};
+frame_info_vector H264RtpDepacketizer::buildFrameInfos(message_vector::iterator begin,
+                                                       message_vector::iterator end,
+                                                       uint32_t timestamp) {
+	frame_info_vector out = {};
 	auto fua_buffer = std::vector<std::byte>{};
 
 	for (auto it = begin; it != end; it++) {
@@ -58,11 +59,11 @@ message_vector H264RtpDepacketizer::buildFrames(message_vector::iterator begin,
 				fua_buffer.at(0) =
 				    std::byte(nalUnitHeader.idc() | nalUnitFragmentHeader.unitType());
 
-				out.push_back(make_message(std::move(fua_buffer)));
+				out.push_back(make_frame_info(std::move(fua_buffer), timestamp));
 				fua_buffer.clear();
 			}
 		} else if (nalUnitHeader.unitType() > 0 && nalUnitHeader.unitType() < 24) {
-			out.push_back(make_message(pkt->begin() + headerSize, pkt->end()));
+			out.push_back(make_frame_info(pkt->begin() + headerSize, pkt->end(), timestamp));
 		} else if (nalUnitHeader.unitType() == naluTypeSTAPA) {
 			auto currOffset = stapaHeaderSize + headerSize;
 
@@ -76,8 +77,8 @@ message_vector H264RtpDepacketizer::buildFrames(message_vector::iterator begin,
 					throw std::runtime_error("STAP-A declared size is larger then buffer");
 				}
 
-				out.push_back(
-				    make_message(pkt->begin() + currOffset, pkt->begin() + currOffset + naluSize));
+				out.push_back(make_frame_info(pkt->begin() + currOffset,
+				                              pkt->begin() + currOffset + naluSize, timestamp));
 				currOffset += naluSize;
 			}
 
@@ -128,7 +129,7 @@ void H264RtpDepacketizer::incoming(message_vector &messages, const message_callb
 		auto begin = mRtpBuffer.begin();
 		auto end = mRtpBuffer.begin() + (packets_in_timestamp - 1);
 
-		auto frames = buildFrames(begin, end + 1);
+		auto frames = buildFrameInfos(begin, end + 1, current_timestamp);
 		messages.insert(messages.end(), frames.begin(), frames.end());
 		mRtpBuffer.erase(mRtpBuffer.begin(), mRtpBuffer.begin() + packets_in_timestamp);
 	}