Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1144912 - WebRTC Screenshare has own default FPS r=jib

Browse Source
This commit is contained in:
Ethan Hugg 2015-03-23 19:17:07 -07:00
parent e53c6e48b7
commit 76ac0daed4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media/webrtc/trunk/webrtc/video_engine/vie_capturer.cc
View File

@ -207,6 +207,7 @@ int32_t ViECapturer::Start(const CaptureCapability& capture_capability) {
int frame_rate;
VideoCaptureCapability capability;
requested_capability_ = capture_capability;
CaptureDeviceType type = config_.Get<CaptureDeviceInfo>().type;
if (!CaptureCapabilityFixed()) {
// Ask the observers for best size.
@ -218,7 +219,11 @@ int32_t ViECapturer::Start(const CaptureCapability& capture_capability) {
height = kViECaptureDefaultHeight;
}
if (frame_rate == 0) {
frame_rate = kViECaptureDefaultFramerate;
if (type == Screen || type == Window || type == Application) {
frame_rate = kViEScreenCaptureDefaultFramerate;
} else {
frame_rate = kViECaptureDefaultFramerate;
}
}
capability.height = height;
capability.width = width;

1
media/webrtc/trunk/webrtc/video_engine/vie_defines.h
View File

@ -41,6 +41,7 @@ enum { kViEMaxCaptureDevices = 256 };
enum { kViECaptureDefaultWidth = 352 };
enum { kViECaptureDefaultHeight = 288 };
enum { kViECaptureDefaultFramerate = 30 };
enum { kViEScreenCaptureDefaultFramerate = 3 };
enum { kViECaptureMaxSnapshotWaitTimeMs = 500 };
// ViECodec