(Auto)update libjingle 64956819-> 64982143
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5910 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
2f8d5f3302
commit
1fd5b45a0e
@ -281,8 +281,13 @@ class WebRtcRenderAdapter : public webrtc::ExternalRenderer {
|
|||||||
return renderer_->SetSize(width_, height_, 0) ? 0 : -1;
|
return renderer_->SetSize(width_, height_, 0) ? 0 : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int DeliverFrame(unsigned char* buffer, int buffer_size,
|
virtual int DeliverFrame(unsigned char* buffer,
|
||||||
uint32_t time_stamp, int64_t render_time,
|
int buffer_size,
|
||||||
|
uint32_t time_stamp,
|
||||||
|
#ifdef USE_WEBRTC_DEV_BRANCH
|
||||||
|
int64_t ntp_time_ms,
|
||||||
|
#endif
|
||||||
|
int64_t render_time,
|
||||||
void* handle) {
|
void* handle) {
|
||||||
talk_base::CritScope cs(&crit_);
|
talk_base::CritScope cs(&crit_);
|
||||||
frame_rate_tracker_.Update(1);
|
frame_rate_tracker_.Update(1);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user