Skip to content

Commit

Permalink
[118] Move setting rtpTimestamp out of an incorrect feature check
Browse files Browse the repository at this point in the history
This field should not be gated on RTCEncodedVideoFrameAdditionalMetadataEnabled. Its exposure is already
gated in the idl on the correct RTCEncodedFrameSetMetadata feature.

(cherry picked from commit 1022504)

Bug: 1487223
Change-Id: Ie8c91182bb610bcf315cfe8a83b1a8ddc4e7ad31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4896897
Commit-Queue: Tony Herre <toprice@chromium.org>
Auto-Submit: Tony Herre <toprice@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Palak Agarwal <agpalak@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1202429}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4905404
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/branch-heads/5993@{#1083}
Cr-Branched-From: 5113507-refs/heads/main@{#1192594}
  • Loading branch information
Tony Herre authored and Chromium LUCI CQ committed Oct 3, 2023
1 parent 637addf commit 1cbacbf
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ RTCEncodedVideoFrameMetadata* RTCEncodedVideoFrame::getMetadata() const {
if (delegate_->CaptureTimeIdentifier()) {
metadata->setCaptureTimestamp(delegate_->CaptureTimeIdentifier()->us());
}
metadata->setRtpTimestamp(delegate_->RtpTimestamp());
}

const absl::optional<webrtc::VideoFrameMetadata> webrtc_metadata =
Expand Down Expand Up @@ -165,6 +164,7 @@ RTCEncodedVideoFrameMetadata* RTCEncodedVideoFrame::getMetadata() const {
metadata->setHeight(webrtc_metadata->GetHeight());
metadata->setSpatialIndex(webrtc_metadata->GetSpatialIndex());
metadata->setTemporalIndex(webrtc_metadata->GetTemporalIndex());
metadata->setRtpTimestamp(delegate_->RtpTimestamp());

return metadata;
}
Expand Down

0 comments on commit 1cbacbf

Please sign in to comment.