diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-03-18 16:39:03 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-03-18 16:39:03 +0000 |
| commit | e3339fcb0795bf0e6fbf148133c8b79bcecc5ede (patch) | |
| tree | 276c4c7c3b9808c923e31d21d3d71fc3e2d54043 /video_engine/vie_codec_impl.cc | |
| parent | 0b5c7f1d087ab8075c4f6c04b17cf12d4d61cac8 (diff) | |
| download | webrtc-e3339fcb0795bf0e6fbf148133c8b79bcecc5ede.tar.gz | |
Generic video-codec support.
Labels frames as key/delta, also marks the first RTP packet of a frame as such,
to allow proper reconstruction even if packets are received out of order.
BUG=1442
TBR=ajm@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1207004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3680 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_codec_impl.cc')
| -rw-r--r-- | video_engine/vie_codec_impl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/video_engine/vie_codec_impl.cc b/video_engine/vie_codec_impl.cc index 0ace1e2b..42f1a876 100644 --- a/video_engine/vie_codec_impl.cc +++ b/video_engine/vie_codec_impl.cc @@ -158,7 +158,6 @@ int ViECodecImpl::SetSendCodec(const int video_channel, shared_data_->SetLastError(kViECodecReceiveOnlyChannel); return -1; } - // Set a max_bitrate if the user hasn't set one. VideoCodec video_codec_internal; memcpy(&video_codec_internal, &video_codec, sizeof(VideoCodec)); @@ -740,9 +739,11 @@ bool ViECodecImpl::CodecValid(const VideoCodec& video_codec) { "Codec type doesn't match pl_name", video_codec.plType); return false; } else if ((video_codec.codecType == kVideoCodecVP8 && - strncmp(video_codec.plName, "VP8", 4) == 0) || - (video_codec.codecType == kVideoCodecI420 && - strncmp(video_codec.plName, "I420", 4) == 0)) { + strncmp(video_codec.plName, "VP8", 4) == 0) || + (video_codec.codecType == kVideoCodecI420 && + strncmp(video_codec.plName, "I420", 4) == 0) || + (video_codec.codecType == kVideoCodecGeneric && + strncmp(video_codec.plName, "GENERIC", 7) == 0)) { // OK. } else { WEBRTC_TRACE(kTraceError, kTraceVideo, -1, |