modules/video_coding refactorings
The main purpose was the interface-> include rename, but other files were also moved, eliminating the "main" dir. To avoid breaking downstream, the "interface" directories were copied into a new "video_coding/include" dir. The old headers got pragma warnings added about deprecation (a very short deprecation since I plan to remove them as soon downstream is updated). Other files also moved: video_coding/main/source -> video_coding video_coding/main/test -> video_coding/test BUG=webrtc:5095 TESTED=Passing compile-trybots with --clobber flag: git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=stefan@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1417283007 . Cr-Commit-Position: refs/heads/master@{#10694}
This commit is contained in:
68
webrtc/modules/video_coding/internal_defines.h
Normal file
68
webrtc/modules/video_coding/internal_defines.h
Normal file
@ -0,0 +1,68 @@
|
||||
/*
|
||||
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_
|
||||
#define WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_
|
||||
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
namespace webrtc
|
||||
{
|
||||
|
||||
#define MASK_32_BITS(x) (0xFFFFFFFF & (x))
|
||||
|
||||
inline uint32_t MaskWord64ToUWord32(int64_t w64)
|
||||
{
|
||||
return static_cast<uint32_t>(MASK_32_BITS(w64));
|
||||
}
|
||||
|
||||
#define VCM_MAX(a, b) (((a) > (b)) ? (a) : (b))
|
||||
#define VCM_MIN(a, b) (((a) < (b)) ? (a) : (b))
|
||||
|
||||
#define VCM_DEFAULT_CODEC_WIDTH 352
|
||||
#define VCM_DEFAULT_CODEC_HEIGHT 288
|
||||
#define VCM_DEFAULT_FRAME_RATE 30
|
||||
#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)
|
||||
{
|
||||
return static_cast<int32_t>((vcmId << 16) + receiverId);
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_
|
||||
Reference in New Issue
Block a user