From a9313d3eb914641cbdf8f2426d1fa79b45b55107 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 10 Jan 2016 00:59:41 +0100 Subject: [PATCH] Move H264Encoder into an impl, to avoid header conflicts with Qt. --- h264encode.cpp | 108 +++++++++++++++++++++++++++++++++++++++++++------ h264encode.h | 78 ++++------------------------------- 2 files changed, 102 insertions(+), 84 deletions(-) diff --git a/h264encode.cpp b/h264encode.cpp index d0da39d..74bf947 100644 --- a/h264encode.cpp +++ b/h264encode.cpp @@ -6,11 +6,14 @@ #include #include #include +extern "C" { #include +#include #include #include #include #include +} #include #include #include @@ -21,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -149,6 +153,60 @@ typedef struct __bitstream bitstream; using namespace std; +class H264EncoderImpl { +public: + H264EncoderImpl(QSurface *surface, int width, int height, HTTPD *httpd); + ~H264EncoderImpl(); + 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, const std::vector &input_frames); + +private: + struct storage_task { + unsigned long long display_order; + int frame_type; + std::vector audio; + int64_t pts, dts; + }; + struct PendingFrame { + RefCountedGLsync fence; + std::vector input_frames; + int64_t pts; + }; + + void encode_thread_func(); + void encode_remaining_frames_as_p(int encoding_frame_num, int gop_start_display_frame_num, int64_t last_dts); + void encode_frame(PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num, + int frame_type, int64_t pts, int64_t dts); + void storage_task_thread(); + void storage_task_enqueue(storage_task task); + void save_codeddata(storage_task task); + + std::thread encode_thread, storage_thread; + + std::mutex storage_task_queue_mutex; + std::condition_variable storage_task_queue_changed; + int srcsurface_status[SURFACE_NUM]; // protected by storage_task_queue_mutex + std::queue storage_task_queue; // protected by storage_task_queue_mutex + bool storage_thread_should_quit = false; // protected by storage_task_queue_mutex + + std::mutex frame_queue_mutex; + std::condition_variable frame_queue_nonempty; + bool encode_thread_should_quit = false; // under frame_queue_mutex + + //int frame_width, frame_height; + //int ; + int current_storage_frame; + + std::map pending_video_frames; // under frame_queue_mutex + std::map> pending_audio_frames; // under frame_queue_mutex + QSurface *surface; + + AVCodecContext *context_audio; + HTTPD *httpd; +}; + + // Supposedly vaRenderPicture() is supposed to destroy the buffer implicitly, // but if we don't delete it here, we get leaks. The GStreamer implementation // does the same. @@ -1568,7 +1626,7 @@ static int render_slice(int encoding_frame_num, int display_frame_num, int gop_s -void H264Encoder::save_codeddata(storage_task task) +void H264EncoderImpl::save_codeddata(storage_task task) { VACodedBufferSegment *buf_list = NULL; VAStatus va_status; @@ -1679,7 +1737,7 @@ void H264Encoder::save_codeddata(storage_task task) // this is weird. but it seems to put a new frame onto the queue -void H264Encoder::storage_task_enqueue(storage_task task) +void H264EncoderImpl::storage_task_enqueue(storage_task task) { unique_lock lock(storage_task_queue_mutex); storage_task_queue.push(move(task)); @@ -1687,7 +1745,7 @@ void H264Encoder::storage_task_enqueue(storage_task task) storage_task_queue_changed.notify_all(); } -void H264Encoder::storage_task_thread() +void H264EncoderImpl::storage_task_thread() { for ( ;; ) { storage_task current; @@ -1741,7 +1799,7 @@ static int deinit_va() } -H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) +H264EncoderImpl::H264EncoderImpl(QSurface *surface, int width, int height, HTTPD *httpd) : current_storage_frame(0), surface(surface), httpd(httpd) { AVCodec *codec_audio = avcodec_find_encoder(AUDIO_OUTPUT_CODEC); @@ -1775,7 +1833,7 @@ H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) memset(&pic_param, 0, sizeof(pic_param)); memset(&slice_param, 0, sizeof(slice_param)); - storage_thread = thread(&H264Encoder::storage_task_thread, this); + storage_thread = thread(&H264EncoderImpl::storage_task_thread, this); encode_thread = thread([this]{ //SDL_GL_MakeCurrent(window, context); @@ -1790,7 +1848,7 @@ H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) }); } -H264Encoder::~H264Encoder() +H264EncoderImpl::~H264EncoderImpl() { { unique_lock lock(frame_queue_mutex); @@ -1810,7 +1868,7 @@ H264Encoder::~H264Encoder() deinit_va(); } -bool H264Encoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) +bool H264EncoderImpl::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) { { // Wait until this frame slot is done encoding. @@ -1874,7 +1932,7 @@ bool H264Encoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) return true; } -void H264Encoder::add_audio(int64_t pts, vector audio) +void H264EncoderImpl::add_audio(int64_t pts, vector audio) { { unique_lock lock(frame_queue_mutex); @@ -1883,7 +1941,7 @@ void H264Encoder::add_audio(int64_t pts, vector audio) frame_queue_nonempty.notify_all(); } -void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const vector &input_frames) +void H264EncoderImpl::end_frame(RefCountedGLsync fence, int64_t pts, const vector &input_frames) { { unique_lock lock(frame_queue_mutex); @@ -1893,7 +1951,7 @@ void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const vector destructor needs to know the impl. +H264Encoder::~H264Encoder() {} + +void H264Encoder::add_audio(int64_t pts, std::vector audio) +{ + impl->add_audio(pts, audio); +} + +bool H264Encoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) +{ + return impl->begin_frame(y_tex, cbcr_tex); +} + +void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const std::vector &input_frames) +{ + impl->end_frame(fence, pts, input_frames); +} + +// Real class. diff --git a/h264encode.h b/h264encode.h index 53c6c56..caf33af 100644 --- a/h264encode.h +++ b/h264encode.h @@ -26,97 +26,33 @@ #ifndef _H264ENCODE_H #define _H264ENCODE_H -extern "C" { -#include -#include -} #include -#include #include #include -#include -#include #include -#include -#include -#include #include -#include "bmusb/bmusb.h" -#include "context.h" -#include "pbo_frame_allocator.h" #include "ref_counted_frame.h" #include "ref_counted_gl_sync.h" +class H264EncoderImpl; class HTTPD; class QSurface; -#define SURFACE_NUM 16 /* 16 surfaces for source YUV */ - +// This is just a pimpl, because including anything X11-related in a .h file +// tends to trip up Qt. All the real logic is in H264EncoderImpl, defined in the +// .cpp file. class H264Encoder { public: - H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd); - ~H264Encoder(); - //void add_frame(FrameAllocator::Frame frame, GLsync fence); - -#if 0 - struct Frame { - public: - GLuint fbo; - GLuint y_tex, cbcr_tex; + H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd); + ~H264Encoder(); - private: - //int surface_subnum; - }; - 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, const std::vector &input_frames); private: - struct storage_task { - unsigned long long display_order; - int frame_type; - std::vector audio; - int64_t pts, dts; - }; - struct PendingFrame { - RefCountedGLsync fence; - std::vector input_frames; - int64_t pts; - }; - - void encode_thread_func(); - void encode_remaining_frames_as_p(int encoding_frame_num, int gop_start_display_frame_num, int64_t last_dts); - void encode_frame(PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num, - int frame_type, int64_t pts, int64_t dts); - void storage_task_thread(); - void storage_task_enqueue(storage_task task); - void save_codeddata(storage_task task); - - std::thread encode_thread, storage_thread; - - std::mutex storage_task_queue_mutex; - std::condition_variable storage_task_queue_changed; - int srcsurface_status[SURFACE_NUM]; // protected by storage_task_queue_mutex - std::queue storage_task_queue; // protected by storage_task_queue_mutex - bool storage_thread_should_quit = false; // protected by storage_task_queue_mutex - - std::mutex frame_queue_mutex; - std::condition_variable frame_queue_nonempty; - bool encode_thread_should_quit = false; // under frame_queue_mutex - - //int frame_width, frame_height; - //int ; - int current_storage_frame; - - std::map pending_video_frames; // under frame_queue_mutex - std::map> pending_audio_frames; // under frame_queue_mutex - QSurface *surface; - - AVCodecContext *context_audio; - HTTPD *httpd; + std::unique_ptr impl; }; #endif -- 2.39.2