Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-28 21:52:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正libavfilter相关的编译问题和transcode内的错误 (#4587)

Browse Source 
1. 最近提交的libavfilter相关的代码，没有充分测试cmake编译问题，提交了修正。
2. transcode内存在一个c++11的兼容性问题和运算符优先级问题，提交了修正。
This commit is contained in:
Robo
2025-12-09 15:34:15 +08:00
committed by GitHub
parent 1da300cf3e
commit 5f0edeed6a
4 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Codec/Transcode.cpp
View File

@@ -239,7 +239,7 @@ AVFrame *FFmpegFrame::get() const {
void FFmpegFrame::fillPicture(AVPixelFormat target_format, int target_width, int target_height) {
auto buffer_size = av_image_get_buffer_size(target_format, target_width, target_height, 32);
_data = std::make_unique<char[]>(buffer_size);
_data = std::unique_ptr<char[]>(new char[buffer_size]);
av_image_fill_arrays(_frame->data, _frame->linesize, (uint8_t *)_data.get(), target_format, target_width, target_height, 32);
}
@@ -839,14 +839,14 @@ std::tuple<bool, std::string> FFmpegUtils::saveFrame(const FFmpegFrame::Ptr &fra
buffersrc = avfilter_get_by_name("buffer");
if (ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in", args, NULL, _filter_graph.get()) < 0) {
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<bool, std::string>(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) {
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<bool, std::string>(false, ss.data());
}