X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fwebrtc%2Fmodules%2Fvideo_coding%2Fmain%2Fsource%2Finternal_defines.h;h=ef42c62801940c78e3e954a1749ccaacb47f24bb;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=efc6d8dd1033a92772b738d627958cf6a32b92cd;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/webrtc/modules/video_coding/main/source/internal_defines.h b/src/third_party/webrtc/modules/video_coding/main/source/internal_defines.h index efc6d8d..ef42c62 100644 --- a/src/third_party/webrtc/modules/video_coding/main/source/internal_defines.h +++ b/src/third_party/webrtc/modules/video_coding/main/source/internal_defines.h @@ -35,16 +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) +#else + #define VCM_H264_IDX VCM_VP8_IDX +#endif #ifdef VIDEOCODEC_I420 - #define VCM_I420_IDX VCM_VP8_IDX + 1 + #define VCM_I420_IDX (VCM_H264_IDX + 1) #else - #define VCM_I420_IDX VCM_VP8_IDX + #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