Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/rework f fmpeg loading #542

Draft
wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft

Feature/rework f fmpeg loading #542

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f69aa8c
Rework ffmpeg info return
ChristianFeldmann Sep 26, 2023
3f1c7c7
Update settings dialog
ChristianFeldmann Sep 26, 2023
8239cb1
Many more refactorings
ChristianFeldmann Sep 28, 2023
22fb303
Fix compilation ubuntu and fix warnings
Sep 28, 2023
abf14fb
Fix compilation ubuntu and fix warnings
ChristianFeldmann Sep 28, 2023
d146bb2
Big refactor towards a libFFmpeg++
ChristianFeldmann Oct 3, 2023
70580b2
Slowly fix compilation errors
ChristianFeldmann Oct 5, 2023
22b7863
Finally the libffmpeg part compiles (almost) without Qt
ChristianFeldmann Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rework ffmpeg info return
  • Loading branch information
@ChristianFeldmann
ChristianFeldmann committed Sep 26, 2023
commit f69aa8cf89f7c8bc413d6cbb9eff899750e4a373
36 changes: 15 additions & 21 deletions YUViewLib/src/ffmpeg/FFmpegVersionHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,27 +207,21 @@ auto SupportedLibraryVersionCombinations = {
//}
//

QString FFmpegVersionHandler::getLibVersionString() const
{
QString s;
s += QString("avUtil %1.%2.%3 ")
.arg(libVersion.avutil.major)
.arg(libVersion.avutil.minor.value_or(0))
.arg(libVersion.avutil.micro.value_or(0));
s += QString("avFormat %1.%2.%3 ")
.arg(libVersion.avformat.major)
.arg(libVersion.avformat.minor.value_or(0))
.arg(libVersion.avformat.micro.value_or(0));
s += QString("avCodec %1.%2.%3 ")
.arg(libVersion.avcodec.major)
.arg(libVersion.avcodec.minor.value_or(0))
.arg(libVersion.avcodec.micro.value_or(0));
s += QString("swresample %1.%2.%3")
.arg(libVersion.swresample.major)
.arg(libVersion.swresample.minor.value_or(0))
.arg(libVersion.swresample.micro.value_or(0));

return s;
std::string FFmpegVersionHandler::getLibVersionString() const
{
std::ostringstream stream;

auto addVersion = [&stream](const char *name, const Version &version) {
stream << name << version.major << "." << version.minor.value_or(0) << "."
<< version.micro.value_or(0);
};

addVersion("avUtil", libVersion.avutil);
addVersion("avFormat", libVersion.avformat);
addVersion("avCodec", libVersion.avcodec);
addVersion("swresample", libVersion.swresample);

return stream.str();
}

AVCodecIDWrapper FFmpegVersionHandler::getCodecIDWrapper(AVCodecID id)
Expand Down