| commit | 306d52b0fd7b2a7099c9304d0141fcc42a0bef68 | [log] [tgz] |
|---|---|---|
| author | nisse <nisse@webrtc.org> | Tue Sep 06 07:52:40 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Tue Sep 06 14:52:47 2016 +0000 |
| tree | 4a4beb848510e773f1dd784b3ab70649f250c21e | |
| parent | eb24dd01be7c9672e1db1d72ea3a16f324e2d7ac [diff] |
Reland of Delete cricket::VideoFrame::GetTimeStamp. (patchset #1 id:1 of https://codereview.webrtc.org/2315703002/ ) Reason for revert: Chrome has now been updated (cl https://codereview.chromium.org/2317673002/). Original issue's description: > Revert of Delete cricket::VideoFrame::GetTimeStamp. (patchset #2 id:150001 of https://codereview.webrtc.org/2310043002/ ) > > Reason for revert: > Broke Chrome fyi bots. See, e.g., > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20Builder/builds/6730/steps/compile/logs/stdio > > Use of GetTimeStamp must be eliminated in Chrome before relanding. > > Original issue's description: > > Reland of Delete cricket::VideoFrame::GetTimeStamp. (patchset #1 id:1 of https://codereview.webrtc.org/2306953002/ ) > > > > Reason for revert: > > Will reland after downstream projects are updated. > > > > Original issue's description: > > > Revert of Delete cricket::VideoFrame::GetTimeStamp. (patchset #1 id:1 of https://codereview.webrtc.org/2305623002/ ) > > > > > > Reason for revert: > > > Broke downstream project. > > > > > > Original issue's description: > > > > Delete cricket::VideoFrame::GetTimeStamp. > > > > > > > > TBR=tkchin@webrtc.org # Trivial change to VideoRendererAdapter > > > > BUG=webrtc:5682 > > > > > > > > Committed: https://crrev.com/fd6c99e43137d01fa6c120f7160f7c2999d1d8a3 > > > > Cr-Commit-Position: refs/heads/master@{#14037} > > > > > > TBR=perkj@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:5682 > > > > > > Committed: https://crrev.com/bca69e87de5df290f728833a4b3d8af3ae5d88e6 > > > Cr-Commit-Position: refs/heads/master@{#14038} > > > > TBR=perkj@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/fa1ba19c5c7c57c8d16fae1a5da51877770fd53e > > Cr-Commit-Position: refs/heads/master@{#14089} > > TBR=perkj@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5682 > > Committed: https://crrev.com/92b2e0852fcbe7765926755ccee884db965b6231 > Cr-Commit-Position: refs/heads/master@{#14090} TBR=perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2316493003 Cr-Commit-Position: refs/heads/master@{#14093}
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm b/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm index 73682d3..55d3917 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm +++ b/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm
@@ -30,7 +30,8 @@ RTCVideoFrame* videoFrame = [[RTCVideoFrame alloc] initWithVideoBuffer:nativeVideoFrame.video_frame_buffer() rotation:nativeVideoFrame.rotation() - timeStampNs:nativeVideoFrame.GetTimeStamp()]; + timeStampNs:nativeVideoFrame.timestamp_us() * + rtc::kNumNanosecsPerMicrosec]; CGSize current_size = (videoFrame.rotation % 180 == 0) ? CGSizeMake(videoFrame.width, videoFrame.height) : CGSizeMake(videoFrame.height, videoFrame.width);