Use GetTimestamp in encoded frame clone functions. Mock frames in Chromium tests do not overload the new GetRtpTimestampInfo() and fail. Bug: chromium:524901718 Change-Id: I67ce2478b1b096ed82e22d72c88d0bdd41848c5a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/486860 Commit-Queue: Guido Urdaneta <guidou@webrtc.org> Commit-Queue: Leonardo Evi <evil@chromium.org> Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> Reviewed-by: Guido Urdaneta <guidou@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48122}
diff --git a/audio/channel_send_frame_transformer_delegate.cc b/audio/channel_send_frame_transformer_delegate.cc index 670d996..d576403 100644 --- a/audio/channel_send_frame_transformer_delegate.cc +++ b/audio/channel_send_frame_transformer_delegate.cc
@@ -297,7 +297,7 @@ original->GetContributingSources().end()); return std::make_unique<TransformableOutgoingAudioFrame>( InterfaceFrameTypeToInternalFrameType(original->Type()), - original->GetPayloadType(), original->GetRtpTimestampInfo(), + original->GetPayloadType(), original->GetTimestamp(), original->GetData().data(), original->GetData().size(), original->AbsoluteCaptureTimestamp(), original->GetSsrc(), std::move(csrcs), original->GetMimeType(), original->SequenceNumber(),
diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc index 106003f..56a3219 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc
@@ -313,8 +313,8 @@ original->GetRtpTimestampInfo())); return std::make_unique<TransformableVideoSenderFrame>( encoded_image, new_header, original->GetPayloadType(), new_header.codec, - std::get<RtpTimestampWithOffset>(original->GetRtpTimestampInfo()), - kDefaultRetransmissionsTime, original->GetSsrc(), metadata.GetCsrcs(), + original->GetTimestamp(), kDefaultRetransmissionsTime, + original->GetSsrc(), metadata.GetCsrcs(), original->Rid().value_or(std::string())); }