From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D18CF406C7 for ; Fri, 12 Sep 2025 02:28:08 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'VENVGYFaaeRAAoQxQX2mpGsfj4TEokOjJOecvbaYNoA=', expected b'KyxZFl/DDiH6gwTEX/M0oMitoIhREvdcoAxwwKbJoKA=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757644065; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=VENVGYFaaeRAAoQxQX2mpGsfj4TEokOjJOecvbaYNoA=; b=eLcdugmGwixcyRaGXucsW4q/phVlB4Fs/trrdyX5oVA4ptrAOt2gLAj6Z/yRkLJI22i7G Xyqf+Fv9uxCccBERsBKNp/K/swLek+hVSHCzDL7rmnlxky3TRxDogKztkX6Uihw6Wtm05hg aiUB4orvUgoUVptMnpT+H3CXiteEthCnoOkPc6vvFsXdXzwiWp1rQaJWgwA2ICEungaLgiq 95W2d0tQBBblMwpdjarE5dXgWjvqVNjh85KDoPFH+wyCbNTcUN2cahg+8hbv9XpdIZO/FdW HC7xXwZBPSZm8HYDen3kOEq3dlWjFbj4Nz7egdHFQKVxiQIsaYq7fqfO5fwg== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 328CA68E7E2; Fri, 12 Sep 2025 05:27:45 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757644062; b=GcAWL+1LOrgb9cILYAZMCNzgGuIsmD/ZzjNR6nhLZptaNKHQMDIGh/38wzsaCR9+s+chu 6nCjI7tEPpWqGL8eWdKmtbGGf4Akxq5YCha5rN5AJ5T0xM6qJTugxW6GA+GTqzRxP8XOsZv dSF1saPIXNx/UZucJXYXq5FEpCojt4fPwuJxDWPa/UOdGoNEgi/rFuAql3UiqIOXljUb7ML AX/eQyPuqO3+uJ3fgVwByX3VQops96ZoqJ/6gviCnqUhHHMgrcjp5FybyUkU63feV5/nfNp Mmi/qYjD+w/VAQB0qCVd+AXHI6f1XhzM1HRxKAU8nF+j/GcF8gGwSJFDHJVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757644062; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=xZ5WZHiY05ZC88WkTFl9ZdQuAVyAUn6BI5Bis73sv8o=; b=Jv8egM6kBveK/8Civ5TGZzojY4VgZ0c77+GUWppohTMZI07oI2Z6iPUFcCSST0W2ldWuv 6rLZvc6t16ssnV/1eMZoNwfXbXag9Oh2+uoDemm0HVJyl6JLMdWr1h/tFJGQcaqZEgE7fMf /yxJj8Ksaz1E03V9l/rN+YOzcV9C6HYt4KKF+vZFljpLYSyxhHSrmeaN9h1cVDsGHxuhlMY eVifqYcYIAFGGhdhigjVT90bCG5Z70E7CImbkQ6hjzPywTLF8sHYOV9VfRefJxs875dpfEY TCyndhepEk4/1Pso4tNImh4N7gPNNxHJ3GovL0pin9qSHGOVIPsx+Q1/KA4w== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757644050; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=KyxZFl/DDiH6gwTEX/M0oMitoIhREvdcoAxwwKbJoKA=; b=ys7yyw3xqVnGCt9j0ggtouZKXuhFqXiIbePP0xsdQoNvEub5I8FV2R8G6nZEXVuPPhBQi a9YOVNYVtR633aBjFyLo+VLedoC/6LhUGZwu2NJT12gzJ62u/QZJEyyfY0qeTfi59UHhuHl 9nipS/so0F6DY5VWCy6ddSZ0/q/ieAhAIsJQXEYSiqvRbqgaE5Ehz6MyLN7b6PRW2S7zCz6 TOSifi+XCgh7+/vpShTlNZ6qsPfDW06a9mlu/BRzHgMrphuJ+QbP9OnrWInpoP0Msm7Imoh z1xkoQ0Alyz5UwnpI7AWOiI+dbP99+AyI9hSqCptS1kQQNWKlaxj96mwTJcg== Received: from 3f9d35a0eedc (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1A54C68E7D6 for ; Fri, 12 Sep 2025 05:27:30 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Sep 2025 02:27:29 -0000 Message-ID: <175764405053.25.4793704935854434545@463a07221176> Message-ID-Hash: QQ6YG5WILWAS4LMACSLKHX6Z3E65MZIK X-Message-ID-Hash: QQ6YG5WILWAS4LMACSLKHX6Z3E65MZIK X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: Avoid mixing return value and error code, avoid branch (PR #20497) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: mkver via ffmpeg-devel Cc: mkver Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20497 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20497 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20497.patch >>From 2fdfade62c03c2b2d6eefc4b52bef1d8a4ffcd38 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 11 Sep 2025 22:04:53 +0200 Subject: [PATCH 1/6] avcodec/mjpegdec: Remove pointless information from logmessage There is no reason to add the address of an element of MJpegDecodeContext (which makes logmessage nonreproducible). Also avoid always printing a zero. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 3dde759fea..bb5540c8bb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -822,8 +822,7 @@ static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2); if (code < 0 || code > 16) { av_log(s->avctx, AV_LOG_WARNING, - "mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", - 0, dc_index, &s->vlcs[0][dc_index]); + "mjpeg_decode_dc: bad vlc: %d\n", dc_index); return 0xfffff; } -- 2.49.1 >>From 7d74683d37069770fb619a6d1989b439eff52687 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 11 Sep 2025 22:33:32 +0200 Subject: [PATCH 2/6] avcodec/mjpegdec: Avoid superfluous secondary error message Up until now, a DC error in decode_block() or decode_dc_progressive() would lead to a warning from mjpeg_decode_dc() and a (less verbose) error from the caller. Upgrade the former to an error status (all callers treat is an error) and remove the latter. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index bb5540c8bb..711ea1c140 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -821,7 +821,7 @@ static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) int code; code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2); if (code < 0 || code > 16) { - av_log(s->avctx, AV_LOG_WARNING, + av_log(s->avctx, AV_LOG_ERROR, "mjpeg_decode_dc: bad vlc: %d\n", dc_index); return 0xfffff; } @@ -841,7 +841,6 @@ static int decode_block(MJpegDecodeContext *s, int16_t *block, int component, /* DC coef */ val = mjpeg_decode_dc(s, dc_index); if (val == 0xfffff) { - av_log(s->avctx, AV_LOG_ERROR, "error dc\n"); return AVERROR_INVALIDDATA; } val = val * (unsigned)quant_matrix[0] + s->last_dc[component]; @@ -889,7 +888,6 @@ static int decode_dc_progressive(MJpegDecodeContext *s, int16_t *block, s->bdsp.clear_block(block); val = mjpeg_decode_dc(s, dc_index); if (val == 0xfffff) { - av_log(s->avctx, AV_LOG_ERROR, "error dc\n"); return AVERROR_INVALIDDATA; } val = (val * (quant_matrix[0] << Al)) + s->last_dc[component]; -- 2.49.1 >>From d814b5b0e97165c9dfc882bb4d36a7d4431e61ca Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 12 Sep 2025 00:13:52 +0200 Subject: [PATCH 3/6] avcodec/mjpegdec: Avoid mixing return value and error code, avoid branch mjpeg_decode_dc() currently has a special return value (0xfffff) for the case of invalid data; this value does not overlap with the ordinary return values, yet the compiler can't prove this (at least on x86 where an asm version of NEG_USR32 is used inside get_xbits()), so the non-error return value has to be checked for being the special value even if mjpeg_decode_dc() is inlined. This commit avoids this by separating error code and ordinary return value. It also means that the ljpeg functions return the proper error code and not -1 in case of invalid data. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 48 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 711ea1c140..82b82ff44d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -816,20 +816,18 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) return 0; } -static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) +static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index, int *val) { int code; code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2); if (code < 0 || code > 16) { av_log(s->avctx, AV_LOG_ERROR, "mjpeg_decode_dc: bad vlc: %d\n", dc_index); - return 0xfffff; + return AVERROR_INVALIDDATA; } - if (code) - return get_xbits(&s->gb, code); - else - return 0; + *val = code ? get_xbits(&s->gb, code) : 0; + return 0; } /* decode block and dequantize */ @@ -839,10 +837,10 @@ static int decode_block(MJpegDecodeContext *s, int16_t *block, int component, int code, i, j, level, val; /* DC coef */ - val = mjpeg_decode_dc(s, dc_index); - if (val == 0xfffff) { - return AVERROR_INVALIDDATA; - } + int ret = mjpeg_decode_dc(s, dc_index, &val); + if (ret < 0) + return ret; + val = val * (unsigned)quant_matrix[0] + s->last_dc[component]; s->last_dc[component] = val; block[0] = av_clip_int16(val); @@ -886,10 +884,10 @@ static int decode_dc_progressive(MJpegDecodeContext *s, int16_t *block, { unsigned val; s->bdsp.clear_block(block); - val = mjpeg_decode_dc(s, dc_index); - if (val == 0xfffff) { - return AVERROR_INVALIDDATA; - } + int ret = mjpeg_decode_dc(s, dc_index, &val); + if (ret < 0) + return ret; + val = (val * (quant_matrix[0] << Al)) + s->last_dc[component]; s->last_dc[component] = val; block[0] = val; @@ -1107,6 +1105,7 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p int resync_mb_y = 0; int resync_mb_x = 0; int vpred[6]; + int ret; if (!s->bayer && s->nb_components < 3) return AVERROR_INVALIDDATA; @@ -1179,9 +1178,9 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p topleft[i] = top[i]; top[i] = buffer[mb_x][i]; - dc = mjpeg_decode_dc(s, s->dc_index[i]); - if(dc == 0xFFFFF) - return -1; + ret = mjpeg_decode_dc(s, s->dc_index[i], &dc); + if (ret < 0) + return ret; if (!s->bayer || mb_x) { pred = left[i]; @@ -1275,6 +1274,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int bits= (s->bits+7)&~7; int resync_mb_y = 0; int resync_mb_x = 0; + int ret; point_transform += bits - s->bits; mask = ((1 << s->bits) - 1) << point_transform; @@ -1313,9 +1313,10 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, for(j=0; jdc_index[i]); - if(dc == 0xFFFFF) - return -1; + ret = mjpeg_decode_dc(s, s->dc_index[i], &dc); + if (ret < 0) + return ret; + if ( h * mb_x + x >= s->width || v * mb_y + y >= s->height) { // Nothing to do @@ -1384,9 +1385,10 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, for (j = 0; j < n; j++) { int pred; - dc = mjpeg_decode_dc(s, s->dc_index[i]); - if(dc == 0xFFFFF) - return -1; + ret = mjpeg_decode_dc(s, s->dc_index[i], &dc); + if (ret < 0) + return ret; + if ( h * mb_x + x >= s->width || v * mb_y + y >= s->height) { // Nothing to do -- 2.49.1 >>From de976e3b7971532081dc1dce63979f22a33efde2 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 12 Sep 2025 02:38:23 +0200 Subject: [PATCH 4/6] avcodec/mjpegdec: Move initializing HpelDSPContext to mxpegdec.c Only the mxpeg decoder uses it (and the reference/bitmask feature of ff_mjpeg_decode_sos()). So only initialize it for mxpeg which allows to remove the mjpeg->hpeldsp dependency. Signed-off-by: Andreas Rheinhardt --- configure | 4 ++-- libavcodec/mjpegdec.c | 1 - libavcodec/mxpegdec.c | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index c6afcd7494..4c5bcb5db0 100755 --- a/configure +++ b/configure @@ -3047,9 +3047,9 @@ mdec_decoder_select="blockdsp bswapdsp idctdsp" media100_decoder_select="media100_to_mjpegb_bsf mjpegb_decoder" metasound_decoder_select="lsp sinewin" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" -mjpeg_decoder_select="blockdsp hpeldsp idctdsp jpegtables" +mjpeg_decoder_select="blockdsp idctdsp jpegtables" mjpeg_encoder_select="jpegtables mpegvideoenc" -mjpegb_decoder_select="mjpeg_decoder" +mjpegb_decoder_select="hpeldsp mjpeg_decoder" mlp_decoder_select="mlp_parser" mlp_encoder_select="lpc audio_frame_queue" mobiclip_decoder_select="bswapdsp golomb" diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 82b82ff44d..4b3d1e2162 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -134,7 +134,6 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->avctx = avctx; ff_blockdsp_init(&s->bdsp); - ff_hpeldsp_init(&s->hdsp, avctx->flags); init_idct(avctx); s->buffer_size = 0; s->buffer = NULL; diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 8661bba566..8054d016be 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -28,6 +28,7 @@ #include "libavutil/mem.h" #include "codec_internal.h" #include "decode.h" +#include "hpeldsp.h" #include "mjpeg.h" #include "mjpegdec.h" @@ -65,6 +66,8 @@ static av_cold int mxpeg_decode_init(AVCodecContext *avctx) { MXpegDecodeContext *s = avctx->priv_data; + ff_hpeldsp_init(&s->jpg.hdsp, avctx->flags); + s->picture[0] = av_frame_alloc(); s->picture[1] = av_frame_alloc(); if (!s->picture[0] || !s->picture[1]) -- 2.49.1 >>From 718fd869909126a3e2be890292a36d25662fb638 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 12 Sep 2025 03:47:13 +0200 Subject: [PATCH 5/6] avcodec/mjpegdec: Avoid using HpelDSPContext It is quite big and we only need one function from it. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 2 +- libavcodec/mjpegdec.h | 2 +- libavcodec/mxpegdec.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 4b3d1e2162..5c6ca4bdbf 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1428,7 +1428,7 @@ static av_always_inline void mjpeg_copy_block(MJpegDecodeContext *s, int linesize, int lowres) { switch (lowres) { - case 0: s->hdsp.put_pixels_tab[1][0](dst, src, linesize, 8); + case 0: s->copy_block(dst, src, linesize, 8); break; case 1: copy_block4(dst, src, linesize, linesize, 4); break; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 8b9ed67856..ce688482cf 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -119,8 +119,8 @@ typedef struct MJpegDecodeContext { int force_pal8; uint8_t permutated_scantable[64]; BlockDSPContext bdsp; - HpelDSPContext hdsp; IDCTDSPContext idsp; + op_pixels_func copy_block; ///< only set and used by mxpeg int restart_interval; int restart_count; diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 8054d016be..9a5110a814 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -65,8 +65,10 @@ static av_cold int mxpeg_decode_end(AVCodecContext *avctx) static av_cold int mxpeg_decode_init(AVCodecContext *avctx) { MXpegDecodeContext *s = avctx->priv_data; + HpelDSPContext hdsp; - ff_hpeldsp_init(&s->jpg.hdsp, avctx->flags); + ff_hpeldsp_init(&hdsp, avctx->flags); + s->jpg.copy_block = hdsp.put_pixels_tab[1][0]; s->picture[0] = av_frame_alloc(); s->picture[1] = av_frame_alloc(); -- 2.49.1 >>From 90cb8e0276ac5666edd2874ba5b55efc74dd0950 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 12 Sep 2025 04:03:07 +0200 Subject: [PATCH 6/6] avcodec/mjpegdec: Move reference dimension check to mxpegdec.c Only the mxpeg sets reference at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 9 --------- libavcodec/mxpegdec.c | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5c6ca4bdbf..6ff0ba5a0b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1679,15 +1679,6 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, return -1; } - if (reference) { - if (reference->width != s->picture_ptr->width || - reference->height != s->picture_ptr->height || - reference->format != s->picture_ptr->format) { - av_log(s->avctx, AV_LOG_ERROR, "Reference mismatching\n"); - return AVERROR_INVALIDDATA; - } - } - /* XXX: verify len field validity */ len = get_bits(&s->gb, 16); nb_components = get_bits(&s->gb, 8); diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 9a5110a814..8861a3969d 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -179,6 +179,12 @@ static int mxpeg_check_dimensions(MXpegDecodeContext *s, MJpegDecodeContext *jpg return AVERROR(EINVAL); } } + if (reference_ptr->width != jpg->picture_ptr->width || + reference_ptr->height != jpg->picture_ptr->height || + reference_ptr->format != jpg->picture_ptr->format) { + av_log(jpg->avctx, AV_LOG_ERROR, "Reference mismatching\n"); + return AVERROR_INVALIDDATA; + } } return 0; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org