X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.h;h=eebabbd95c8d52aa25df078fbddd0f83f448ff6a;hb=bd5b2de9a277b87c75d71d94bd8c5095ab14ecf7;hp=caa6586f6a5b57d5fe63958e41da5506ba92ce88;hpb=e066f18188fde1e6bd0b698c89427119cbffaaa3;p=nageru diff --git a/quicksync_encoder.h b/quicksync_encoder.h index caa6586..eebabbd 100644 --- a/quicksync_encoder.h +++ b/quicksync_encoder.h @@ -1,5 +1,10 @@ -// Hardware H.264 encoding via VAAPI. Heavily modified based on example -// code by Intel. Intel's original copyright and license is reproduced below: +// Hardware H.264 encoding via VAAPI. Also orchestrates the H.264 encoding +// in general; this is unfortunate, and probably needs a cleanup. In particular, +// even if you don't actually use Quick Sync for anything, this class +// (or actually, QuickSyncEncoderImpl) still takes on a pretty central role. +// +// Heavily modified based on example code by Intel. Intel's original copyright +// and license is reproduced below: // // Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved. // @@ -27,6 +32,7 @@ #define _H264ENCODE_H #include +#include #include #include #include @@ -60,9 +66,10 @@ public: void set_stream_mux(Mux *mux); // Does not take ownership. Must be called unless x264 is used for the stream. void add_audio(int64_t pts, std::vector audio); - bool begin_frame(int64_t pts, int64_t duration, const std::vector &input_frames, GLuint *y_tex, GLuint *cbcr_tex); + bool begin_frame(int64_t pts, int64_t duration, movit::YCbCrLumaCoefficients ycbcr_coefficients, const std::vector &input_frames, GLuint *y_tex, GLuint *cbcr_tex); RefCountedGLsync end_frame(); void shutdown(); // Blocking. Does not require an OpenGL context. + void close_file(); // Does not require an OpenGL context. Must be run after shutdown. void release_gl_resources(); // Requires an OpenGL context. Must be run after shutdown. int64_t global_delay() const; // So we never get negative dts.