X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.cpp;h=74bf947f84b06734eb0ffdff475fe6b3f496add4;hb=a9313d3eb914641cbdf8f2426d1fa79b45b55107;hp=641cf5039bb2db9214d15e9277120a43f3e38a61;hpb=6a341a95305e6ed4187d858e80f03ed476919dff;p=nageru diff --git a/h264encode.cpp b/h264encode.cpp index 641cf50..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; @@ -1610,8 +1668,8 @@ void H264Encoder::save_codeddata(storage_task task) vector audio; { unique_lock lock(frame_queue_mutex); - frame_queue_nonempty.wait(lock, [this]{ return copy_thread_should_quit || !pending_audio_frames.empty(); }); - if (copy_thread_should_quit && pending_audio_frames.empty()) return; + frame_queue_nonempty.wait(lock, [this]{ return storage_thread_should_quit || !pending_audio_frames.empty(); }); + if (storage_thread_should_quit && pending_audio_frames.empty()) return; auto it = pending_audio_frames.begin(); if (it->first > task.pts) break; audio_pts = it->first; @@ -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; @@ -1695,7 +1753,7 @@ void H264Encoder::storage_task_thread() // wait until there's an encoded frame unique_lock lock(storage_task_queue_mutex); storage_task_queue_changed.wait(lock, [this]{ return storage_thread_should_quit || !storage_task_queue.empty(); }); - if (storage_thread_should_quit) return; + if (storage_thread_should_quit && storage_task_queue.empty()) return; current = move(storage_task_queue.front()); storage_task_queue.pop(); } @@ -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,9 +1833,9 @@ 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); - copy_thread = thread([this]{ + encode_thread = thread([this]{ //SDL_GL_MakeCurrent(window, context); QOpenGLContext *context = create_context(this->surface); eglBindAPI(EGL_OPENGL_API); @@ -1786,21 +1844,22 @@ H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) eglGetError()); exit(1); } - copy_thread_func(); + encode_thread_func(); }); } -H264Encoder::~H264Encoder() +H264EncoderImpl::~H264EncoderImpl() { { unique_lock lock(frame_queue_mutex); - copy_thread_should_quit = true; + encode_thread_should_quit = true; frame_queue_nonempty.notify_all(); } - copy_thread.join(); + encode_thread.join(); { unique_lock lock(storage_task_queue_mutex); storage_thread_should_quit = true; + frame_queue_nonempty.notify_all(); storage_task_queue_changed.notify_all(); } storage_thread.join(); @@ -1809,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. @@ -1873,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); @@ -1882,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); @@ -1892,7 +1951,7 @@ void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const vector lock(frame_queue_mutex); frame_queue_nonempty.wait(lock, [this, display_frame_num]{ - return copy_thread_should_quit || pending_video_frames.count(display_frame_num) != 0; + return encode_thread_should_quit || pending_video_frames.count(display_frame_num) != 0; }); - if (copy_thread_should_quit) { + if (encode_thread_should_quit && pending_video_frames.count(display_frame_num) == 0) { + // We have queued frames that were supposed to be B-frames, + // but will be no P-frame to encode them against. Encode them all + // as P-frames instead. Note that this happens under the mutex, + // but nobody else uses it at this point, since we're shutting down, + // so there's no contention. + encode_remaining_frames_as_p(encoding_frame_num, gop_start_display_frame_num, last_dts); return; } else { frame = move(pending_video_frames[display_frame_num]); @@ -1935,8 +2000,25 @@ void H264Encoder::copy_thread_func() } } -void H264Encoder::encode_frame(H264Encoder::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 H264EncoderImpl::encode_remaining_frames_as_p(int encoding_frame_num, int gop_start_display_frame_num, int64_t last_dts) +{ + if (pending_video_frames.empty()) { + return; + } + + for (auto &pending_frame : pending_video_frames) { + int display_frame_num = pending_frame.first; + assert(display_frame_num > 0); + PendingFrame frame = move(pending_frame.second); + int64_t dts = last_dts + (TIMEBASE / MAX_FPS); + printf("Finalizing encode: Encoding leftover frame %d as P-frame instead of B-frame.\n", display_frame_num); + encode_frame(frame, encoding_frame_num++, display_frame_num, gop_start_display_frame_num, FRAME_P, frame.pts, dts); + last_dts = dts; + } +} + +void H264EncoderImpl::encode_frame(H264EncoderImpl::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) { // Wait for the GPU to be done with the frame. glClientWaitSync(frame.fence.get(), 0, 0); @@ -1986,3 +2068,27 @@ void H264Encoder::encode_frame(H264Encoder::PendingFrame frame, int encoding_fra update_ReferenceFrames(frame_type); } + +// Proxy object. +H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) + : impl(new H264EncoderImpl(surface, width, height, httpd)) {} + +// Must be defined here because unique_ptr<> 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.