Skip to content

Commit 573fe22

Browse files
committed
GPUJPEG: adjust verbosity
v0.26 is slightly more chatty even in GPUJPEG_LL_STATUS mode (new between INFO and VERBOSE) while the status/verbose mode maps more to debug than UG verbose so adjust the modes as such.
1 parent 79f8591 commit 573fe22

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/video_compress/gpujpeg.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,12 @@ bool encoder_state::configure_with(struct video_desc desc)
277277
m_encoder_param.quality);
278278
}
279279

280+
#if GPUJPEG_VERSION_INT >= GPUJPEG_MK_VERSION_INT(0, 26, 0)
281+
m_encoder_param.verbose =
282+
log_level >= LOG_LEVEL_DEBUG ? GPUJPEG_LL_VERBOSE : GPUJPEG_LL_INFO;
283+
#else
280284
m_encoder_param.verbose = max<int>(0, log_level - LOG_LEVEL_INFO);
285+
#endif
281286
m_encoder_param.perf_stats = log_level >= LOG_LEVEL_DEBUG ? 1 : 0;
282287
m_encoder_param.segment_info = 1;
283288
gpujpeg_sampling_factor_t subsampling = m_parent_state->m_subsampling;

src/video_decompress/gpujpeg.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,12 @@ static int configure_with(struct state_decompress_gpujpeg *s, struct video_desc
7777
struct gpujpeg_decoder_init_parameters param =
7878
gpujpeg_decoder_default_init_parameters();
7979
param.ff_cs_itu601_is_709 = true;
80+
#if GPUJPEG_VERSION_INT >= GPUJPEG_MK_VERSION_INT(0, 26, 0)
81+
param.verbose =
82+
log_level >= LOG_LEVEL_DEBUG ? GPUJPEG_LL_VERBOSE : GPUJPEG_LL_INFO;
83+
#else
8084
param.verbose = MAX(0, log_level - LOG_LEVEL_INFO);
85+
#endif
8186
param.perf_stats = log_level >= LOG_LEVEL_DEBUG ? 1 : 0;
8287
s->decoder = gpujpeg_decoder_create_with_params(&param);
8388
if(!s->decoder) {

0 commit comments

Comments
 (0)