generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add boilerplate code for H.264.

Browse Source 
R=mflodman@webrtc.org, niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6603 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2014-07-04 12:42:07 +00:00
parent d8440f7c45
commit b9f5453e29
13 changed files with 115 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/video_engine/test/auto_test/source/vie_autotest.cc
View File

@@ -101,6 +101,9 @@ void ViEAutoTest::PrintVideoCodec(const webrtc::VideoCodec videoCodec)
case webrtc::kVideoCodecI420:
ViETest::Log("\tcodecType: I420");
break;
case webrtc::kVideoCodecH264:
ViETest::Log("\tcodecType: H264");
break;
case webrtc::kVideoCodecRED:
ViETest::Log("\tcodecType: RED");
break;

16
webrtc/video_engine/vie_codec_impl.cc
View File

@@ -69,6 +69,18 @@ static void LogCodec(const VideoCodec& codec) {
<< ", qp max "
<< codec.simulcastStream[idx].qpMax;
}
} else if (codec.codecType == kVideoCodecH264) {
LOG(LS_INFO) << "H264 specific settings";
LOG(LS_INFO) << "profile: "
<< codec.codecSpecific.H264.profile
<< ", framedropping: "
<< codec.codecSpecific.H264.frameDroppingOn
<< ", keyFrameInterval: "
<< codec.codecSpecific.H264.keyFrameInterval
<< ", spslen: "
<< codec.codecSpecific.H264.spsLen
<< ", ppslen: "
<< codec.codecSpecific.H264.ppsLen;
}
}
@@ -629,7 +641,9 @@ bool ViECodecImpl::CodecValid(const VideoCodec& video_codec) {
} 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, "I420", 4) == 0) ||
(video_codec.codecType == kVideoCodecH264 &&
strncmp(video_codec.plName, "H264", 4) == 0)) {
// OK.
} else if (video_codec.codecType != kVideoCodecGeneric) {
LOG(LS_ERROR) << "Codec type and name mismatch.";