Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

citra_qt: Split options into 'Specific' and 'Generic'

Browse source 
For easier usage. Also made the option list sortable.
This commit is contained in:
zhupengfei 2020-02-28 18:26:20 +08:00
parent f3e9780d10
commit a50ba7192b
No known key found for this signature in database
GPG key ID: DD129E108BD09378
7 changed files with 76 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/core/dumping/ffmpeg_backend.cpp
View file

@ -754,8 +754,6 @@ std::vector<OptionInfo> GetOptionList(const AVClass* av_class, bool search_child
std::vector<EncoderInfo> ListEncoders(AVMediaType type) {
InitializeFFmpegLibraries();
const auto general_options = GetOptionList(avcodec_get_class(), false);
std::vector<EncoderInfo> out;
const AVCodec* current = nullptr;
@ -768,19 +766,19 @@ std::vector<EncoderInfo> ListEncoders(AVMediaType type) {
if (!av_codec_is_encoder(current) || current->type != type) {
continue;
}
auto options = GetOptionList(current->priv_class, true);
options.insert(options.end(), general_options.begin(), general_options.end());
out.push_back(
{current->name, ToStdString(current->long_name), current->id, std::move(options)});
out.push_back({current->name, ToStdString(current->long_name), current->id,
GetOptionList(current->priv_class, true)});
}
return out;
}
std::vector<OptionInfo> GetEncoderGenericOptions() {
return GetOptionList(avcodec_get_class(), false);
}
std::vector<FormatInfo> ListFormats() {
InitializeFFmpegLibraries();
const auto general_options = GetOptionList(avformat_get_class(), false);
std::vector<FormatInfo> out;
const AVOutputFormat* current = nullptr;
@ -790,9 +788,6 @@ std::vector<FormatInfo> ListFormats() {
void* data = nullptr; // For libavformat to save the iteration state
while ((current = av_muxer_iterate(&data))) {
#endif
auto options = GetOptionList(current->priv_class, true);
options.insert(options.end(), general_options.begin(), general_options.end());
std::vector<std::string> extensions;
Common::SplitString(ToStdString(current->extensions), ',', extensions);
@ -816,9 +811,13 @@ std::vector<FormatInfo> ListFormats() {
out.push_back({current->name, ToStdString(current->long_name), std::move(extensions),
std::move(supported_video_codecs), std::move(supported_audio_codecs),
std::move(options)});
GetOptionList(current->priv_class, true)});
}
return out;
}
std::vector<OptionInfo> GetFormatGenericOptions() {
return GetOptionList(avformat_get_class(), false);
}
} // namespace VideoDumper

2
src/core/dumping/ffmpeg_backend.h
View file

@ -227,6 +227,8 @@ struct FormatInfo {
};
std::vector<EncoderInfo> ListEncoders(AVMediaType type);
std::vector<OptionInfo> GetEncoderGenericOptions();
std::vector<FormatInfo> ListFormats();
std::vector<OptionInfo> GetFormatGenericOptions();
} // namespace VideoDumper