diff options
| author | Sergey Silkin <ssilkin@webrtc.org> | 2018-04-24 21:29:14 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-04-26 15:47:17 +0000 |
| commit | bc0f0d3ded58e3dd69ec6e684f428dd65c228497 (patch) | |
| tree | 022ae66914a885113c99d8d7081af3a63bd0b7ab /video | |
| parent | 0cb4a25e432f90dab773f41c9fe9eebb8c36b163 (diff) | |
| download | webrtc-bc0f0d3ded58e3dd69ec6e684f428dd65c228497.tar.gz | |
Rename end_of_superframe to end_of_picture.
For consistency with the VP9 RTP spec which uses term "picture" for set
of frames which belong to the same time instance.
Bug: none
Change-Id: I30e92d5debb008feb58f770b63fe10c2e0029267
Reviewed-on: https://webrtc-review.googlesource.com/72180
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23040}
Diffstat (limited to 'video')
| -rw-r--r-- | video/payload_router.cc | 4 | ||||
| -rw-r--r-- | video/payload_router_unittest.cc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/video/payload_router.cc b/video/payload_router.cc index 4eef06877d..f9cd6edda2 100644 --- a/video/payload_router.cc +++ b/video/payload_router.cc @@ -72,8 +72,8 @@ void CopyCodecSpecific(const CodecSpecificInfo* info, RTPVideoHeader* rtp) { for (int i = 0; i < info->codecSpecific.VP9.num_ref_pics; ++i) { rtp->codecHeader.VP9.pid_diff[i] = info->codecSpecific.VP9.p_diff[i]; } - rtp->codecHeader.VP9.end_of_superframe = - info->codecSpecific.VP9.end_of_superframe; + rtp->codecHeader.VP9.end_of_picture = + info->codecSpecific.VP9.end_of_picture; return; } case kVideoCodecH264: diff --git a/video/payload_router_unittest.cc b/video/payload_router_unittest.cc index a559be04cb..db2ddf0e94 100644 --- a/video/payload_router_unittest.cc +++ b/video/payload_router_unittest.cc @@ -374,7 +374,7 @@ TEST(PayloadRouterTest, InfoMappedToRtpVideoHeader_Vp9) { codec_info.codecSpecific.VP9.first_frame_in_picture = true; codec_info.codecSpecific.VP9.spatial_idx = 0; codec_info.codecSpecific.VP9.temporal_idx = 2; - codec_info.codecSpecific.VP9.end_of_superframe = false; + codec_info.codecSpecific.VP9.end_of_picture = false; EXPECT_CALL(rtp, SendOutgoingData(_, _, _, _, _, _, nullptr, _, _)) .WillOnce( @@ -391,8 +391,8 @@ TEST(PayloadRouterTest, InfoMappedToRtpVideoHeader_Vp9) { codec_info.codecSpecific.VP9.spatial_idx); EXPECT_EQ(header->codecHeader.VP9.num_spatial_layers, codec_info.codecSpecific.VP9.num_spatial_layers); - EXPECT_EQ(header->codecHeader.VP9.end_of_superframe, - codec_info.codecSpecific.VP9.end_of_superframe); + EXPECT_EQ(header->codecHeader.VP9.end_of_picture, + codec_info.codecSpecific.VP9.end_of_picture); return true; })); EXPECT_CALL(rtp, Sending()).WillOnce(Return(true)); @@ -403,7 +403,7 @@ TEST(PayloadRouterTest, InfoMappedToRtpVideoHeader_Vp9) { // Next spatial layer. codec_info.codecSpecific.VP9.first_frame_in_picture = false; codec_info.codecSpecific.VP9.spatial_idx += 1; - codec_info.codecSpecific.VP9.end_of_superframe = true; + codec_info.codecSpecific.VP9.end_of_picture = true; EXPECT_CALL(rtp, SendOutgoingData(_, _, _, _, _, _, nullptr, _, _)) .WillOnce( @@ -420,8 +420,8 @@ TEST(PayloadRouterTest, InfoMappedToRtpVideoHeader_Vp9) { codec_info.codecSpecific.VP9.spatial_idx); EXPECT_EQ(header->codecHeader.VP9.num_spatial_layers, codec_info.codecSpecific.VP9.num_spatial_layers); - EXPECT_EQ(header->codecHeader.VP9.end_of_superframe, - codec_info.codecSpecific.VP9.end_of_superframe); + EXPECT_EQ(header->codecHeader.VP9.end_of_picture, + codec_info.codecSpecific.VP9.end_of_picture); return true; })); EXPECT_CALL(rtp, Sending()).WillOnce(Return(true)); |