generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 69648312-> 69830415

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6527 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-06-24 07:24:49 +00:00
parent b338ca6557
commit 71dffb76dc
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/media/base/mediachannel.h
View File

@@ -901,6 +901,7 @@ struct VideoSenderInfo : public MediaSenderInfo {
nominal_bitrate(0),
preferred_bitrate(0),
adapt_reason(0),
adapt_changes(0),
capture_jitter_ms(0),
avg_encode_ms(0),
encode_usage_percent(0),
@@ -922,6 +923,7 @@ struct VideoSenderInfo : public MediaSenderInfo {
int nominal_bitrate;
int preferred_bitrate;
int adapt_reason;
int adapt_changes;
int capture_jitter_ms;
int avg_encode_ms;
int encode_usage_percent;

2
talk/media/base/videoadapter.h
View File

@@ -72,6 +72,8 @@ class VideoAdapter {
void set_scale_third(bool enable);
bool scale_third() const { return scale_third_; }
int adaptation_changes() const { return adaption_changes_; }
protected:
float FindClosestScale(int width, int height, int target_num_pixels);
float FindClosestViewScale(int width, int height, int target_num_pixels);