scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 04:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavc: fixed subsampling selection

Browse Source 
- wrong condition in IF_NOT_NULL_ELSE
- improved ordering of codecs
- rename preferred_subsampling var (to comply with bits_per_comp,
  is_rgb)
This commit is contained in:
Martin Pulec
2021-11-26 15:29:33 +01:00
parent c6f84ea917
commit 2bfcedbf3e
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/misc.h
View File

@@ -47,7 +47,7 @@
#define STRINGIFY(A) #A
#define TOSTRING(A) STRINGIFY(A) // https://stackoverflow.com/questions/240353/convert-a-preprocessor-token-to-a-string
#define IF_NOT_NULL_ELSE(cond, alt_val) !(cond) ? (cond) : (alt_val)
#define IF_NOT_NULL_ELSE(cond, alt_val) (cond) ? (cond) : (alt_val)
#ifdef __cplusplus
extern "C" {

13
src/video_compress/libavcodec.cpp
View File

@@ -929,9 +929,9 @@ static list<enum AVPixelFormat> get_available_pix_fmts(struct video_desc in_desc
int bits_per_comp = get_bits_per_component(in_desc.color_spec);
bool is_rgb = codec_is_a_rgb(in_desc.color_spec);
int preferred_subsampling = IF_NOT_NULL_ELSE(requested_subsampling, get_subsampling(in_desc.color_spec) / 10);
int subsampling = IF_NOT_NULL_ELSE(requested_subsampling, get_subsampling(in_desc.color_spec) / 10);
// sort
auto compare = [bits_per_comp, is_rgb, preferred_subsampling](enum AVPixelFormat a, enum AVPixelFormat b) {
auto compare = [bits_per_comp, is_rgb, subsampling](enum AVPixelFormat a, enum AVPixelFormat b) {
const struct AVPixFmtDescriptor *pda = av_pix_fmt_desc_get(a);
const struct AVPixFmtDescriptor *pdb = av_pix_fmt_desc_get(b);
#if LIBAVUTIL_VERSION_MAJOR >= 56
@@ -966,13 +966,10 @@ static list<enum AVPixelFormat> get_available_pix_fmts(struct video_desc in_desc
return deptha < depthb;
}
if (subsa != subsb) {
if (subsa == preferred_subsampling) {
return true;
if (subsa < subsampling || subsb < subsampling) {
return subsa > subsb;
}
if (subsb == preferred_subsampling) {
return false;
}
return subsa > subsb;
return subsa < subsb;
}
return a < b;
};