合并fmp4和mov接口

src/Record/MP4.cpp

@@ -13,34 +13,119 @@
 #include "Util/File.h"
 #include "Util/logger.h"
 #include "Common/config.h"
+#include "fmp4-writer.h"
+
 using namespace toolkit;
 namespace mediakit {
 
+struct mp4_writer_t {
+    int is_fmp4;
+    union {
+        fmp4_writer_t *fmp4;
+        mov_writer_t *mov;
+    } u;
+};
+
+mp4_writer_t* mp4_writer_create(int is_fmp4, const struct mov_buffer_t *buffer, void* param, int flags){
+    mp4_writer_t *mp4 = (mp4_writer_t *) malloc(sizeof(mp4_writer_t));
+    mp4->is_fmp4 = is_fmp4;
+    if (is_fmp4) {
+        mp4->u.fmp4 = fmp4_writer_create(buffer, param, flags);
+    } else {
+        mp4->u.mov = mov_writer_create(buffer, param, flags);
+    }
+    return mp4;
+}
+
+void mp4_writer_destroy(mp4_writer_t* mp4){
+    if (mp4->is_fmp4) {
+        fmp4_writer_destroy(mp4->u.fmp4);
+    } else {
+        mov_writer_destroy(mp4->u.mov);
+    }
+    free(mp4);
+}
+
+int mp4_writer_add_audio(mp4_writer_t* mp4, uint8_t object, int channel_count, int bits_per_sample, int sample_rate, const void* extra_data, size_t extra_data_size){
+    if (mp4->is_fmp4) {
+        return fmp4_writer_add_audio(mp4->u.fmp4, object, channel_count, bits_per_sample, sample_rate, extra_data, extra_data_size);
+    } else {
+        return mov_writer_add_audio(mp4->u.mov, object, channel_count, bits_per_sample, sample_rate, extra_data, extra_data_size);
+    }
+}
+
+int mp4_writer_add_video(mp4_writer_t* mp4, uint8_t object, int width, int height, const void* extra_data, size_t extra_data_size){
+    if (mp4->is_fmp4) {
+        return fmp4_writer_add_video(mp4->u.fmp4, object, width, height, extra_data, extra_data_size);
+    } else {
+        return mov_writer_add_video(mp4->u.mov, object, width, height, extra_data, extra_data_size);
+    }
+}
+
+int mp4_writer_add_subtitle(mp4_writer_t* mp4, uint8_t object, const void* extra_data, size_t extra_data_size){
+    if (mp4->is_fmp4) {
+        return fmp4_writer_add_subtitle(mp4->u.fmp4, object, extra_data, extra_data_size);
+    } else {
+        return mov_writer_add_subtitle(mp4->u.mov, object, extra_data, extra_data_size);
+    }
+}
+
+int mp4_writer_write(mp4_writer_t* mp4, int track, const void* data, size_t bytes, int64_t pts, int64_t dts, int flags){
+    if (mp4->is_fmp4) {
+        return fmp4_writer_write(mp4->u.fmp4, track, data, bytes, pts, dts, flags);
+    } else {
+        return mov_writer_write(mp4->u.mov, track, data, bytes, pts, dts, flags);
+    }
+}
+
+int mp4_writer_write_l(mp4_writer_t* mp4, int track, const void* data, size_t bytes, int64_t pts, int64_t dts, int flags, int add_nalu_size){
+    if (mp4->is_fmp4) {
+        return fmp4_writer_write_l(mp4->u.fmp4, track, data, bytes, pts, dts, flags, add_nalu_size);
+    } else {
+        return mov_writer_write_l(mp4->u.mov, track, data, bytes, pts, dts, flags, add_nalu_size);
+    }
+}
+
+int mp4_writer_save_segment(mp4_writer_t* mp4){
+    if (mp4->is_fmp4) {
+        return fmp4_writer_save_segment(mp4->u.fmp4);
+    } else {
+        return -1;
+    }
+}
+
+int mp4_writer_init_segment(mp4_writer_t* mp4){
+    if (mp4->is_fmp4) {
+        return fmp4_writer_init_segment(mp4->u.fmp4);
+    } else {
+        return -1;
+    }
+}
+
 static struct mov_buffer_t s_io = {
-        [](void* ctx, void* data, uint64_t bytes) {
-            MP4File *thiz = (MP4File *)ctx;
-            return thiz->onRead(data,bytes);
+        [](void *ctx, void *data, uint64_t bytes) {
+            MP4File *thiz = (MP4File *) ctx;
+            return thiz->onRead(data, bytes);
         },
-        [](void* ctx, const void* data, uint64_t bytes){
-            MP4File *thiz = (MP4File *)ctx;
-            return thiz->onWrite(data,bytes);
+        [](void *ctx, const void *data, uint64_t bytes) {
+            MP4File *thiz = (MP4File *) ctx;
+            return thiz->onWrite(data, bytes);
         },
-        [](void* ctx, uint64_t offset) {
-            MP4File *thiz = (MP4File *)ctx;
+        [](void *ctx, uint64_t offset) {
+            MP4File *thiz = (MP4File *) ctx;
             return thiz->onSeek(offset);
         },
-        [](void* ctx){
-            MP4File *thiz = (MP4File *)ctx;
+        [](void *ctx) {
+            MP4File *thiz = (MP4File *) ctx;
             return thiz->onTell();
         }
 };
 
-MP4File::Writer MP4File::createWriter(){
-    GET_CONFIG(bool, mp4FastStart, Record::kFastStart);
+MP4File::Writer MP4File::createWriter(int flags, bool is_fmp4){
     Writer writer;
-    writer.reset(mov_writer_create(&s_io,this,mp4FastStart ? MOV_FLAG_FASTSTART : 0),[](mov_writer_t *ptr){
+    writer.reset(mp4_writer_create(is_fmp4, &s_io,this, flags),[](mp4_writer_t *ptr){
         if(ptr){
-            mov_writer_destroy(ptr);
+            mp4_writer_destroy(ptr);
         }
     });
     if(!writer){