Add per stream intra requests.

BUG=

Review URL: https://webrtc-codereview.appspot.com/829006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2883 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2012-10-08 07:06:53 +00:00
parent 7bc3a4172a
commit c530043684
27 changed files with 260 additions and 108 deletions

View File

@ -227,31 +227,30 @@ webrtc::FrameType VCMEncodedFrame::ConvertFrameType(VideoFrameType frameType)
}
}
VideoFrameType VCMEncodedFrame::ConvertFrameType(webrtc::FrameType frameType)
{
switch (frameType)
{
VideoFrameType VCMEncodedFrame::ConvertFrameType(webrtc::FrameType frame_type) {
switch (frame_type) {
case kVideoFrameKey:
{
return kKeyFrame;
}
return kKeyFrame;
case kVideoFrameDelta:
{
return kDeltaFrame;
}
return kDeltaFrame;
case kVideoFrameGolden:
{
return kGoldenFrame;
}
return kGoldenFrame;
case kVideoFrameAltRef:
{
return kAltRefFrame;
}
return kAltRefFrame;
default:
{
return kDeltaFrame;
}
}
assert(false);
return kDeltaFrame;
}
}
void VCMEncodedFrame::ConvertFrameTypes(
const std::vector<webrtc::FrameType>& frame_types,
std::vector<VideoFrameType>* video_frame_types) {
assert(video_frame_types);
video_frame_types->reserve(frame_types.size());
for (size_t i = 0; i < frame_types.size(); ++i) {
(*video_frame_types)[i] = ConvertFrameType(frame_types[i]);
}
}
}