wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1140648 - WebRTC check codec config max frame rate is set before using r=jesup

Browse Source
This commit is contained in:
Ethan Hugg 2015-03-06 19:05:11 -08:00
parent 3036078f15
commit 3ac0d1313e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
View File

@ -982,11 +982,14 @@ WebrtcVideoConduit::SelectSendFrameRate(unsigned int framerate)
cur_fs = mb_width * mb_height; cur_fs = mb_width * mb_height;
max_fps = mCurSendCodecConfig->mMaxMBPS/cur_fs; max_fps = mCurSendCodecConfig->mMaxMBPS/cur_fs;
if (max_fps < mSendingFramerate) if (max_fps < mSendingFramerate) {
mSendingFramerate = max_fps; mSendingFramerate = max_fps;
}
if (mCurSendCodecConfig->mMaxFrameRate < mSendingFramerate) if (mCurSendCodecConfig->mMaxFrameRate != 0 &&
mCurSendCodecConfig->mMaxFrameRate < mSendingFramerate) {
mSendingFramerate = mCurSendCodecConfig->mMaxFrameRate; mSendingFramerate = mCurSendCodecConfig->mMaxFrameRate;
}
} }
if (mSendingFramerate != framerate) if (mSendingFramerate != framerate)
{ {