msinterfaces.h | msinterfaces.h | |||
---|---|---|---|---|
skipping to change at line 203 | skipping to change at line 203 | |||
#define MS_AUDIO_CAPTURE_FORCE_SPEAKER_STATE \ | #define MS_AUDIO_CAPTURE_FORCE_SPEAKER_STATE \ | |||
MS_FILTER_METHOD(MSFilterAudioCaptureInterface, 255, bool_t) | MS_FILTER_METHOD(MSFilterAudioCaptureInterface, 255, bool_t) | |||
/** Interface definitions for audio encoder */ | /** Interface definitions for audio encoder */ | |||
#define MS_AUDIO_ENCODER_SET_PTIME \ | #define MS_AUDIO_ENCODER_SET_PTIME \ | |||
MS_FILTER_METHOD(MSFilterAudioEncoderInterface,0,int) | MS_FILTER_METHOD(MSFilterAudioEncoderInterface,0,int) | |||
#define MS_AUDIO_ENCODER_GET_PTIME \ | #define MS_AUDIO_ENCODER_GET_PTIME \ | |||
MS_FILTER_METHOD(MSFilterAudioEncoderInterface,1,int) | MS_FILTER_METHOD(MSFilterAudioEncoderInterface,1,int) | |||
/* Enable encoder's builtin forward error correction, if available*/ | ||||
#define MS_AUDIO_ENCODER_ENABLE_FEC \ | ||||
MS_FILTER_METHOD(MSFilterAudioEncoderInterface,2,int) | ||||
/* Set the packet loss percentage reported, so that encoder may compensate | ||||
if forward-correction is enabled and implemented.*/ | ||||
#define MS_AUDIO_ENCODER_SET_PACKET_LOSS \ | ||||
MS_FILTER_METHOD(MSFilterAudioEncoderInterface,3,int) | ||||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 8 lines changed or added | |||
msvideo.h | msvideo.h | |||
---|---|---|---|---|
skipping to change at line 214 | skipping to change at line 214 | |||
#endif | #endif | |||
MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); | MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); | |||
MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); | MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); | |||
MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); | MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); | |||
MS2_PUBLIC void ms_ffmpeg_check_init(void); | MS2_PUBLIC void ms_ffmpeg_check_init(void); | |||
MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); | MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); | |||
MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t * m, int w, int h); | MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t * m, int w, int h); | |||
MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t * m, MSPixFmt fmt, int w, int h); | MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t * m, MSPixFmt fmt, int w, int h); | |||
MS2_PUBLIC mblk_t * ms_yuv_buf_alloc(MSPicture *buf, int w, int h); | MS2_PUBLIC mblk_t * ms_yuv_buf_alloc(MSPicture *buf, int w, int h); | |||
/* Allocates a video mblk_t with supplied width and height, the pixels bein | ||||
g contained in an external buffer. | ||||
The returned mblk_t points to the external buffer, which is not copied, nor | ||||
ref'd: the reference is simply transfered to the returned mblk_t*/ | ||||
MS2_PUBLIC mblk_t * ms_yuv_buf_alloc_from_buffer(int w, int h, mblk_t* buff er); | MS2_PUBLIC mblk_t * ms_yuv_buf_alloc_from_buffer(int w, int h, mblk_t* buff er); | |||
MS2_PUBLIC void ms_yuv_buf_copy(uint8_t *src_planes[], const int src_stride s[], | MS2_PUBLIC void ms_yuv_buf_copy(uint8_t *src_planes[], const int src_stride s[], | |||
uint8_t *dst_planes[], const int dst_strides[3], MSVideoSize roi); | uint8_t *dst_planes[], const int dst_strides[3], MSVideoSize roi); | |||
MS2_PUBLIC void ms_yuv_buf_mirror(YuvBuf *buf); | MS2_PUBLIC void ms_yuv_buf_mirror(YuvBuf *buf); | |||
MS2_PUBLIC void ms_yuv_buf_mirrors(YuvBuf *buf,const MSMirrorType type); | MS2_PUBLIC void ms_yuv_buf_mirrors(YuvBuf *buf,const MSMirrorType type); | |||
MS2_PUBLIC void rgb24_mirror(uint8_t *buf, int w, int h, int linesize); | MS2_PUBLIC void rgb24_mirror(uint8_t *buf, int w, int h, int linesize); | |||
MS2_PUBLIC void rgb24_revert(uint8_t *buf, int w, int h, int linesize); | MS2_PUBLIC void rgb24_revert(uint8_t *buf, int w, int h, int linesize); | |||
MS2_PUBLIC void rgb24_copy_revert(uint8_t *dstbuf, int dstlsz, | MS2_PUBLIC void rgb24_copy_revert(uint8_t *dstbuf, int dstlsz, | |||
const uint8_t *srcbuf, int srclsz, MSVideoSi ze roi); | const uint8_t *srcbuf, int srclsz, MSVideoSi ze roi); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 5 lines changed or added | |||
port.h | port.h | |||
---|---|---|---|---|
skipping to change at line 144 | skipping to change at line 144 | |||
typedef __int64 int64_t; | typedef __int64 int64_t; | |||
typedef unsigned short uint16_t; | typedef unsigned short uint16_t; | |||
typedef unsigned int uint32_t; | typedef unsigned int uint32_t; | |||
typedef int int32_t; | typedef int int32_t; | |||
typedef unsigned char uint8_t; | typedef unsigned char uint8_t; | |||
typedef __int16 int16_t; | typedef __int16 int16_t; | |||
#else | #else | |||
#include <stdint.h> /*provided by mingw32*/ | #include <stdint.h> /*provided by mingw32*/ | |||
#include <io.h> | #include <io.h> | |||
#define ORTP_PUBLIC | #define ORTP_PUBLIC | |||
ORTP_PUBLIC char* strtok_r(char *str, const char *delim, char **nextp); | ||||
#endif | #endif | |||
#define vsnprintf _vsnprintf | #define vsnprintf _vsnprintf | |||
#define srandom srand | #define srandom srand | |||
#define random rand | #define random rand | |||
ORTP_PUBLIC char* strtok_r(char *str, const char *delim, char **nextp); | ||||
typedef SOCKET ortp_socket_t; | typedef SOCKET ortp_socket_t; | |||
#ifdef WINAPI_FAMILY_PHONE_APP | #ifdef WINAPI_FAMILY_PHONE_APP | |||
typedef CONDITION_VARIABLE ortp_cond_t; | typedef CONDITION_VARIABLE ortp_cond_t; | |||
typedef SRWLOCK ortp_mutex_t; | typedef SRWLOCK ortp_mutex_t; | |||
#else | #else | |||
typedef HANDLE ortp_cond_t; | typedef HANDLE ortp_cond_t; | |||
typedef HANDLE ortp_mutex_t; | typedef HANDLE ortp_mutex_t; | |||
#endif | #endif | |||
typedef HANDLE ortp_thread_t; | typedef HANDLE ortp_thread_t; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 1 lines changed or added | |||