aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.c47
-rw-r--r--srtserver.h12
2 files changed, 3 insertions, 56 deletions
diff --git a/main.c b/main.c
index 10b9991..4c51d0b 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include "ezlive_config.h"
#include "srtserver.h"
@@ -13,51 +14,6 @@ typedef struct {
TranscodeTalker transcode_talker;
} MainCtx;
-void on_rtmp_start(void *ctx) {
- MainCtx *main_ctx = ctx;
- main_ctx->ringbuf = malloc(sizeof(RingBuffer));
- RingBuffer_init(main_ctx->ringbuf, 4096);
- RingBuffer *rb = main_ctx->ringbuf;
- TranscodeTalker_new_stream(&main_ctx->transcode_talker, rb);
-
- RingBuffer_write_char(rb, 'F');
- RingBuffer_write_char(rb, 'L');
- RingBuffer_write_char(rb, 'V');
- RingBuffer_write_char(rb, 1);
- RingBuffer_write_char(rb, 5);
- RingBuffer_write_word32be(rb, 9);
- RingBuffer_write_word32be(rb, 0);
-}
-
-void on_rtmp_stop(void *ctx) {
- MainCtx *main_ctx = ctx;
- RingBuffer_end(main_ctx->ringbuf);
-}
-
-void on_rtmp_video(void *ctx, int64_t timestamp, char *buf, size_t size) {
- MainCtx *main_ctx = ctx;
- RingBuffer *rb = main_ctx->ringbuf;
- RingBuffer_write_char(rb, 9);
- RingBuffer_write_word24be(rb, size);
- RingBuffer_write_word24be(rb, timestamp);
- RingBuffer_write_char(rb, timestamp >> 24);
- RingBuffer_write_word24be(rb, 0);
- RingBuffer_write(rb, (const uint8_t *)buf, size);
- RingBuffer_write_word32be(rb, size + 11);
-}
-
-void on_rtmp_audio(void *ctx, int64_t timestamp, char *buf, size_t size) {
- MainCtx *main_ctx = ctx;
- RingBuffer *rb = main_ctx->ringbuf;
- RingBuffer_write_char(rb, 8);
- RingBuffer_write_word24be(rb, size);
- RingBuffer_write_word24be(rb, timestamp);
- RingBuffer_write_char(rb, timestamp >> 24);
- RingBuffer_write_word24be(rb, 0);
- RingBuffer_write(rb, (const uint8_t *)buf, size);
- RingBuffer_write_word32be(rb, size + 11);
-}
-
void on_srt_start(void *ctx) {
MainCtx *main_ctx = ctx;
main_ctx->ringbuf = malloc(sizeof(RingBuffer));
@@ -132,7 +88,6 @@ int main(int argc, char **argv) {
pthread_t s3worker_thread;
pthread_create(&s3worker_thread, NULL, &s3_worker_main, NULL);
- // start_rtmpserver(rtmp_cbs, &main_ctx);
start_srt_server(srt_cbs, &main_ctx);
return 0;
} \ No newline at end of file
diff --git a/srtserver.h b/srtserver.h
index b228884..5af43fe 100644
--- a/srtserver.h
+++ b/srtserver.h
@@ -1,5 +1,5 @@
-#ifndef RTMPSERVER_H_
-#define RTMPSERVER_H_
+#ifndef SRTSERVER_H_
+#define SRTSERVER_H_
#ifdef __cplusplus
extern "C" {
@@ -11,17 +11,9 @@ extern "C" {
typedef struct {
void (*on_start)(void *ctx);
void (*on_stop)(void *ctx);
- void (*on_video)(void* ctx, int64_t timestamp, char *buf, size_t size);
- void (*on_audio)(void* ctx, int64_t timestamp, char *buf, size_t size);
-} RtmpCallbacks;
-
-typedef struct {
- void (*on_start)(void *ctx);
- void (*on_stop)(void *ctx);
void (*on_data)(void* ctx, char *buf, size_t size);
} SrtCallbacks;
-void start_rtmpserver(RtmpCallbacks cbs, void *ctx);
void start_srt_server(SrtCallbacks cbs, void *ctx);
#ifdef __cplusplus