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

Revert "Fix crash with CVO turned on for VP9 codec"

Browse Source 
This reverts commit 29b1a1c0c7c6f4b1ae4d63844b1dfaa7a72530a0.

TBR=guoweis@webrtc.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#8952}
This commit is contained in:
Guo-wei Shieh
2015-04-08 10:05:39 -07:00
parent 29b1a1c0c7
commit 1064679bba
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/video_coding/main/source/generic_encoder.cc
View File

@ -8,7 +8,6 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "webrtc/base/checks.h"
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_coding/main/source/encoded_frame.h" #include "webrtc/modules/video_coding/main/source/encoded_frame.h"
#include "webrtc/modules/video_coding/main/source/generic_encoder.h" #include "webrtc/modules/video_coding/main/source/generic_encoder.h"
@ -21,7 +20,10 @@ namespace {
// Map information from info into rtp. If no relevant information is found // Map information from info into rtp. If no relevant information is found
// in info, rtp is set to NULL. // in info, rtp is set to NULL.
void CopyCodecSpecific(const CodecSpecificInfo* info, RTPVideoHeader** rtp) { void CopyCodecSpecific(const CodecSpecificInfo* info, RTPVideoHeader** rtp) {
DCHECK(info); if (!info) {
*rtp = NULL;
return;
}
switch (info->codecType) { switch (info->codecType) {
case kVideoCodecVP8: { case kVideoCodecVP8: {
(*rtp)->codec = kRtpVideoVp8; (*rtp)->codec = kRtpVideoVp8;
@ -44,6 +46,8 @@ void CopyCodecSpecific(const CodecSpecificInfo* info, RTPVideoHeader** rtp) {
(*rtp)->simulcastIdx = info->codecSpecific.generic.simulcast_idx; (*rtp)->simulcastIdx = info->codecSpecific.generic.simulcast_idx;
return; return;
default: default:
// No codec specific info. Change RTP header pointer to NULL.
*rtp = NULL;
return; return;
} }
} }