StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Avoid forward declaration of rtp structs.

Browse Source 
Forward declarations are problematic, as they easily allow introducing
cyclic dependencies.
This commit is contained in:
iphydf 2018-08-12 14:22:21 +00:00
parent b2590e2f44
commit 767ccbb387
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toxav/audio.h
View File

@ -24,6 +24,7 @@
#include "../toxcore/logger.h" #include "../toxcore/logger.h"
#include "../toxcore/util.h" #include "../toxcore/util.h"
#include "rtp.h"
#include <opus.h> #include <opus.h>
#include <pthread.h> #include <pthread.h>
@ -48,8 +49,6 @@
#define AUDIO_MAX_BUFFER_SIZE_PCM16 ((AUDIO_MAX_SAMPLE_RATE * AUDIO_MAX_FRAME_DURATION_MS) / 1000) #define AUDIO_MAX_BUFFER_SIZE_PCM16 ((AUDIO_MAX_SAMPLE_RATE * AUDIO_MAX_FRAME_DURATION_MS) / 1000)
#define AUDIO_MAX_BUFFER_SIZE_BYTES (AUDIO_MAX_BUFFER_SIZE_PCM16 * 2) #define AUDIO_MAX_BUFFER_SIZE_BYTES (AUDIO_MAX_BUFFER_SIZE_PCM16 * 2)
struct RTPMessage;
typedef struct ACSession_s { typedef struct ACSession_s {
const Logger *log; const Logger *log;

5
toxav/video.h
View File

@ -24,6 +24,8 @@
#include "../toxcore/logger.h" #include "../toxcore/logger.h"
#include "../toxcore/util.h" #include "../toxcore/util.h"
#include "ring_buffer.h"
#include "rtp.h"
#include <vpx/vpx_decoder.h> #include <vpx/vpx_decoder.h>
#include <vpx/vpx_encoder.h> #include <vpx/vpx_encoder.h>
@ -35,9 +37,6 @@
#include <pthread.h> #include <pthread.h>
struct RTPMessage;
struct RingBuffer;
typedef struct VCSession_s { typedef struct VCSession_s {
/* encoding */ /* encoding */
vpx_codec_ctx_t encoder[1]; vpx_codec_ctx_t encoder[1];