X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=video_encoder.h;h=21595a380c992b7df76c0d3531e0cee72b5b2cfe;hp=acb8340fdee333c16b86f9b7e690e7c311afecea;hb=refs%2Fheads%2Fffmpeg-audio-only;hpb=e8a66daac69cf6f243e03489aec8b9321d59e169

diff --git a/video_encoder.h b/video_encoder.h
index acb8340..21595a3 100644
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -6,6 +6,7 @@
 #define _VIDEO_ENCODER_H
 
 #include <epoxy/gl.h>
+#include <movit/image_format.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <atomic>
@@ -19,6 +20,7 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
+#include "mux.h"
 #include "ref_counted_gl_sync.h"
 
 class AudioEncoder;
@@ -40,8 +42,31 @@ public:
 	~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);
+
+	bool is_zerocopy() const;
+
+	// 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.
+	//
+	// The semantics of y_tex and cbcr_tex depend on is_zerocopy():
+	//
+	//   - If false, the are input parameters, ie., the caller
+	//     allocates textures. (The contents are not read before
+	//     end_frame() is called.)
+	//   - If true, they are output parameters, ie., VideoEncoder
+	//     allocates textures and borrow them to you for rendering.
+	//     In this case, after end_frame(), you are no longer allowed
+	//     to use the textures; they are torn down and given to the
+	//     H.264 encoder.
+	bool begin_frame(int64_t pts, int64_t duration, movit::YCbCrLumaCoefficients ycbcr_coefficients, 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);
@@ -54,8 +79,8 @@ private:
 	int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
 
 	AVOutputFormat *oformat;
-	std::mutex qs_mu;
-	std::unique_ptr<QuickSyncEncoder> quicksync_encoder;  // Under <qs_mu>.
+	mutable std::mutex qs_mu, qs_audio_mu;
+	std::unique_ptr<QuickSyncEncoder> quicksync_encoder;  // Under <qs_mu> _and_ <qs_audio_mu>.
 	movit::ResourcePool *resource_pool;
 	QSurface *surface;
 	std::string va_display;
@@ -70,8 +95,10 @@ private:
 	std::unique_ptr<X264Encoder> x264_encoder;  // nullptr if not using x264.
 
 	std::string stream_mux_header;
+	MuxMetrics stream_mux_metrics;
 
 	std::atomic<int> quicksync_encoders_in_shutdown{0};
+	std::atomic<int> overriding_bitrate{0};
 
 	// Encoders that are shutdown, but need to call release_gl_resources()
 	// (or be deleted) from some thread with an OpenGL context.