zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed SSRC knowledge from ViEEncoder.

Browse Source 
SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream.
I think that make sence since that allows debug recording with external encoder implementations one day.

BUG=webrtc:5687

Review-Url: https://codereview.webrtc.org/1936503002
Cr-Commit-Position: refs/heads/master@{#12632}
This commit is contained in:
perkj
2016-05-04 11:26:51 -07:00
committed by Commit bot
parent ef00ec1d4e
commit 600246e63f
12 changed files with 150 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/video_coding/video_sender.cc
View File

@ -335,11 +335,10 @@ int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame,
return VCM_OK;
}
int32_t VideoSender::IntraFrameRequest(int stream_index) {
int32_t VideoSender::IntraFrameRequest(size_t stream_index) {
{
rtc::CritScope lock(&params_crit_);
if (stream_index < 0 ||
static_cast<size_t>(stream_index) >= next_frame_types_.size()) {
if (stream_index >= next_frame_types_.size()) {
return -1;
}
next_frame_types_[stream_index] = kVideoFrameKey;
@ -353,7 +352,7 @@ int32_t VideoSender::IntraFrameRequest(int stream_index) {
// encoder_crit_.
rtc::CritScope lock(&encoder_crit_);
rtc::CritScope params_lock(&params_crit_);
if (static_cast<size_t>(stream_index) >= next_frame_types_.size())
if (stream_index >= next_frame_types_.size())
return -1;
if (_encoder != nullptr && _encoder->InternalSource()) {
// Try to request the frame if we have an external encoder with