Embed FrameDependencyTemplate builder helpers directly into the struct

Bug: None
Change-Id: I4c13bdabd08dd6a6011cb534c765c1dd09f218d1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176843
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31500}
This commit is contained in:
Danil Chapovalov
2020-06-11 13:23:45 +02:00
committed by Commit Bot
parent f4a9991cce
commit 24263f4ffb
24 changed files with 242 additions and 316 deletions

View File

@ -548,9 +548,9 @@ TEST_P(RtpSenderVideoTest, SendsDependencyDescriptorWhenVideoStructureIsSet) {
FrameDependencyStructure video_structure;
video_structure.num_decode_targets = 2;
video_structure.templates = {
GenericFrameInfo::Builder().S(0).T(0).Dtis("SS").Build(),
GenericFrameInfo::Builder().S(1).T(0).Dtis("-S").Build(),
GenericFrameInfo::Builder().S(1).T(1).Dtis("-D").Build(),
FrameDependencyTemplate().S(0).T(0).Dtis("SS"),
FrameDependencyTemplate().S(1).T(0).Dtis("-S"),
FrameDependencyTemplate().S(1).T(1).Dtis("-D"),
};
rtp_sender_video_.SetVideoStructure(&video_structure);
@ -619,7 +619,7 @@ TEST_P(RtpSenderVideoTest, PropagatesChainDiffsIntoDependencyDescriptor) {
// First decode target is protected by the only chain, second one - is not.
video_structure.decode_target_protected_by_chain = {0, 1};
video_structure.templates = {
GenericFrameInfo::Builder().S(0).T(0).Dtis("SS").ChainDiffs({1}).Build(),
FrameDependencyTemplate().S(0).T(0).Dtis("SS").ChainDiffs({1}),
};
rtp_sender_video_.SetVideoStructure(&video_structure);
@ -651,14 +651,14 @@ TEST_P(RtpSenderVideoTest,
FrameDependencyStructure video_structure1;
video_structure1.num_decode_targets = 2;
video_structure1.templates = {
GenericFrameInfo::Builder().S(0).T(0).Dtis("SS").Build(),
GenericFrameInfo::Builder().S(0).T(1).Dtis("D-").Build(),
FrameDependencyTemplate().S(0).T(0).Dtis("SS"),
FrameDependencyTemplate().S(0).T(1).Dtis("D-"),
};
FrameDependencyStructure video_structure2;
video_structure2.num_decode_targets = 2;
video_structure2.templates = {
GenericFrameInfo::Builder().S(0).T(0).Dtis("SS").Build(),
GenericFrameInfo::Builder().S(0).T(1).Dtis("R-").Build(),
FrameDependencyTemplate().S(0).T(0).Dtis("SS"),
FrameDependencyTemplate().S(0).T(1).Dtis("R-"),
};
// Send 1st key frame.
@ -741,7 +741,7 @@ TEST_P(RtpSenderVideoTest,
FrameDependencyStructure video_structure;
video_structure.num_decode_targets = 1;
video_structure.templates = {GenericFrameInfo::Builder().Dtis("S").Build()};
video_structure.templates = {FrameDependencyTemplate().Dtis("S")};
rtp_sender_video.SetVideoStructure(&video_structure);
// Send key frame.