admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename VideoFrameMetadata tests to RTPVideoHeaderTest.

Browse Source 
This is a pure move/rename. The reason for wanting the tests in
RTPVideoHeader is that it is the GetAsMetadata() function that we are
testing and in a future CL we'll also want to test SetFromMetadata().

// Bots green, no need to wait for the remaining ones, just a move
NOTRY=True

Bug: webrtc:14709
Change-Id: Iecb938e79e7e8d55e208baea190eef4c6730158e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285460
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38764}
This commit is contained in:
Henrik Boström 2022-11-29 13:44:55 +01:00 committed by WebRTC LUCI CQ
parent a5e7941a57
commit 13730e9742
3 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/video/BUILD.gn
View File

@ -403,10 +403,7 @@ rtc_library("frame_buffer_unittest") {
if (rtc_include_tests) { if (rtc_include_tests) {
rtc_library("video_unittests") { rtc_library("video_unittests") {
testonly = true testonly = true
sources = [ sources = [ "video_stream_decoder_create_unittest.cc" ]
"video_frame_metadata_unittest.cc",
"video_stream_decoder_create_unittest.cc",
]
deps = [ deps = [
":video_frame_metadata", ":video_frame_metadata",
":video_frame_type", ":video_frame_type",

12
modules/rtp_rtcp/BUILD.gn
View File

@ -437,6 +437,17 @@ rtc_library("rtp_video_header") {
] ]
} }
rtc_source_set("rtp_video_header_unittest") {
testonly = true
sources = [ "source/rtp_video_header_unittest.cc" ]
deps = [
":rtp_video_header",
"../../api/video:video_frame_metadata",
"../../api/video:video_frame_type",
"../../test:test_support",
]
}
rtc_library("fec_test_helper") { rtc_library("fec_test_helper") {
testonly = true testonly = true
sources = [ sources = [
@ -604,6 +615,7 @@ if (rtc_include_tests) {
":rtp_rtcp", ":rtp_rtcp",
":rtp_rtcp_format", ":rtp_rtcp_format",
":rtp_rtcp_legacy", ":rtp_rtcp_legacy",
":rtp_video_header_unittest",
"../../api:array_view", "../../api:array_view",
"../../api:create_time_controller", "../../api:create_time_controller",
"../../api:field_trials_registry", "../../api:field_trials_registry",

54
api/video/video_frame_metadata_unittest.cc → modules/rtp_rtcp/source/rtp_video_header_unittest.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2022 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "api/video/video_frame_metadata.h"
#include "api/video/video_frame_type.h"
#include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/rtp_rtcp/source/rtp_video_header.h"
#include "api/video/video_frame_metadata.h"
#include "api/video/video_frame_type.h"
#include "test/gmock.h" #include "test/gmock.h"
#include "test/gtest.h" #include "test/gtest.h"
@ -21,45 +21,42 @@ namespace {
using ::testing::ElementsAre; using ::testing::ElementsAre;
using ::testing::IsEmpty; using ::testing::IsEmpty;
// TODO(https://crbug.com/webrtc/14709): Move all of these tests to TEST(RTPVideoHeaderTest, GetAsMetadataGetFrameType) {
// rtp_video_header_unittest.cc, they're excercising GetAsMetadata().
TEST(VideoFrameMetadata, GetFrameTypeReturnsCorrectValue) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.frame_type = VideoFrameType::kVideoFrameKey; video_header.frame_type = VideoFrameType::kVideoFrameKey;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
EXPECT_EQ(metadata.GetFrameType(), VideoFrameType::kVideoFrameKey); EXPECT_EQ(metadata.GetFrameType(), VideoFrameType::kVideoFrameKey);
} }
TEST(VideoFrameMetadata, GetWidthReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetWidth) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.width = 1280u; video_header.width = 1280u;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
EXPECT_EQ(metadata.GetWidth(), video_header.width); EXPECT_EQ(metadata.GetWidth(), video_header.width);
} }
TEST(VideoFrameMetadata, GetHeightReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetHeight) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.height = 720u; video_header.height = 720u;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
EXPECT_EQ(metadata.GetHeight(), video_header.height); EXPECT_EQ(metadata.GetHeight(), video_header.height);
} }
TEST(VideoFrameMetadata, GetRotationReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetRotation) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.rotation = VideoRotation::kVideoRotation_90; video_header.rotation = VideoRotation::kVideoRotation_90;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
EXPECT_EQ(metadata.GetRotation(), VideoRotation::kVideoRotation_90); EXPECT_EQ(metadata.GetRotation(), VideoRotation::kVideoRotation_90);
} }
TEST(VideoFrameMetadata, GetContentTypeReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetContentType) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.content_type = VideoContentType::SCREENSHARE; video_header.content_type = VideoContentType::SCREENSHARE;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
EXPECT_EQ(metadata.GetContentType(), VideoContentType::SCREENSHARE); EXPECT_EQ(metadata.GetContentType(), VideoContentType::SCREENSHARE);
} }
TEST(VideoFrameMetadata, GetFrameIdReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetFrameId) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
RTPVideoHeader::GenericDescriptorInfo& generic = RTPVideoHeader::GenericDescriptorInfo& generic =
video_header.generic.emplace(); video_header.generic.emplace();
@ -68,14 +65,14 @@ TEST(VideoFrameMetadata, GetFrameIdReturnsCorrectValue) {
EXPECT_EQ(metadata.GetFrameId().value(), 10); EXPECT_EQ(metadata.GetFrameId().value(), 10);
} }
TEST(VideoFrameMetadata, HasNoFrameIdForHeaderWithoutGeneric) { TEST(RTPVideoHeaderTest, GetAsMetadataHasNoFrameIdForHeaderWithoutGeneric) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
ASSERT_FALSE(video_header.generic); ASSERT_FALSE(video_header.generic);
EXPECT_EQ(metadata.GetFrameId(), absl::nullopt); EXPECT_FALSE(metadata.GetFrameId().has_value());
} }
TEST(VideoFrameMetadata, GetSpatialIndexReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetSpatialIndex) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
RTPVideoHeader::GenericDescriptorInfo& generic = RTPVideoHeader::GenericDescriptorInfo& generic =
video_header.generic.emplace(); video_header.generic.emplace();
@ -84,14 +81,15 @@ TEST(VideoFrameMetadata, GetSpatialIndexReturnsCorrectValue) {
EXPECT_EQ(metadata.GetSpatialIndex(), 2); EXPECT_EQ(metadata.GetSpatialIndex(), 2);
} }
TEST(VideoFrameMetadata, SpatialIndexIsZeroForHeaderWithoutGeneric) { TEST(RTPVideoHeaderTest,
GetAsMetadataSpatialIndexIsZeroForHeaderWithoutGeneric) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
ASSERT_FALSE(video_header.generic); ASSERT_FALSE(video_header.generic);
EXPECT_EQ(metadata.GetSpatialIndex(), 0); EXPECT_EQ(metadata.GetSpatialIndex(), 0);
} }
TEST(VideoFrameMetadata, GetTemporalIndexReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetTemporalIndex) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
RTPVideoHeader::GenericDescriptorInfo& generic = RTPVideoHeader::GenericDescriptorInfo& generic =
video_header.generic.emplace(); video_header.generic.emplace();
@ -100,14 +98,15 @@ TEST(VideoFrameMetadata, GetTemporalIndexReturnsCorrectValue) {
EXPECT_EQ(metadata.GetTemporalIndex(), 3); EXPECT_EQ(metadata.GetTemporalIndex(), 3);
} }
TEST(VideoFrameMetadata, TemporalIndexIsZeroForHeaderWithoutGeneric) { TEST(RTPVideoHeaderTest,
GetAsMetadataTemporalIndexIsZeroForHeaderWithoutGeneric) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
ASSERT_FALSE(video_header.generic); ASSERT_FALSE(video_header.generic);
EXPECT_EQ(metadata.GetTemporalIndex(), 0); EXPECT_EQ(metadata.GetTemporalIndex(), 0);
} }
TEST(VideoFrameMetadata, GetFrameDependenciesReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetFrameDependencies) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
RTPVideoHeader::GenericDescriptorInfo& generic = RTPVideoHeader::GenericDescriptorInfo& generic =
video_header.generic.emplace(); video_header.generic.emplace();
@ -116,14 +115,15 @@ TEST(VideoFrameMetadata, GetFrameDependenciesReturnsCorrectValue) {
EXPECT_THAT(metadata.GetFrameDependencies(), ElementsAre(5, 6, 7)); EXPECT_THAT(metadata.GetFrameDependencies(), ElementsAre(5, 6, 7));
} }
TEST(VideoFrameMetadata, FrameDependencyVectorIsEmptyForHeaderWithoutGeneric) { TEST(RTPVideoHeaderTest,
GetAsMetadataFrameDependencyIsEmptyForHeaderWithoutGeneric) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
ASSERT_FALSE(video_header.generic); ASSERT_FALSE(video_header.generic);
EXPECT_THAT(metadata.GetFrameDependencies(), IsEmpty()); EXPECT_THAT(metadata.GetFrameDependencies(), IsEmpty());
} }
TEST(VideoFrameMetadata, GetDecodeTargetIndicationsReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetDecodeTargetIndications) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
RTPVideoHeader::GenericDescriptorInfo& generic = RTPVideoHeader::GenericDescriptorInfo& generic =
video_header.generic.emplace(); video_header.generic.emplace();
@ -133,29 +133,29 @@ TEST(VideoFrameMetadata, GetDecodeTargetIndicationsReturnsCorrectValue) {
ElementsAre(DecodeTargetIndication::kSwitch)); ElementsAre(DecodeTargetIndication::kSwitch));
} }
TEST(VideoFrameMetadata, TEST(RTPVideoHeaderTest,
DecodeTargetIndicationsVectorIsEmptyForHeaderWithoutGeneric) { GetAsMetadataGetDecodeTargetIndicationsIsEmptyForHeaderWithoutGeneric) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
ASSERT_FALSE(video_header.generic); ASSERT_FALSE(video_header.generic);
EXPECT_THAT(metadata.GetDecodeTargetIndications(), IsEmpty()); EXPECT_THAT(metadata.GetDecodeTargetIndications(), IsEmpty());
} }
TEST(VideoFrameMetadata, GetIsLastFrameInPictureReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetIsLastFrameInPicture) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.is_last_frame_in_picture = false; video_header.is_last_frame_in_picture = false;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
EXPECT_FALSE(metadata.GetIsLastFrameInPicture()); EXPECT_FALSE(metadata.GetIsLastFrameInPicture());
} }
TEST(VideoFrameMetadata, GetSimulcastIdxReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetSimulcastIdx) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.simulcastIdx = 123; video_header.simulcastIdx = 123;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();
EXPECT_EQ(metadata.GetSimulcastIdx(), 123); EXPECT_EQ(metadata.GetSimulcastIdx(), 123);
} }
TEST(VideoFrameMetadata, GetCodecReturnsCorrectValue) { TEST(RTPVideoHeaderTest, GetAsMetadataGetCodec) {
RTPVideoHeader video_header; RTPVideoHeader video_header;
video_header.codec = VideoCodecType::kVideoCodecVP9; video_header.codec = VideoCodecType::kVideoCodecVP9;
VideoFrameMetadata metadata = video_header.GetAsMetadata(); VideoFrameMetadata metadata = video_header.GetAsMetadata();