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

Revert cls (original cl + fixes) 7422-7424 "Add VP9 codec to VCM..."

Browse Source 
BUG=3932
R=marpan@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7470 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-10-17 18:54:46 +00:00
parent 58202946a7
commit b1dac33cac
28 changed files with 159 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,15 +39,10 @@ inline uint32_t MaskWord64ToUWord32(int64_t w64)
#else
#define VCM_VP8_IDX VCM_NO_CODEC_IDX
#endif
#ifdef VIDEOCODEC_VP9
#define VCM_VP9_IDX (VCM_VP8_IDX + 1)
#else
#define VCM_VP9_IDX VCM_VP8_IDX
#endif
#ifdef VIDEOCODEC_H264
#define VCM_H264_IDX (VCM_VP9_IDX + 1)
#define VCM_H264_IDX (VCM_VP8_IDX + 1)
#else
#define VCM_H264_IDX VCM_VP9_IDX
#define VCM_H264_IDX VCM_VP8_IDX
#endif
#ifdef VIDEOCODEC_I420
#define VCM_I420_IDX (VCM_H264_IDX + 1)