Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: webrtc/api/android/jni/androidvideocapturer_jni.cc

Issue 2088953002: Add cricket::VideoFrame::frame_id() and set it to RTP timestamp. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/api/androidvideotracksource.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/android/jni/androidvideocapturer_jni.cc
diff --git a/webrtc/api/android/jni/androidvideocapturer_jni.cc b/webrtc/api/android/jni/androidvideocapturer_jni.cc
index f9c334b39455100f0690d95e53d907df9c9cc476..d31ce26aabf7126f20ba39ede7fb34c8bafffb32 100644
--- a/webrtc/api/android/jni/androidvideocapturer_jni.cc
+++ b/webrtc/api/android/jni/androidvideocapturer_jni.cc
@@ -234,13 +234,13 @@ void AndroidVideoCapturerJni::OnMemoryBufferFrame(void* video_frame,
scaled_buffer->ScaleFrom(buffer);
buffer = scaled_buffer;
}
- capturer_->OnFrame(cricket::WebRtcVideoFrame(
- buffer,
- capturer_->apply_rotation()
- ? webrtc::kVideoRotation_0
- : static_cast<webrtc::VideoRotation>(rotation),
- translated_camera_time_us),
- width, height);
+ capturer_->OnFrame(
+ cricket::WebRtcVideoFrame(
+ buffer, capturer_->apply_rotation()
+ ? webrtc::kVideoRotation_0
+ : static_cast<webrtc::VideoRotation>(rotation),
+ translated_camera_time_us, 0),
+ width, height);
}
void AndroidVideoCapturerJni::OnTextureFrame(int width,
@@ -289,16 +289,15 @@ void AndroidVideoCapturerJni::OnTextureFrame(int width,
matrix.Rotate(static_cast<webrtc::VideoRotation>(rotation));
}
- capturer_->OnFrame(
- cricket::WebRtcVideoFrame(
- surface_texture_helper_->CreateTextureFrame(
- adapted_width, adapted_height,
- NativeHandleImpl(handle.oes_texture_id, matrix)),
- capturer_->apply_rotation()
- ? webrtc::kVideoRotation_0
- : static_cast<webrtc::VideoRotation>(rotation),
- translated_camera_time_us),
- width, height);
+ capturer_->OnFrame(cricket::WebRtcVideoFrame(
+ surface_texture_helper_->CreateTextureFrame(
+ adapted_width, adapted_height,
+ NativeHandleImpl(handle.oes_texture_id, matrix)),
+ capturer_->apply_rotation()
+ ? webrtc::kVideoRotation_0
+ : static_cast<webrtc::VideoRotation>(rotation),
+ translated_camera_time_us, 0),
+ width, height);
}
void AndroidVideoCapturerJni::OnOutputFormatRequest(int width,
« no previous file with comments | « no previous file | webrtc/api/androidvideotracksource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698