X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.h;h=ec49fb71dde19f801b5a4f95f106c1cdc8089a04;hb=02083dca89292d6ba95642cf8957f1cee8826313;hp=5662f05183608e061383fbe6633a2c9185ab696a;hpb=bc7862c72514f91de51c547b2efe26c90b9631f9;p=nageru diff --git a/h264encode.h b/h264encode.h index 5662f05..ec49fb7 100644 --- a/h264encode.h +++ b/h264encode.h @@ -39,7 +39,7 @@ extern "C" { #include #include -#include "bmusb.h" +#include "bmusb/bmusb.h" #include "context.h" #include "pbo_frame_allocator.h" #include "ref_counted_frame.h" @@ -66,8 +66,9 @@ public: }; void #endif + void add_audio(int64_t pts, std::vector 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 audio, const std::vector &input_frames); + void end_frame(RefCountedGLsync fence, int64_t pts, const std::vector &input_frames); private: struct storage_task { @@ -103,7 +104,7 @@ private: std::vector input_frames; }; std::map pending_video_frames; // under frame_queue_mutex - std::map> pending_audio_frames; // under frame_queue_mutex + std::map> pending_audio_frames; // under frame_queue_mutex std::map timestamps; // under frame_queue_mutex QSurface *surface;