diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c9dceec..6a5d1958 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,7 +340,17 @@ if(ENABLE_FFMPEG) endif() endif() - if(AVUTIL_FOUND AND AVCODEC_FOUND AND SWSCALE_FOUND AND SWRESAMPLE_FOUND) + if(NOT AVFILTER_FOUND) + find_package(AVFILTER QUIET) + if(AVFILTER_FOUND) + include_directories(SYSTEM ${AVFILTER_INCLUDE_DIR}) + update_cached_list(MK_LINK_LIBRARIES ${AVFILTER_LIBRARIES}) + message(STATUS "found library: ${AVFILTER_LIBRARIES}") + endif() + endif() + + + if(AVUTIL_FOUND AND AVCODEC_FOUND AND SWSCALE_FOUND AND SWRESAMPLE_FOUND AND AVFILTER_FOUND) update_cached_list(MK_COMPILE_DEFINITIONS ENABLE_FFMPEG) update_cached_list(MK_LINK_LIBRARIES ${CMAKE_DL_LIBS}) else() @@ -569,7 +579,9 @@ endif () file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/www" DESTINATION ${EXECUTABLE_OUTPUT_PATH}) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/config.ini" DESTINATION ${EXECUTABLE_OUTPUT_PATH}) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/default.pem" DESTINATION ${EXECUTABLE_OUTPUT_PATH}) - +if (ENABLE_FFMPEG) + file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/DejaVuSans.ttf" DESTINATION ${EXECUTABLE_OUTPUT_PATH}) +endif () # 拷贝VideoStack 无视频流时默认填充的背景图片 # Copy the default background image used by VideoStack when there is no video stream if (ENABLE_VIDEOSTACK AND ENABLE_FFMPEG AND ENABLE_X264) diff --git a/DejaVuSans.ttf b/DejaVuSans.ttf new file mode 100644 index 00000000..2fbbe69e Binary files /dev/null and b/DejaVuSans.ttf differ diff --git a/src/Codec/Transcode.cpp b/src/Codec/Transcode.cpp index 5e143599..e3c09cce 100644 --- a/src/Codec/Transcode.cpp +++ b/src/Codec/Transcode.cpp @@ -231,10 +231,6 @@ FFmpegFrame::FFmpegFrame(std::shared_ptr frame) { } FFmpegFrame::~FFmpegFrame() { - if (_data) { - delete[] _data; - _data = nullptr; - } } AVFrame *FFmpegFrame::get() const { @@ -242,9 +238,9 @@ AVFrame *FFmpegFrame::get() const { } void FFmpegFrame::fillPicture(AVPixelFormat target_format, int target_width, int target_height) { - assert(_data == nullptr); - _data = new char[av_image_get_buffer_size(target_format, target_width, target_height, 32)]; - av_image_fill_arrays(_frame->data, _frame->linesize, (uint8_t *) _data, target_format, target_width, target_height, 32); + auto buffer_size = av_image_get_buffer_size(target_format, target_width, target_height, 32); + _data = std::make_unique(buffer_size); + av_image_fill_arrays(_frame->data, _frame->linesize, (uint8_t *)_data.get(), target_format, target_width, target_height, 32); } int FFmpegFrame::getChannels() const { @@ -256,6 +252,14 @@ int FFmpegFrame::getChannels() const { #endif } +// 资源池复用前调用 +void FFmpegFrame::reset() { + _data.reset(); + if (_frame) { + av_frame_unref(_frame.get()); // 清理AVFrame数据引用 + } +} + /////////////////////////////////////////////////////////////////////////// template @@ -734,6 +738,7 @@ FFmpegFrame::Ptr FFmpegSws::inputFrame(const FFmpegFrame::Ptr &frame, int &ret, } if (_ctx) { auto out = _sws_frame_pool.obtain2(); + out->reset(); // 清理旧数据和帧引用 if (!out->get()->data[0]) { if (data) { av_image_fill_arrays(out->get()->data, out->get()->linesize, data, _target_format, target_width, target_height, 32); @@ -756,45 +761,16 @@ FFmpegFrame::Ptr FFmpegSws::inputFrame(const FFmpegFrame::Ptr &frame, int &ret, return nullptr; } -std::tuple FFmpegUtils::saveFrame(const FFmpegFrame::Ptr &frame, const char *filename, AVPixelFormat fmt) { +std::tuple FFmpegUtils::saveFrame(const FFmpegFrame::Ptr &frame, const char *filename, AVPixelFormat fmt, int w, int h, const char *font_path) { + std::shared_ptr _filter_graph; + AVFilterContext *buffersrc_ctx = nullptr; + AVFilterContext *buffersink_ctx = nullptr; + const AVFilter *buffersrc = nullptr; + const AVFilter *buffersink = nullptr; + // kServerName + const string mark = "ZLMediaKit"; + char drawtext_args1[512]; _StrPrinter ss; - const AVCodec *jpeg_codec = avcodec_find_encoder(fmt == AV_PIX_FMT_YUVJ420P ? AV_CODEC_ID_MJPEG : AV_CODEC_ID_PNG); - std::unique_ptr jpeg_codec_ctx( - jpeg_codec ? avcodec_alloc_context3(jpeg_codec) : nullptr, [](AVCodecContext *ctx) { avcodec_free_context(&ctx); }); - - if (!jpeg_codec_ctx) { - ss << "Could not allocate JPEG/PNG codec context"; - DebugL << ss; - return make_tuple(false, ss.data()); - } - - jpeg_codec_ctx->width = frame->get()->width; - jpeg_codec_ctx->height = frame->get()->height; - jpeg_codec_ctx->pix_fmt = fmt; - jpeg_codec_ctx->time_base = { 1, 1 }; - - auto ret = avcodec_open2(jpeg_codec_ctx.get(), jpeg_codec, NULL); - if (ret < 0) { - ss << "Could not open JPEG/PNG codec, " << ffmpeg_err(ret); - DebugL << ss; - return make_tuple(false, ss.data()); - } - - FFmpegSws sws(fmt, 0, 0); - auto new_frame = sws.inputFrame(frame); - if (!new_frame) { - ss << "Could not scale the frame: " << ffmpeg_err(ret); - DebugL << ss; - return make_tuple(false, ss.data()); - } - - auto pkt = alloc_av_packet(); - ret = avcodec_send_frame(jpeg_codec_ctx.get(), new_frame->get()); - if (ret < 0) { - ss << "Error sending a frame for encoding, " << ffmpeg_err(ret); - DebugL << ss; - return make_tuple(false, ss.data()); - } std::unique_ptr tmp_save_file_jpg(File::create_file(filename, "wb"), [](FILE *fp) { if (fp) { @@ -808,10 +784,104 @@ std::tuple FFmpegUtils::saveFrame(const FFmpegFrame::Ptr &fra return make_tuple(false, ss.data()); } - while (avcodec_receive_packet(jpeg_codec_ctx.get(), pkt.get()) == 0) { - fwrite(pkt.get()->data, pkt.get()->size, 1, tmp_save_file_jpg.get()); + std::string fontfile(""); + if (font_path && File::fileExist(font_path)) { + fontfile = font_path; + } else { + // Fallback to common default + fontfile = exeDir() + "/DejaVuSans.ttf"; + } + + snprintf(drawtext_args1, sizeof(drawtext_args1), "text='%s':fontfile='%s':fontcolor=white@0.1:fontsize=h/50:x=w*0.02:y=h-th-h*0.02", mark.data(), fontfile.c_str()); + + const AVCodec *jpeg_codec = avcodec_find_encoder(fmt == AV_PIX_FMT_YUVJ420P ? AV_CODEC_ID_MJPEG : AV_CODEC_ID_PNG); + std::unique_ptr jpeg_codec_ctx( + jpeg_codec ? avcodec_alloc_context3(jpeg_codec) : nullptr, [](AVCodecContext *ctx) { avcodec_free_context(&ctx); }); + + if (!jpeg_codec_ctx) { + ss << "Could not allocate JPEG/PNG codec context"; + DebugL << ss; + return make_tuple(false, ss.data()); + } + + jpeg_codec_ctx->width = (w > 0 && w < 8192) ? w : frame->get()->width; + jpeg_codec_ctx->height = (h > 0 && h < 4320) ? h : frame->get()->height; + jpeg_codec_ctx->pix_fmt = fmt; + jpeg_codec_ctx->time_base = { 1, 1 }; + + auto ret = avcodec_open2(jpeg_codec_ctx.get(), jpeg_codec, NULL); + if (ret < 0) { + ss << "Could not open JPEG/PNG codec, " << ffmpeg_err(ret); + DebugL << ss; + return make_tuple(false, ss.data()); + } + + FFmpegSws sws(fmt, jpeg_codec_ctx->width, jpeg_codec_ctx->height); + auto new_frame = sws.inputFrame(frame); + if (!new_frame) { + ss << "Could not scale the frame"; + DebugL << ss; + return make_tuple(false, ss.data()); + } + + _filter_graph.reset(avfilter_graph_alloc(), [](AVFilterGraph *ctx) { avfilter_graph_free(&ctx); }); + if (!_filter_graph) { + ss << "avfilter_graph_alloc failed"; + DebugL << ss; + return make_tuple(false, ss.data()); + } + + char args[512]; + snprintf( + args, sizeof(args), "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d", jpeg_codec_ctx->width, jpeg_codec_ctx->height, + jpeg_codec_ctx->pix_fmt, jpeg_codec_ctx->time_base.num, jpeg_codec_ctx->time_base.den, jpeg_codec_ctx->sample_aspect_ratio.num, + jpeg_codec_ctx->sample_aspect_ratio.den); + + buffersrc = avfilter_get_by_name("buffer"); + + if (ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in", args, NULL, _filter_graph.get()) < 0) { + ss << "avfilter_graph_create_filter buffersrc failed: " << ret << " " << ffmpeg_err(ret); + DebugL << ss; + return make_tuple(false, ss.data()); + } + + buffersink = avfilter_get_by_name("buffersink"); + if (ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out", NULL, NULL, _filter_graph.get()) < 0) { + ss << "avfilter_graph_create_filter buffersink failed: " << ret << " " << ffmpeg_err(ret); + return make_tuple(false, ss.data()); + } + + AVFilterContext *drawtext_ctx1 = nullptr; + + const AVFilter *drawtext_filter = avfilter_get_by_name("drawtext"); + if ((ret = avfilter_graph_create_filter(&drawtext_ctx1, drawtext_filter, "drawtext", drawtext_args1, NULL, _filter_graph.get())) < 0) { + ss << "avfilter_graph_create_filter drawtext_filter failed: " << ret << " " << ffmpeg_err(ret); + return make_tuple(false, ss.data()); + } + + if ((ret = avfilter_link(buffersrc_ctx, 0, drawtext_ctx1, 0) < 0 || avfilter_link(drawtext_ctx1, 0, buffersink_ctx, 0))< 0) { + ss << "avfilter_link: " << ret << " " << ffmpeg_err(ret); + return make_tuple(false, ss.data()); + } + + if ((ret = avfilter_graph_config(_filter_graph.get(), NULL)) < 0) { + ss << "avfilter_graph_config failed: " << ret << " " << ffmpeg_err(ret); + return make_tuple(false, ss.data()); + } + + if ((ret = av_buffersrc_add_frame_flags(buffersrc_ctx, new_frame->get(), 0)) < 0) { + ss << "av_buffersink_get_frame failed: " << ret << " " << ffmpeg_err(ret); + return make_tuple(false, ss.data()); + } + + auto pkt = alloc_av_packet(); + while (av_buffersink_get_frame(buffersink_ctx, new_frame->get()) >= 0) { + if (avcodec_send_frame(jpeg_codec_ctx.get(), new_frame->get()) == 0) { + while (avcodec_receive_packet(jpeg_codec_ctx.get(), pkt.get()) == 0) { + fwrite(pkt.get()->data, pkt.get()->size, 1, tmp_save_file_jpg.get()); + } + } } - DebugL << "Screenshot successful: " << filename; return make_tuple(true, ""); } diff --git a/src/Codec/Transcode.h b/src/Codec/Transcode.h index 6b7b212c..240806a2 100644 --- a/src/Codec/Transcode.h +++ b/src/Codec/Transcode.h @@ -27,6 +27,9 @@ extern "C" { #include "libavutil/audio_fifo.h" #include "libavutil/imgutils.h" #include "libavutil/frame.h" +#include "libavfilter/avfilter.h" +#include "libavfilter/buffersink.h" +#include "libavfilter/buffersrc.h" #ifdef __cplusplus } #endif @@ -45,9 +48,10 @@ public: AVFrame *get() const; void fillPicture(AVPixelFormat target_format, int target_width, int target_height); int getChannels() const; + void reset(); private: - char *_data = nullptr; + std::unique_ptr _data; std::shared_ptr _frame; }; @@ -170,9 +174,11 @@ public: * @param frame 解码后的帧 * @param filename 保存文件路径 * @param fmt jpg:AV_PIX_FMT_YUVJ420P，PNG:AV_PIX_FMT_RGB24 + * @param w h (可选)裁剪的图片大小，默认和输入源一致 + * @param font_path (可选), default DejaVuSans.ttf * @return */ - static std::tuple saveFrame(const FFmpegFrame::Ptr &frame, const char *filename, AVPixelFormat fmt = AV_PIX_FMT_YUVJ420P); + static std::tuple saveFrame(const FFmpegFrame::Ptr &frame, const char *filename, AVPixelFormat fmt = AV_PIX_FMT_YUVJ420P, int w = 0, int h = 0, const char *font_path = nullptr); }; }//namespace mediakit