oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into hashremoval

Browse Source
This commit is contained in:
itsmattkc
2022-05-30 17:32:39 -07:00
parent 9cc861cdd5 156b6adf99
commit 903d7bb1e6
10 changed files with 185 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/ffmpegutils.cpp
+12 -9
View File
@@ -22,17 +22,20 @@
namespace olive {
AVPixelFormat FFmpegUtils::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt)
AVPixelFormat FFmpegUtils::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt, VideoParams::Format maximum)
{
AVPixelFormat possible_pix_fmts[] = {
// RGBA formats only because GPUs always upconvert to RGBA, so if it's RGB, that adds extra
// conversion overhead
AV_PIX_FMT_RGBA,
AV_PIX_FMT_RGBA64,
AV_PIX_FMT_NONE
};
std::vector<AVPixelFormat> possible_pix_fmts(3);
return avcodec_find_best_pix_fmt_of_list(possible_pix_fmts,
possible_pix_fmts[0] = AV_PIX_FMT_RGBA;
if (maximum == VideoParams::kFormatUnsigned8) {
possible_pix_fmts[1] = AV_PIX_FMT_NONE;
} else {
possible_pix_fmts[1] = AV_PIX_FMT_RGBA64;
possible_pix_fmts[2] = AV_PIX_FMT_NONE;
}
return avcodec_find_best_pix_fmt_of_list(possible_pix_fmts.data(),
pix_fmt,
1,
nullptr);
app/common/ffmpegutils.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
/**
* @brief Returns an AVPixelFormat that can be used to convert a frame to a data type Olive supports with minimal data loss
*/
static AVPixelFormat GetCompatiblePixelFormat(const AVPixelFormat& pix_fmt);
static AVPixelFormat GetCompatiblePixelFormat(const AVPixelFormat& pix_fmt, VideoParams::Format maximum = VideoParams::kFormatInvalid);
/**
* @brief Returns a native pixel format that can be used to convert from a native frame to an AVFrame with minimal data loss