Unify muxing between the local file and networking.

[nageru] / h264encode.h

diff --git a/h264encode.h b/h264encode.h
index 5662f05183608e061383fbe6633a2c9185ab696a..7a10d927ca84f94a7f8abc74fb7c6c7910b2e8d0 100644 (file)
--- a/h264encode.h
+++ b/h264encode.h
@@ -39,19 +39,20 @@ extern "C" {
 #include <thread>
 #include <vector>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 #include "context.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
+class HTTPD;
 class QSurface;
 
 #define SURFACE_NUM 16 /* 16 surfaces for source YUV */
 
 class H264Encoder {
 public:
-       H264Encoder(QSurface *surface, int width, int height, const char *output_filename);
+       H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd);
        ~H264Encoder();
        //void add_frame(FrameAllocator::Frame frame, GLsync fence);
 
@@ -66,15 +67,16 @@ public:
        };
        void 
 #endif
+       void add_audio(int64_t pts, std::vector<float> audio);  // Needs to come before end_frame() of same pts.
        bool begin_frame(GLuint *y_tex, GLuint *cbcr_tex);
-       void end_frame(RefCountedGLsync fence, int64_t pts, std::vector<float> audio, const std::vector<RefCountedFrame> &input_frames);
+       void end_frame(RefCountedGLsync fence, int64_t pts, const std::vector<RefCountedFrame> &input_frames);
 
 private:
        struct storage_task {
                unsigned long long display_order;
-               unsigned long long encode_order;
                int frame_type;
                std::vector<float> audio;
+               int64_t pts, dts;
        };
 
        void copy_thread_func();
@@ -101,15 +103,14 @@ private:
        struct PendingFrame {
                RefCountedGLsync fence;
                std::vector<RefCountedFrame> input_frames;
+               int64_t pts;
        };
        std::map<int, PendingFrame> pending_video_frames;  // under frame_queue_mutex
-       std::map<int, std::vector<float>> pending_audio_frames;  // under frame_queue_mutex
-       std::map<int, int64_t> timestamps;  // under frame_queue_mutex
+       std::map<int64_t, std::vector<float>> pending_audio_frames;  // under frame_queue_mutex
        QSurface *surface;
 
-       AVFormatContext *avctx;
-       AVStream *avstream_video;
-       AVStream *avstream_audio;
+       AVCodecContext *context_audio;
+       HTTPD *httpd;
 };
 
 #endif