Reland "Add spatial index to EncodedImage."
This is a reland of da0898dfae3b0a013ca8ad3828e9adfdc749748d
Original change's description:
> Add spatial index to EncodedImage.
>
> Replaces the VP8 simulcast index and VP9 spatial index formely part of
> CodecSpecificInfo.
>
> Bug: webrtc:9378
> Change-Id: I80eafd63fbdee0a25864338196a690628b4bd3d2
> Reviewed-on: https://webrtc-review.googlesource.com/83161
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> Reviewed-by: Philip Eliasson <philipel@webrtc.org>
> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24485}
Tbr: magjed@webrtc.org
Bug: webrtc:9378
Change-Id: Iff20b656581ef63317e073833d1a326f7118fdfd
Reviewed-on: https://webrtc-review.googlesource.com/96780
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24507}diff --git a/call/rtp_video_sender_unittest.cc b/call/rtp_video_sender_unittest.cc
index 9e3290d..bd8a6a6 100644
--- a/call/rtp_video_sender_unittest.cc
+++ b/call/rtp_video_sender_unittest.cc
@@ -169,44 +169,41 @@
TEST(RtpVideoSenderTest, SendSimulcastSetActive) {
uint8_t payload = 'a';
- EncodedImage encoded_image;
- encoded_image.SetTimestamp(1);
- encoded_image.capture_time_ms_ = 2;
- encoded_image._frameType = kVideoFrameKey;
- encoded_image._buffer = &payload;
- encoded_image._length = 1;
+ EncodedImage encoded_image_1;
+ encoded_image_1.SetTimestamp(1);
+ encoded_image_1.capture_time_ms_ = 2;
+ encoded_image_1._frameType = kVideoFrameKey;
+ encoded_image_1._buffer = &payload;
+ encoded_image_1._length = 1;
RtpVideoSenderTestFixture test({kSsrc1, kSsrc2}, kPayloadType, {});
- CodecSpecificInfo codec_info_1;
- memset(&codec_info_1, 0, sizeof(CodecSpecificInfo));
- codec_info_1.codecType = kVideoCodecVP8;
- codec_info_1.codecSpecific.VP8.simulcastIdx = 0;
+ CodecSpecificInfo codec_info;
+ memset(&codec_info, 0, sizeof(CodecSpecificInfo));
+ codec_info.codecType = kVideoCodecVP8;
test.router()->SetActive(true);
EXPECT_EQ(EncodedImageCallback::Result::OK,
test.router()
- ->OnEncodedImage(encoded_image, &codec_info_1, nullptr)
+ ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
.error);
- CodecSpecificInfo codec_info_2;
- memset(&codec_info_2, 0, sizeof(CodecSpecificInfo));
- codec_info_2.codecType = kVideoCodecVP8;
- codec_info_2.codecSpecific.VP8.simulcastIdx = 1;
+ EncodedImage encoded_image_2(encoded_image_1);
+ encoded_image_2.SetSpatialIndex(1);
EXPECT_EQ(EncodedImageCallback::Result::OK,
test.router()
- ->OnEncodedImage(encoded_image, &codec_info_2, nullptr)
+ ->OnEncodedImage(encoded_image_2, &codec_info, nullptr)
.error);
// Inactive.
test.router()->SetActive(false);
EXPECT_NE(EncodedImageCallback::Result::OK,
test.router()
- ->OnEncodedImage(encoded_image, &codec_info_1, nullptr)
+ ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
.error);
EXPECT_NE(EncodedImageCallback::Result::OK,
test.router()
- ->OnEncodedImage(encoded_image, &codec_info_2, nullptr)
+ ->OnEncodedImage(encoded_image_2, &codec_info, nullptr)
.error);
}
@@ -216,22 +213,19 @@
// be sent if both modules are inactive.
TEST(RtpVideoSenderTest, SendSimulcastSetActiveModules) {
uint8_t payload = 'a';
- EncodedImage encoded_image;
- encoded_image.SetTimestamp(1);
- encoded_image.capture_time_ms_ = 2;
- encoded_image._frameType = kVideoFrameKey;
- encoded_image._buffer = &payload;
- encoded_image._length = 1;
+ EncodedImage encoded_image_1;
+ encoded_image_1.SetTimestamp(1);
+ encoded_image_1.capture_time_ms_ = 2;
+ encoded_image_1._frameType = kVideoFrameKey;
+ encoded_image_1._buffer = &payload;
+ encoded_image_1._length = 1;
+ EncodedImage encoded_image_2(encoded_image_1);
+ encoded_image_2.SetSpatialIndex(1);
RtpVideoSenderTestFixture test({kSsrc1, kSsrc2}, kPayloadType, {});
- CodecSpecificInfo codec_info_1;
- memset(&codec_info_1, 0, sizeof(CodecSpecificInfo));
- codec_info_1.codecType = kVideoCodecVP8;
- codec_info_1.codecSpecific.VP8.simulcastIdx = 0;
- CodecSpecificInfo codec_info_2;
- memset(&codec_info_2, 0, sizeof(CodecSpecificInfo));
- codec_info_2.codecType = kVideoCodecVP8;
- codec_info_2.codecSpecific.VP8.simulcastIdx = 1;
+ CodecSpecificInfo codec_info;
+ memset(&codec_info, 0, sizeof(CodecSpecificInfo));
+ codec_info.codecType = kVideoCodecVP8;
// Only setting one stream to active will still set the payload router to
// active and allow sending data on the active stream.
@@ -239,7 +233,7 @@
test.router()->SetActiveModules(active_modules);
EXPECT_EQ(EncodedImageCallback::Result::OK,
test.router()
- ->OnEncodedImage(encoded_image, &codec_info_1, nullptr)
+ ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
.error);
// Setting both streams to inactive will turn the payload router to
@@ -250,11 +244,11 @@
// because the payload router is inactive.
EXPECT_NE(EncodedImageCallback::Result::OK,
test.router()
- ->OnEncodedImage(encoded_image, &codec_info_1, nullptr)
+ ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
.error);
EXPECT_NE(EncodedImageCallback::Result::OK,
test.router()
- ->OnEncodedImage(encoded_image, &codec_info_2, nullptr)
+ ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
.error);
}
