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

Add missing break introduced in r6603.

Browse Source 
R=pbos@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6607 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2014-07-04 17:04:00 +00:00
parent bee164a214
commit 7832648824
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/modules/video_coding/main/source/codec_database.cc
View File

@ -344,12 +344,6 @@ bool VCMCodecDataBase::RequiresEncoderReset(const VideoCodec& new_send_codec) {
return true;
}
break;
case kVideoCodecGeneric:
break;
// Known codecs without payload-specifics
case kVideoCodecI420:
case kVideoCodecRED:
case kVideoCodecULPFEC:
case kVideoCodecH264:
if (memcmp(&new_send_codec.codecSpecific.H264,
&send_codec_.codecSpecific.H264,
@ -357,6 +351,13 @@ bool VCMCodecDataBase::RequiresEncoderReset(const VideoCodec& new_send_codec) {
return true;
}
break;
case kVideoCodecGeneric:
break;
// Known codecs without payload-specifics
case kVideoCodecI420:
case kVideoCodecRED:
case kVideoCodecULPFEC:
break;
// Unknown codec type, reset just to be sure.
case kVideoCodecUnknown:
return true;

8
webrtc/modules/video_coding/main/source/internal_defines.h
View File

@ -35,21 +35,21 @@ inline uint32_t MaskWord64ToUWord32(int64_t w64)
// Helper macros for creating the static codec list
#define VCM_NO_CODEC_IDX -1
#ifdef VIDEOCODEC_VP8
#define VCM_VP8_IDX VCM_NO_CODEC_IDX + 1
#define VCM_VP8_IDX (VCM_NO_CODEC_IDX + 1)
#else
#define VCM_VP8_IDX VCM_NO_CODEC_IDX
#endif
#ifdef VIDEOCODEC_H264
#define VCM_H264_IDX VCM_VP8_IDX + 1
#define VCM_H264_IDX (VCM_VP8_IDX + 1)
#else
#define VCM_H264_IDX VCM_VP8_IDX
#endif
#ifdef VIDEOCODEC_I420
#define VCM_I420_IDX VCM_H264_IDX + 1
#define VCM_I420_IDX (VCM_H264_IDX + 1)
#else
#define VCM_I420_IDX VCM_H264_IDX
#endif
#define VCM_NUM_VIDEO_CODECS_AVAILABLE VCM_I420_IDX + 1
#define VCM_NUM_VIDEO_CODECS_AVAILABLE (VCM_I420_IDX + 1)
#define VCM_NO_RECEIVER_ID 0