Skip to content

Commit

Permalink
Fixing namechange YUV422
Browse files Browse the repository at this point in the history
  • Loading branch information
@ross-newman
ross-newman committed May 20, 2024
1 parent a5974fa commit 8704cf5
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 33 deletions.
2 changes: 1 addition & 1 deletion example/qt6/rtp-receive/rtp_receive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
QtReceive::QtReceive() {
std::cout << "Qt6 Example RTP (Tx) streaming (640x480 Uncompressed YUV) to 127.0.0.1:5004@25Htz\n";
mediax::rtp::StreamInformation stream_info = {
"qt-test", "127.0.0.1", 5004, 480, 640, 25, ::mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"qt-test", "127.0.0.1", 5004, 480, 640, 25, ::mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
rtp.setStreamInfo(stream_info);
rtp.open();
rtp.start();
Expand Down
4 changes: 2 additions & 2 deletions example/qt6/rtp-transmit/rtp_transmit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
QtTransmit::QtTransmit() {
std::cout << "Qt6 Example RTP (Tx) streaming (640x480 Uncompressed YUV) to 127.0.0.1:5004@25Htz\n";
mediax::rtp::StreamInformation stream_info = {
"qt-test", "127.0.0.1", 5004, 480, 640, 25, ::mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"qt-test", "127.0.0.1", 5004, 480, 640, 25, ::mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
rtp.setStreamInfo(stream_info);
rtp.open();
rtp.start();
Expand All @@ -36,7 +36,7 @@ void QtTransmit::sendFrame(Frame frame) {
frame.video.resize(640 * 480 * 3);

CreateColourBarEbuTestCard(reinterpret_cast<uint8_t*>(frame.video.data()), 640, 480,
mediax::rtp::ColourspaceType::kColourspaceYuv);
mediax::rtp::ColourspaceType::kColourspaceYuv422);
// Send the frame to the payloader
emit newFrame(frame);
// Update counter
Expand Down
19 changes: 12 additions & 7 deletions tests/colourspace_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ TEST(Colourspace, YuvToRgbaTest) {
mediax::video::ColourSpaceCpu convert;

// Fill the YUV buffer with a red color
CreateColourBarTestCard(yuv, width, height, mediax::rtp::ColourspaceType::kColourspaceYuv);
CreateColourBarTestCard(yuv, width, height, mediax::rtp::ColourspaceType::kColourspaceYuv422);
DumpHex(yuv, 16);

// Call the function you want to test
convert.YuvToRgba(height, width, yuv, rgba_recieve);
convert.Yuv422ToRgba(height, width, yuv, rgba_recieve);
convert.RgbaToRgb(width, height, rgba_recieve, rgb);

WritePngFile(rgb, width, height, "YuvToRgbaTest.png");
Expand Down Expand Up @@ -268,9 +268,11 @@ TEST(Colourspace, ScaleToSizeTestRgbScaleDown) {
uint8_t target_rgb_buffer[target_height * target_width * 3] = {0}; // Initialize with zeros

// Source is checked
CreateCheckeredTestCard(source_rgb_buffer, source_width, source_height, mediax::rtp::ColourspaceType::kColourspaceRgb24);
CreateCheckeredTestCard(source_rgb_buffer, source_width, source_height,
mediax::rtp::ColourspaceType::kColourspaceRgb24);
// Colour bars in target
CreateColourBarTestCard(target_rgb_buffer, target_width, target_height, mediax::rtp::ColourspaceType::kColourspaceRgb24);
CreateColourBarTestCard(target_rgb_buffer, target_width, target_height,
mediax::rtp::ColourspaceType::kColourspaceRgb24);

// Call the function
mediax::video::ColourSpaceCpu colourspace;
Expand All @@ -291,9 +293,11 @@ TEST(Colourspace, ScaleToSizeTestRgbScaleUp) {
uint8_t target_rgb_buffer[target_height * target_width * 3] = {0}; // Initialize with zeros

// Source is checked
CreateCheckeredTestCard(source_rgb_buffer, source_width, source_height, mediax::rtp::ColourspaceType::kColourspaceRgb24);
CreateCheckeredTestCard(source_rgb_buffer, source_width, source_height,
mediax::rtp::ColourspaceType::kColourspaceRgb24);
// Colour bars in target
CreateColourBarTestCard(target_rgb_buffer, target_width, target_height, mediax::rtp::ColourspaceType::kColourspaceRgb24);
CreateColourBarTestCard(target_rgb_buffer, target_width, target_height,
mediax::rtp::ColourspaceType::kColourspaceRgb24);

// Call the function
mediax::video::ColourSpaceCpu colourspace;
Expand All @@ -317,7 +321,8 @@ TEST(Colourspace, ScaleToSizeTestRgbaScaleUp) {
target_rgb_buffer.resize(target_height * target_width * 4);

// Source is checked
CreateColourBarTestCard(source_rgba_buffer, source_width, source_height, mediax::rtp::ColourspaceType::kColourspaceRgba);
CreateColourBarTestCard(source_rgba_buffer, source_width, source_height,
mediax::rtp::ColourspaceType::kColourspaceRgba);

// Call the function
mediax::video::ColourSpaceCpu colourspace;
Expand Down
4 changes: 2 additions & 2 deletions tests/rtp_raw_depayloader_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ TEST(RtpRawDepayloaderTest, ReOpening) {
for (int i = 0; i < 10; i++) {
mediax::rtp::uncompressed::RtpUncompressedDepayloader rtp;
mediax::rtp::StreamInformation stream_info = {
"test_session_name", "127.0.0.1", 5004, 640, 480, 25, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"test_session_name", "127.0.0.1", 5004, 640, 480, 25, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
rtp.SetStreamInfo(stream_info);
rtp.Open();
rtp.Start();
Expand All @@ -159,7 +159,7 @@ void OpenStream(std::string ipaddr, uint32_t height, uint32_t width, uint32_t fr
mediax::rtp::uncompressed::RtpUncompressedDepayloader rtp;
yuv_test.resize(height * width * 2);
mediax::rtp::StreamInformation stream_info = {
"test", ipaddr, 5004, 640, 480, 25, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"test", ipaddr, 5004, 640, 480, 25, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
rtp.SetStreamInfo(stream_info);
rtp.Open();
rtp.Start();
Expand Down
4 changes: 2 additions & 2 deletions tests/rtp_raw_payloader_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ TEST(RTPDepayloaderTest, SendOneFrameYuv) {

mediax::rtp::uncompressed::RtpUncompressedPayloader rtp;
mediax::rtp::StreamInformation stream_information = {
"test_session_name", "127.0.0.1", 5004, 640, 480, 25, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"test_session_name", "127.0.0.1", 5004, 640, 480, 25, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
rtp.SetStreamInfo(stream_information);
ASSERT_EQ(rtp.GetHeight(), 640);
ASSERT_EQ(rtp.GetWidth(), 480);
ASSERT_EQ(rtp.GetColourSpace(), mediax::rtp::ColourspaceType::kColourspaceYuv);
ASSERT_EQ(rtp.GetColourSpace(), mediax::rtp::ColourspaceType::kColourspaceYuv422);
ASSERT_EQ(rtp.GetIpAddress(), "127.0.0.1");
ASSERT_EQ(rtp.GetPort(), 5004);
rtp.Open();
Expand Down
2 changes: 1 addition & 1 deletion tests/rtp_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ TEST(Rtp, CleanUp) {
TEST(Rtp, Bits) {
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceRgba), 32);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceRgb24), 24);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceYuv), 16);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceYuv422), 16);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceMono16), 16);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceMono8), 8);
}
4 changes: 2 additions & 2 deletions tests/rtp_utils_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ TEST(Utilities, CreateCheckeredTestCardRgba) {
TEST(Utilities, BitsPerPixel) {
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceRgba), 32);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceRgb24), 24);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceYuv), 16);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceYuv422), 16);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceMono16), 16);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceMono8), 8);
EXPECT_EQ(mediax::BitsPerPixel(mediax::rtp::ColourspaceType::kColourspaceNv12), 12);
Expand All @@ -124,7 +124,7 @@ TEST(Utilities, BitsPerPixel) {
TEST(Utilities, BytesPerPixel) {
EXPECT_EQ(mediax::BytesPerPixel(mediax::rtp::ColourspaceType::kColourspaceRgba), 4);
EXPECT_EQ(mediax::BytesPerPixel(mediax::rtp::ColourspaceType::kColourspaceRgb24), 3);
EXPECT_EQ(mediax::BytesPerPixel(mediax::rtp::ColourspaceType::kColourspaceYuv), 2);
EXPECT_EQ(mediax::BytesPerPixel(mediax::rtp::ColourspaceType::kColourspaceYuv422), 2);
EXPECT_EQ(mediax::BytesPerPixel(mediax::rtp::ColourspaceType::kColourspaceMono16), 2);
EXPECT_EQ(mediax::BytesPerPixel(mediax::rtp::ColourspaceType::kColourspaceMono8), 1);
EXPECT_EQ(mediax::BytesPerPixel(mediax::rtp::ColourspaceType::kColourspaceNv12), 2);
Expand Down
24 changes: 12 additions & 12 deletions tests/sap_announcer_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ TEST(SapAnnouncerTest, AddSapAnnouncement) {
announcer.DeleteAllSapAnnouncements();
ASSERT_EQ(announcer.GetActiveStreamCount(), 0);
mediax::rtp::StreamInformation message = {
"HD Stream", "239.192.5.2", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"HD Stream", "239.192.5.2", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
announcer.AddSapAnnouncement(message);
ASSERT_EQ(announcer.GetActiveStreamCount(), 1);
announcer.Stop();
Expand All @@ -60,9 +60,9 @@ TEST(SapAnnouncerTest, AddMultipleSAPAnnouncements) {
ASSERT_EQ(announcer.GetActiveStreamCount(), 0);

mediax::rtp::StreamInformation message1 = {
"HD Stream", "239.192.5.2", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"HD Stream", "239.192.5.2", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message2 = {
"SD Stream", "239.192.6.1", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream", "239.192.6.1", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
announcer.AddSapAnnouncement(message1);
announcer.AddSapAnnouncement(message2);
ASSERT_EQ(announcer.GetActiveStreamCount(), 2);
Expand All @@ -77,19 +77,19 @@ TEST(SapAnnouncerTest, DeleteAllSAPAnnouncements) {
announcer.DeleteAllSapAnnouncements();

mediax::rtp::StreamInformation message1 = {
"HD Stream", "239.192.5.2", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"HD Stream", "239.192.5.2", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message2 = {
"SD Stream 1", "239.192.6.1", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 1", "239.192.6.1", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message3 = {
"SD Stream 2", "239.192.6.2", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 2", "239.192.6.2", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message4 = {
"SD Stream 3", "239.192.6.3", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 3", "239.192.6.3", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message5 = {
"SD Stream 4", "239.192.6.4", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 4", "239.192.6.4", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message6 = {
"SD Stream 5", "239.192.6.5", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 5", "239.192.6.5", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message7 = {
"SD Stream 6", "239.192.6.6", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 6", "239.192.6.6", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
announcer.AddSapAnnouncement(message1);
announcer.AddSapAnnouncement(message2);
announcer.AddSapAnnouncement(message3);
Expand All @@ -107,7 +107,7 @@ TEST(SapAnnouncerTest, DeleteSAPAnnouncement) {
mediax::sap::SapAnnouncer &announcer = mediax::sap::SapAnnouncer::GetInstance();
announcer.Start();
mediax::rtp::StreamInformation message = {
"SD Stream 6", "239.192.6.6", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 6", "239.192.6.6", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
announcer.AddSapAnnouncement(message);
EXPECT_EQ(announcer.GetSapAnnouncment(message.session_name).deleted, false);
announcer.DeleteSapAnnouncement(message.session_name);
Expand Down Expand Up @@ -138,7 +138,7 @@ TEST(SapAnnouncerTest, ReAddAnnouncment) {
ASSERT_EQ(announcer.GetActiveStreamCount(), 0);

mediax::rtp::StreamInformation message = {
"SD Stream 6", "239.192.6.6", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"SD Stream 6", "239.192.6.6", 5004, 1280, 720, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
mediax::rtp::StreamInformation message_updated = {
"SD Stream 6", "255.255.255.255", 5005, 640, 480, 25, mediax::rtp::ColourspaceType::kColourspaceRgb24, true};

Expand Down
4 changes: 2 additions & 2 deletions tests/sap_listener_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void SapTest(mediax::rtp::ColourspaceType colouspace, std::string sampling) {
announcer.Stop();
}

TEST(SAPListenerTest, CheckYuv) { SapTest(mediax::rtp::ColourspaceType::kColourspaceYuv, "YCbCr-4:2:2"); }
TEST(SAPListenerTest, CheckYuv) { SapTest(mediax::rtp::ColourspaceType::kColourspaceYuv422, "YCbCr-4:2:2"); }

TEST(SAPListenerTest, CheckRgb24) { SapTest(mediax::rtp::ColourspaceType::kColourspaceRgb24, "RGB"); }

Expand Down Expand Up @@ -86,7 +86,7 @@ TEST(SAPListenerTest, Deleted) {
mediax::sap::SapAnnouncer& announcer = mediax::sap::SapAnnouncer::GetInstance();
announcer.DeleteAllSapAnnouncements();
mediax::rtp::StreamInformation message = {
"test_session_name", "127.0.0.1", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv, false};
"test_session_name", "127.0.0.1", 5004, 1920, 1080, 30, mediax::rtp::ColourspaceType::kColourspaceYuv422, false};
announcer.AddSapAnnouncement(message);
announcer.Start();
ASSERT_EQ(announcer.GetActiveStreamCount(), 1);
Expand Down
2 changes: 1 addition & 1 deletion tests/sap_utils_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

TEST(SapUtilsTest, GetSdpColourspaceTest) {
EXPECT_EQ(mediax::sap::GetSdpColourspace(mediax::rtp::ColourspaceType::kColourspaceRgb24), "RGB");
EXPECT_EQ(mediax::sap::GetSdpColourspace(mediax::rtp::ColourspaceType::kColourspaceYuv), "YCbCr-4:2:2");
EXPECT_EQ(mediax::sap::GetSdpColourspace(mediax::rtp::ColourspaceType::kColourspaceYuv422), "YCbCr-4:2:2");
EXPECT_EQ(mediax::sap::GetSdpColourspace(mediax::rtp::ColourspaceType::kColourspaceMono16), "Mono");
EXPECT_EQ(mediax::sap::GetSdpColourspace(mediax::rtp::ColourspaceType::kColourspaceMono8), "Mono");
EXPECT_EQ(mediax::sap::GetSdpColourspace(static_cast<mediax::rtp::ColourspaceType>(-1)), "unknown");
Expand Down
2 changes: 1 addition & 1 deletion tests/testcard_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ TEST(TestCard, CreateBouncingBall) {
// Fill buffer zeros
std::fill(test_card.begin(), test_card.end(), 0);

CreateBouncingBallTestCard(test_card.data(), width, height, mediax::rtp::ColourspaceType::kColourspaceYuv);
CreateBouncingBallTestCard(test_card.data(), width, height, mediax::rtp::ColourspaceType::kColourspaceYuv422);
colourspace.YuvToRgb(width, height, test_card.data(), converted_test_card.data());
WritePngFile(converted_test_card.data(), width, height, "Testcard_Yuv_ball.png");
}

0 comments on commit 8704cf5

Please sign in to comment.