X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=video_encoder.cpp;h=dfbf565437d5dcfc311f84c7245eaa06eaee68be;hb=9932a195e442b67ba95bb1377f29aac27f68eb0e;hp=96d493252a02e1946363d552bf9908326803b7ee;hpb=3be00c8dd8b841cecc44f57234b9fc2d3a94cb45;p=nageru diff --git a/video_encoder.cpp b/video_encoder.cpp index 96d4932..dfbf565 100644 --- a/video_encoder.cpp +++ b/video_encoder.cpp @@ -35,8 +35,8 @@ string generate_local_dump_filename(int frame) } // namespace -VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd) - : resource_pool(resource_pool), surface(surface), va_display(va_display), width(width), height(height), httpd(httpd) +VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const std::string &va_display, int width, int height, HTTPD *httpd, DiskSpaceEstimator *disk_space_estimator) + : resource_pool(resource_pool), surface(surface), va_display(va_display), width(width), height(height), httpd(httpd), disk_space_estimator(disk_space_estimator) { oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr); assert(oformat != nullptr); @@ -50,41 +50,74 @@ VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const } string filename = generate_local_dump_filename(/*frame=*/0); - quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, stream_audio_encoder.get(), x264_encoder.get())); + quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, x264_encoder.get(), disk_space_estimator)); open_output_stream(); stream_audio_encoder->add_mux(stream_mux.get()); quicksync_encoder->set_stream_mux(stream_mux.get()); - x264_encoder->set_mux(stream_mux.get()); + if (global_flags.x264_video_to_http) { + x264_encoder->set_mux(stream_mux.get()); + } } VideoEncoder::~VideoEncoder() { quicksync_encoder.reset(nullptr); - close_output_stream(); + while (quicksync_encoders_in_shutdown.load() > 0) { + usleep(10000); + } } void VideoEncoder::do_cut(int frame) { string filename = generate_local_dump_filename(frame); printf("Starting new recording: %s\n", filename.c_str()); - quicksync_encoder->shutdown(); - quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, stream_audio_encoder.get(), x264_encoder.get())); + + // Do the shutdown of the old encoder in a separate thread, since it can + // take some time (it needs to wait for all the frames in the queue to be + // done encoding, for one) and we are running on the main mixer thread. + // However, since this means both encoders could be sending packets at + // the same time, it means pts could come out of order to the stream mux, + // and we need to plug it until the shutdown is complete. + stream_mux->plug(); + lock_guard lock(qs_mu); + QuickSyncEncoder *old_encoder = quicksync_encoder.release(); // When we go C++14, we can use move capture instead. + thread([old_encoder, this]{ + old_encoder->shutdown(); + stream_mux->unplug(); + + // We cannot delete the encoder here, as this thread has no OpenGL context. + // We'll deal with it in begin_frame(). + lock_guard lock(qs_mu); + qs_needing_cleanup.emplace_back(old_encoder); + }).detach(); + + quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, x264_encoder.get(), disk_space_estimator)); quicksync_encoder->set_stream_mux(stream_mux.get()); } +void VideoEncoder::change_x264_bitrate(unsigned rate_kbit) +{ + x264_encoder->change_bitrate(rate_kbit); +} + void VideoEncoder::add_audio(int64_t pts, std::vector audio) { + lock_guard lock(qs_mu); quicksync_encoder->add_audio(pts, audio); + stream_audio_encoder->encode_audio(audio, pts + quicksync_encoder->global_delay()); } bool VideoEncoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) { + lock_guard lock(qs_mu); + qs_needing_cleanup.clear(); // Since we have an OpenGL context here, and are called regularly. return quicksync_encoder->begin_frame(y_tex, cbcr_tex); } RefCountedGLsync VideoEncoder::end_frame(int64_t pts, int64_t duration, const std::vector &input_frames) { + lock_guard lock(qs_mu); return quicksync_encoder->end_frame(pts, duration, input_frames); } @@ -94,7 +127,9 @@ void VideoEncoder::open_output_stream() avctx->oformat = oformat; uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE); - avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, &VideoEncoder::write_packet_thunk, nullptr); + avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, nullptr, nullptr); + avctx->pb->write_data_type = &VideoEncoder::write_packet2_thunk; + avctx->pb->ignore_boundary_point = 1; Mux::Codec video_codec; if (global_flags.uncompressed_video_to_http) { @@ -111,31 +146,23 @@ void VideoEncoder::open_output_stream() } int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE; - stream_mux_writing_header = true; - stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_ctx(), time_base, this)); - stream_mux_writing_header = false; - httpd->set_header(stream_mux_header); - stream_mux_header.clear(); -} - -void VideoEncoder::close_output_stream() -{ - stream_mux.reset(); + stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), time_base, + /*write_callback=*/nullptr)); } -int VideoEncoder::write_packet_thunk(void *opaque, uint8_t *buf, int buf_size) +int VideoEncoder::write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time) { VideoEncoder *video_encoder = (VideoEncoder *)opaque; - return video_encoder->write_packet(buf, buf_size); + return video_encoder->write_packet2(buf, buf_size, type, time); } -int VideoEncoder::write_packet(uint8_t *buf, int buf_size) +int VideoEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time) { - if (stream_mux_writing_header) { + if (type == AVIO_DATA_MARKER_HEADER) { stream_mux_header.append((char *)buf, buf_size); + httpd->set_header(stream_mux_header); } else { - httpd->add_data((char *)buf, buf_size, stream_mux_writing_keyframes); - stream_mux_writing_keyframes = false; + httpd->add_data((char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT); } return buf_size; }