Make the API for begin_frame()/end_frame() in VideoEncoder a bit more sensible.

[nageru] / video_encoder.h

diff --git a/video_encoder.h b/video_encoder.h
index fd16ac82f66584cc1f5a76eb783bf954b3a056d9..368037d94fbdfcebcd098047a5acfc3e878dffa4 100644 (file)
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -5,20 +5,29 @@
 #ifndef _VIDEO_ENCODER_H
 #define _VIDEO_ENCODER_H
 
+#include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <atomic>
 #include <memory>
-#include <set>
+#include <mutex>
 #include <string>
 #include <vector>
 
-#include "audio_encoder.h"
-#include "mux.h"
-#include "ref_counted_frame.h"
+extern "C" {
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+}
+
 #include "ref_counted_gl_sync.h"
 
+class AudioEncoder;
+class DiskSpaceEstimator;
 class HTTPD;
+class Mux;
 class QSurface;
 class QuickSyncEncoder;
+class RefCountedFrame;
 class X264Encoder;
 
 namespace movit {
@@ -27,12 +36,22 @@ class ResourcePool;
 
 class VideoEncoder {
 public:
-       VideoEncoder(movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd);
+       VideoEncoder(movit::ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd, DiskSpaceEstimator *disk_space_estimator);
        ~VideoEncoder();
 
        void add_audio(int64_t pts, std::vector<float> audio);
-       bool begin_frame(GLuint *y_tex, GLuint *cbcr_tex);
-       RefCountedGLsync end_frame(int64_t pts, int64_t duration, const std::vector<RefCountedFrame> &input_frames);
+
+       // Allocate a frame to render into. The returned two textures
+       // are yours to render into (build them into an FBO).
+       // Call end_frame() when you're done.
+       bool begin_frame(int64_t pts, int64_t duration, const std::vector<RefCountedFrame> &input_frames, GLuint *y_tex, GLuint *cbcr_tex);
+
+       // Call after you are done rendering into the frame; at this point,
+       // y_tex and cbcr_tex will be assumed done, and handed over to the
+       // encoder. The returned fence is purely a convenience; you do not
+       // need to use it for anything, but it's useful if you wanted to set
+       // one anyway.
+       RefCountedGLsync end_frame();
 
        // Does a cut of the disk stream immediately ("frame" is used for the filename only).
        void do_cut(int frame);
@@ -52,6 +71,9 @@ private:
        std::string va_display;
        int width, height;
        HTTPD *httpd;
+       DiskSpaceEstimator *disk_space_estimator;
+
+       bool seen_sync_markers = false;
 
        std::unique_ptr<Mux> stream_mux;  // To HTTP.
        std::unique_ptr<AudioEncoder> stream_audio_encoder;