fix the incompatibility issue of ffmpeg 5.0 and 5.1 #136
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -36,6 +36,7 @@ extern "C" { | |||
| #include <libavutil/bprint.h> | |||
| #include <libswscale/swscale.h> | |||
| #include <libavutil/opt.h> | |||
| #include <libavutil/channel_layout.h> | |||
There was a problem hiding this comment.
av_get_default_channel_layout was declared in <libavutil/channel_layout.h>
when the ffmpeg version is 5.x.x, the ffmpeg header file used by BMF does not include <libavutil/channel_layout.h>
and when the ffmpeg version is 4.x.x, there is no such problem
There was a problem hiding this comment.
there is no problem for me using 5.1.2 without this header
There was a problem hiding this comment.
please try other version. like 5.0.3 or 5.1.6
| @@ -1478,7 +1478,11 @@ int CFFEncoder::init_codec(int idx, AVFrame *frame) { | |||
| } | |||
| } | |||
|
|
|||
| out_stream->codec->time_base = enc_ctxs_[idx]->time_base; | |||
There was a problem hiding this comment.
I think this line of code is not used, can it be deleted?
There was a problem hiding this comment.
maybe this is for future consideration, waiting for maintainer's opinion~
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR aim to fix #131 issue that
‘av_get_default_channel_layout’ was not declaredand‘AVStream’ {aka ‘struct AVStream’} has no member named ‘codec’if we compile bmf with ffmpeg 5.x.xKey change
The following is the compilation error log
In file included from /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/simple_filter_graph.h:24, from /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/ffmpeg_helper.h:24, from /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/test/test_audio_frame.cpp:19: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h: In member function ‘int bmf_sdk::FilterGraph::config_graph(std::string&, std::map<int, bmf_sdk::FilterConfig>&, std::map<int, bmf_sdk::FilterConfig>&)’: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h:270:29: error: ‘av_get_default_channel_layout’ was not declared in this scope; did you mean ‘av_opt_set_channel_layout’? 270 | av_get_default_channel_layout( | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | av_opt_set_channel_layout In file included from /home/jack/Documents/workspace/fork/bmf/bmf/c_modules/include/ffmpeg_decoder.h:19, from /home/jack/Documents/workspace/fork/bmf/bmf/c_modules/src/ffmpeg_decoder.cpp:16: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h: In member function ‘int bmf_sdk::FilterGraph::config_graph(std::string&, std::map<int, bmf_sdk::FilterConfig>&, std::map<int, bmf_sdk::FilterConfig>&)’: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h:270:29: error: ‘av_get_default_channel_layout’ was not declared in this scope; did you mean ‘av_opt_set_channel_layout’? 270 | av_get_default_channel_layout( | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | av_opt_set_channel_layout In file included from /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/ffmpeg_helper.h:27, from /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/test/test_audio_frame.cpp:19: /home/jack/Documents/workspace/fork/bmf/bmf/hml/include/hmp/ffmpeg/ff_helper.h: In function ‘AVFrame* hmp::ffmpeg::to_audio_frame(const TensorList&, const AVFrame*, bool)’: /home/jack/Documents/workspace/fork/bmf/bmf/hml/include/hmp/ffmpeg/ff_helper.h:378:26: error: ‘av_get_channel_layout_nb_channels’ was not declared in this scope 378 | : av_get_channel_layout_nb_channels(avf->channel_layout); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /home/jack/Documents/workspace/fork/bmf/bmf/hml/third_party/gtest/googletest/include/gtest/gtest.h:387, from /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/test/test_audio_frame.cpp:21: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/test/test_audio_frame.cpp: In member function ‘virtual void audio_frame_ffmpeg_interop_Test::TestBody()’: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/test/test_audio_frame.cpp:86:41: error: ‘AV_CH_LAYOUT_STEREO’ was not declared in this scope 86 | EXPECT_EQ(aaf0->channel_layout, AV_CH_LAYOUT_STEREO); | ^~~~~~~~~~~~~~~~~~~ /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/test/test_audio_frame.cpp:123:41: error: ‘AV_CH_LAYOUT_STEREO’ was not declared in this scope 123 | EXPECT_EQ(aaf0->channel_layout, AV_CH_LAYOUT_STEREO); | ^~~~~~~~~~~~~~~~~~~ /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/test/test_audio_frame.cpp:156:41: error: ‘AV_CH_LAYOUT_HEXADECAGONAL’ was not declared in this scope 156 | EXPECT_EQ(aaf0->channel_layout, AV_CH_LAYOUT_HEXADECAGONAL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ /home/jack/Documents/workspace/fork/bmf/bmf/engine/c_engine/src/loader/py_module_loader.cpp:178:7: warning: ‘bmf_sdk::PyModuleFactory’ declared with greater visibility than the type of its field ‘bmf_sdk::PyModuleFactory::factory_’ [-Wattributes] 178 | class PyModuleFactory : public ModuleFactoryI { | ^~~~~~~~~~~~~~~ [ 61%] Linking CXX shared library ../../../output/bmf/lib/_hmp.cpython-39-x86_64-linux-gnu.so make[2]: *** [bmf/sdk/CMakeFiles/test_bmf_module_sdk.dir/build.make:76: bmf/sdk/CMakeFiles/test_bmf_module_sdk.dir/cpp_sdk/test/test_audio_frame.cpp.o] Error 1 make[1]: *** [CMakeFiles/Makefile2:979: bmf/sdk/CMakeFiles/test_bmf_module_sdk.dir/all] Error 2 make[1]: *** Waiting for unfinished jobs.... [ 62%] Building CXX object bmf/engine/c_engine/CMakeFiles/engine.dir/__/connector/src/builder.cpp.o [ 62%] Linking CXX shared library ../../../output/bmf/lib/libcvtcolor.so [ 62%] Built target cvtcolor [ 62%] Building CXX object bmf/engine/c_engine/CMakeFiles/engine.dir/__/connector/src/connector.cpp.o [ 62%] Linking CXX shared library ../../../output/bmf/lib/libcopy_module.so [ 62%] Linking CXX shared library ../../output/bmf/cpp_modules/Module_clock/libclock.so [ 62%] Built target copy_module [ 62%] Building CXX object bmf/c_modules/CMakeFiles/builtin_modules.dir/src/ffmpeg_encoder.cpp.o [ 62%] Linking CXX shared library ../../../output/bmf/lib/libbmf_go_loader.so [ 62%] Built target clock [ 63%] Building CXX object bmf/engine/c_engine/CMakeFiles/engine.dir/__/connector/src/connector_capi.cpp.o [ 63%] Built target bmf_go_loader [ 64%] Building CXX object bmf/c_modules/CMakeFiles/builtin_modules.dir/src/ffmpeg_filter.cpp.o [ 64%] Built target _hmp [ 64%] Building CXX object bmf/engine/c_engine/CMakeFiles/engine.dir/src/callback_layer.cpp.o make[2]: *** [bmf/c_modules/CMakeFiles/builtin_modules.dir/build.make:76: bmf/c_modules/CMakeFiles/builtin_modules.dir/src/ffmpeg_decoder.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... [ 65%] Building CXX object bmf/engine/c_engine/CMakeFiles/engine.dir/src/graph.cpp.o [ 65%] Building CXX object bmf/engine/c_engine/CMakeFiles/engine.dir/src/graph_config.cpp.o [ 66%] Building CXX object bmf/engine/c_engine/CMakeFiles/engine.dir/src/input_stream.cpp.o In file included from /home/jack/Documents/workspace/fork/bmf/bmf/c_modules/include/ffmpeg_filter.h:19, from /home/jack/Documents/workspace/fork/bmf/bmf/c_modules/src/ffmpeg_filter.cpp:14: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h: In member function ‘int bmf_sdk::FilterGraph::config_graph(std::string&, std::map<int, bmf_sdk::FilterConfig>&, std::map<int, bmf_sdk::FilterConfig>&)’: /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/filter_graph.h:270:29: error: ‘av_get_default_channel_layout’ was not declared in this scope; did you mean ‘av_opt_set_channel_layout’? 270 | av_get_default_channel_layout( | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | av_opt_set_channel_layout In file included from /home/jack/Documents/workspace/fork/bmf/bmf/sdk/cpp_sdk/include/bmf/sdk/ffmpeg_helper.h:27, from /home/jack/Documents/workspace/fork/bmf/bmf/c_modules/src/ffmpeg_filter.cpp:16: /home/jack/Documents/workspace/fork/bmf/bmf/hml/include/hmp/ffmpeg/ff_helper.h: In function ‘AVFrame* hmp::ffmpeg::to_audio_frame(const TensorList&, const AVFrame*, bool)’: /home/jack/Documents/workspace/fork/bmf/bmf/hml/include/hmp/ffmpeg/ff_helper.h:378:26: error: ‘av_get_channel_layout_nb_channels’ was not declared in this scope 378 | : av_get_channel_layout_nb_channels(avf->channel_layout); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 67%] Linking CXX shared library ../../output/bmf/cpp_modules/Module_pass_through/libpass_through.so /home/jack/Documents/workspace/fork/bmf/bmf/c_modules/src/ffmpeg_encoder.cpp: In member function ‘int CFFEncoder::init_codec(int, AVFrame*)’: /home/jack/Documents/workspace/fork/bmf/bmf/c_modules/src/ffmpeg_encoder.cpp:1481:21: error: ‘AVStream’ {aka ‘struct AVStream’} has no member named ‘codec’ 1481 | out_stream->codec->time_base = enc_ctxs_[idx]->time_base; |