eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/libsvtjpegxsdec: use AVCodecContext.lowres instead of a private option

Browse Source 
It was evidently an oversight.

Found-by: Andreas Rheinhardt.
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-12-14 14:10:36 -03:00
parent 330984579b
commit 4269d69df1
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/libsvtjpegxsdec.c
+3 -21
View File
@@ -37,7 +37,6 @@
#include "profiles.h"
typedef struct SvtJpegXsDecodeContext {
AVClass* class;
svt_jpeg_xs_image_config_t config;
svt_jpeg_xs_decoder_api_t decoder;
svt_jpeg_xs_frame_t input;
@@ -197,9 +196,9 @@ static av_cold int svt_jpegxs_dec_init(AVCodecContext* avctx)
svt_dec->decoder.verbose = log_level < AV_LOG_DEBUG ? VERBOSE_ERRORS :
log_level == AV_LOG_DEBUG ? VERBOSE_SYSTEM_INFO : VERBOSE_WARNINGS;
if (svt_dec->proxy_mode == 1)
if (avctx->lowres == 1)
svt_dec->decoder.proxy_mode = proxy_mode_half;
else if (svt_dec->proxy_mode == 2)
else if (avctx->lowres == 2)
svt_dec->decoder.proxy_mode = proxy_mode_quarter;
else
svt_dec->decoder.proxy_mode = proxy_mode_full;
@@ -211,23 +210,6 @@ static av_cold int svt_jpegxs_dec_init(AVCodecContext* avctx)
return 0;
}
#define OFFSET(x) offsetof(SvtJpegXsDecodeContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
static const AVOption svtjpegxs_dec_options[] = {
{ "proxy_mode", "Resolution scaling mode", OFFSET(proxy_mode), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 2, VE, .unit = "proxy_mode" },
{ "full", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0}, INT_MIN, INT_MAX, VE, .unit = "proxy_mode" },
{ "half", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 1}, INT_MIN, INT_MAX, VE, .unit = "proxy_mode" },
{ "quarter", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 2}, INT_MIN, INT_MAX, VE, .unit = "proxy_mode" },
{NULL},
};
static const AVClass svtjpegxs_dec_class = {
.class_name = "libsvtjpegxsdec",
.item_name = av_default_item_name,
.option = svtjpegxs_dec_options,
.version = LIBAVUTIL_VERSION_INT,
};
const FFCodec ff_libsvtjpegxs_decoder = {
.p.name = "libsvtjpegxs",
CODEC_LONG_NAME("SVT JPEG XS(Scalable Video Technology for JPEG XS) decoder"),
@@ -241,6 +223,6 @@ const FFCodec ff_libsvtjpegxs_decoder = {
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM |
FF_CODEC_CAP_AUTO_THREADS,
.p.max_lowres = 2,
.p.wrapper_name = "libsvtjpegxs",
.p.priv_class = &svtjpegxs_dec_class,
};
libavcodec/version.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 23
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \