cont.

versatica · Jul 4, 2024 · df75e8e · df75e8e
1 parent e1d0e7b
commit df75e8e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 31 deletions.
diff --git a/worker/test/src/RTC/Codecs/TestH264.cpp b/worker/test/src/RTC/Codecs/TestH264.cpp
@@ -21,10 +21,9 @@ SCENARIO("parse H264 payload descriptor", "[codecs][h264]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::H264::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<Codecs::H264::PayloadDescriptor> payloadDescriptor{ Codecs::H264::Parse(
+			buffer, sizeof(buffer)) };
 
 		REQUIRE(payloadDescriptor);
-
-		delete payloadDescriptor;
 	}
 }
diff --git a/worker/test/src/RTC/Codecs/TestH264_SVC.cpp b/worker/test/src/RTC/Codecs/TestH264_SVC.cpp
@@ -21,7 +21,9 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::H264_SVC::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<RTC::Codecs::H264_SVC::PayloadDescriptor> payloadDescriptor{
+			Codecs::H264_SVC::Parse(buffer, sizeof(buffer))
+		};
 
 		REQUIRE(payloadDescriptor);
 
@@ -31,8 +33,6 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 		REQUIRE(payloadDescriptor->isKeyFrame == true);
 		REQUIRE(payloadDescriptor->hasTlIndex == false);
 		REQUIRE(payloadDescriptor->hasSlIndex == false);
-
-		delete payloadDescriptor;
 	}
 
 	SECTION("parse payload descriptor for NALU 8")
@@ -49,7 +49,9 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::H264_SVC::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<RTC::Codecs::H264_SVC::PayloadDescriptor> payloadDescriptor{
+			Codecs::H264_SVC::Parse(buffer, sizeof(buffer))
+		};
 
 		REQUIRE(payloadDescriptor);
 
@@ -59,8 +61,6 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 		REQUIRE(payloadDescriptor->isKeyFrame == false);
 		REQUIRE(payloadDescriptor->hasTlIndex == false);
 		REQUIRE(payloadDescriptor->hasSlIndex == false);
-
-		delete payloadDescriptor;
 	}
 
 	SECTION("parse payload descriptor for NALU 1")
@@ -77,7 +77,9 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::H264_SVC::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<RTC::Codecs::H264_SVC::PayloadDescriptor> payloadDescriptor{
+			Codecs::H264_SVC::Parse(buffer, sizeof(buffer))
+		};
 
 		REQUIRE(payloadDescriptor);
 
@@ -87,8 +89,6 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 		REQUIRE(payloadDescriptor->isKeyFrame == false);
 		REQUIRE(payloadDescriptor->hasTlIndex == false);
 		REQUIRE(payloadDescriptor->hasSlIndex == false);
-
-		delete payloadDescriptor;
 	}
 
 	SECTION("parse payload descriptor for NALU 5")
@@ -105,7 +105,9 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::H264_SVC::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<RTC::Codecs::H264_SVC::PayloadDescriptor> payloadDescriptor{
+			Codecs::H264_SVC::Parse(buffer, sizeof(buffer))
+		};
 
 		REQUIRE(payloadDescriptor);
 
@@ -115,8 +117,6 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 		REQUIRE(payloadDescriptor->isKeyFrame == true);
 		REQUIRE(payloadDescriptor->hasTlIndex == false);
 		REQUIRE(payloadDescriptor->hasSlIndex == false);
-
-		delete payloadDescriptor;
 	}
 
 	SECTION("parse payload descriptor for NALU 14")
@@ -133,7 +133,9 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::H264_SVC::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<RTC::Codecs::H264_SVC::PayloadDescriptor> payloadDescriptor{
+			Codecs::H264_SVC::Parse(buffer, sizeof(buffer))
+		};
 
 		REQUIRE(payloadDescriptor);
 
@@ -145,8 +147,6 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 		REQUIRE(payloadDescriptor->isKeyFrame == false);
 		REQUIRE(payloadDescriptor->hasTlIndex == true);
 		REQUIRE(payloadDescriptor->hasSlIndex == true);
-
-		delete payloadDescriptor;
 	}
 
 	SECTION("parse payload descriptor for NALU 20")
@@ -163,7 +163,9 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::H264_SVC::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<RTC::Codecs::H264_SVC::PayloadDescriptor> payloadDescriptor{
+			Codecs::H264_SVC::Parse(buffer, sizeof(buffer))
+		};
 
 		REQUIRE(payloadDescriptor);
 
@@ -175,7 +177,5 @@ SCENARIO("parse H264_SVC payload descriptor", "[codecs][h264_svc]")
 		REQUIRE(payloadDescriptor->isKeyFrame == false);
 		REQUIRE(payloadDescriptor->hasTlIndex == true);
 		REQUIRE(payloadDescriptor->hasSlIndex == true);
-
-		delete payloadDescriptor;
 	}
 }
diff --git a/worker/test/src/RTC/Codecs/TestVP8.cpp b/worker/test/src/RTC/Codecs/TestVP8.cpp
@@ -38,7 +38,8 @@ SCENARIO("parse VP8 payload descriptor", "[codecs][vp8]")
 
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
-		const auto* payloadDescriptor = Codecs::VP8::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<Codecs::VP8::PayloadDescriptor> payloadDescriptor{ Codecs::VP8::Parse(
+			buffer, sizeof(buffer)) };
 
 		REQUIRE(payloadDescriptor);
 
@@ -77,8 +78,6 @@ SCENARIO("parse VP8 payload descriptor", "[codecs][vp8]")
 				REQUIRE(std::memcmp(buffer, originalBuffer, sizeof(buffer)) == 0);
 			}
 		}
-
-		delete payloadDescriptor;
 	}
 
 	SECTION("parse payload descriptor 2")
@@ -113,7 +112,8 @@ SCENARIO("parse VP8 payload descriptor", "[codecs][vp8]")
 		std::memcpy(buffer, originalBuffer, sizeof(buffer));
 
 		// Parse the buffer.
-		const auto* payloadDescriptor = Codecs::VP8::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<Codecs::VP8::PayloadDescriptor> payloadDescriptor{ Codecs::VP8::Parse(
+			buffer, sizeof(buffer)) };
 
 		REQUIRE(payloadDescriptor);
 
@@ -152,8 +152,6 @@ SCENARIO("parse VP8 payload descriptor", "[codecs][vp8]")
 				REQUIRE(std::memcmp(buffer, originalBuffer, sizeof(buffer)) == 0);
 			}
 		}
-
-		delete payloadDescriptor;
 	};
 
 	SECTION("parse payload descriptor. I flag set but no space for pictureId")

diff --git a/worker/test/src/RTC/RTCP/TestFeedbackPsFir.cpp b/worker/test/src/RTC/RTCP/TestFeedbackPsFir.cpp
@@ -44,11 +44,11 @@ SCENARIO("RTCP Feedback PS FIR parsing", "[parser][rtcp][feedback-ps][fir]")
 
 	SECTION("parse FeedbackPsFirPacket")
 	{
-		FeedbackPsFirPacket* packet = FeedbackPsFirPacket::Parse(buffer, sizeof(buffer));
+		std::unique_ptr<FeedbackPsFirPacket> packet{ FeedbackPsFirPacket::Parse(buffer, sizeof(buffer)) };
 
 		REQUIRE(packet);
 
-		verify(packet);
+		verify(packet.get());
 
 		SECTION("serialize packet instance")
 		{
@@ -61,8 +61,6 @@ SCENARIO("RTCP Feedback PS FIR parsing", "[parser][rtcp][feedback-ps][fir]")
 				REQUIRE(std::memcmp(buffer, serialized, sizeof(buffer)) == 0);
 			}
 		}
-
-		delete packet;
 	}
 
 	SECTION("create FeedbackPsFirPacket")