webrtc/modules/video_coding/main/source/internal_defines.h - Issue 1425613004: Remove VIDEOCODEC_* from engine_configurations.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/main/source/internal_defines.h

Issue 1425613004: Remove VIDEOCODEC_* from engine_configurations.h. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: remove comment part Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/video_coding/main/source/codec_database.cc ('k') | webrtc/modules/video_coding/main/source/video_coding_impl.cc » ('j') | webrtc/modules/video_coding/main/source/video_coding_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/main/source/internal_defines.h

diff --git a/webrtc/modules/video_coding/main/source/internal_defines.h b/webrtc/modules/video_coding/main/source/internal_defines.h

index adc940f20df42aeacfd7cbc28d7e514c88db0b03..5c4e941df6babd00dddd125d185f99c8d6b17610 100644

--- a/webrtc/modules/video_coding/main/source/internal_defines.h

+++ b/webrtc/modules/video_coding/main/source/internal_defines.h

@@ -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)