Remove VIDEOCODEC_* from engine_configurations.h.
Removes index-based codec fetching from the VCM and overall cleans up the code. BUG=webrtc:1695 R=mflodman@webrtc.org Review URL: https://codereview.webrtc.org/1425613004 . Cr-Commit-Position: refs/heads/master@{#10770}
This commit is contained in:
@ -32,30 +32,6 @@ inline uint32_t MaskWord64ToUWord32(int64_t w64)
|
||||
#define VCM_MIN_BITRATE 30
|
||||
#define VCM_FLUSH_INDICATOR 4
|
||||
|
||||
// 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)
|
||||
#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)
|
||||
#else
|
||||
#define VCM_H264_IDX VCM_VP9_IDX
|
||||
#endif
|
||||
#ifdef VIDEOCODEC_I420
|
||||
#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_NO_RECEIVER_ID 0
|
||||
|
||||
inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0)
|
||||
|
||||
Reference in New Issue
Block a user