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 551624E0B9 for ; Mon, 12 Jan 2026 19:57:05 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'f9AQl0aOydP9z/1Hr3QvJkUxq4EIKmuXBTXXm+Tqdj8=', expected b'gF2X3FyBCuhh9crX0qAI5ZKuAz9JPdS49Mpp9lKs7hY=')) 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=1768247818; 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=f9AQl0aOydP9z/1Hr3QvJkUxq4EIKmuXBTXXm+Tqdj8=; b=eG0bIjF/hFhMjtZ6aGzgC3zl2v3lfR8I+XCY6Nmk3vTVIwbn2ZMuxvz5XXWclxGUmOlCI 6B+pgjGwGWgNm48Sv+Tn9xFISWEorCNycnJS20xjkKN0hQXuEcoCceKm8ky0zrYZyJ1IaN+ BLbmWxQJL4/4mf3EsODVC7N2zu7hFnRu+I4VFjpeen8T+JzXSECqEDXAZPF8zihQCTxtilx QLTKsO7l6ZUPW8TcV1g7RvNkAsi2xVSee2iO6cu7w9SGObJbacCPustOE4wuDUFKHBlD3wU MOZlXG+NFlW3x2KBBMIsnDO0dpd08fM9mMj57KX3Ji/8mymBFccABnVGIXEw== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F0F8A690E1B; Mon, 12 Jan 2026 21:56:57 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1768247805; b=oXzGfuqqFBu/RT1nrU8HzW8BZXjI4gBX/1LotxgSwsk3LLaqfST2e21Bg6q6tz6gJWn3p 2vxkESTKOgzw93+VTh+L7IMJw48yJNxbih3s/SK7iy7H3eoY62f5vviV/A/lFg5YN79+6sj uc8Y2DEf6aNHhwrteg6RbfZ+nBWgs46iCZDC5ikp08rWy3RWtxsLTsKusgYcevD27MrBrqw prU269i2ZTGphuW8pELRmkXViJkeZbUL13bkIWE1fRr8pOqtvf+aY9rPReBDiop2SbppsPb ys3kWOVmAvdvgZM8dWOyjyQExVwQWiG5FHZN46vpi94HGoBzlndSr3KHcrlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1768247805; 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=S9se7UBu8nc+ZkOp8MF457F+xNxomKxFAYLscyD9xBc=; b=t1kXFG0kYm17+pkV+lnYKMIS0/7twOECVekMvT5iYMH8Jtmv2raMlPBo6hFkKTaqEF1S3 xcCC93x1YVZDsQrRj9yTuxj0QktIDVqicVOJ4rtz5iK98loDBCVemJkkHPWySDdwNm58hPj TohE6cELEam6ZpgpCdNY42iTmcb3TntkEM0ZpimhfH8qgnRnqltcy36uLAZ9zu/CzwysjoM DJRpMecNuZR4rZST3Y3TIiWQfHd9MUut9a48gIGn/gKmJjQwQxxvm4z03LKFQBlseROzSsp w3w/N2F87XaQyvRTfXUc2g7L2F2ZT1kavvZIKVre5Vov4u7Hicf5LlousdtA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1768247798; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=gF2X3FyBCuhh9crX0qAI5ZKuAz9JPdS49Mpp9lKs7hY=; b=jmYm9ctEuAykowLrOJENbzdQqsJxT3cvF6VX5dh7hOW/CupUrzWLVhylvyPeSBrrYwjij 4IWPJCQqalIczJdO1FoECVztiB/YppWxPiv43uums8W5/iwrNtRBKVu8NJIKU8m6+Kvmf4O 58e8QoroIFcCNUNlLnANbRzhY6j3HK30UEeLNtYIBj5tzcOlqWfmAuMOuc0GfAMRImHUchs S4e5omizikX7l5IDUUgamtn4H7YPjc/rueoCYFSVZ+nGL7H/5qyLxYiCaEOIK04OhoqWaBS 7HJlZisdrAyqSa58qnZ9J2DDxHZZBJJqCd24gjMg1bNImfh3G6Q9O6tauXQg== Received: from f7c34508609e (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4A5E5690D8E for ; Mon, 12 Jan 2026 21:56:38 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Jan 2026 19:56:37 -0000 Message-ID: <176824779842.25.16601165876289076039@4457048688e7> Message-ID-Hash: V3QNIUMMXHZE5BJD5B2RW55DJFIC2NBR X-Message-ID-Hash: V3QNIUMMXHZE5BJD5B2RW55DJFIC2NBR X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation 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 X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] avcodec/mjpegdec: remove FF_DEBUG_QP from mjpegdec (PR #21441) 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: Ramiro Polla via ffmpeg-devel Cc: Ramiro Polla Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21441 opened by Ramiro Polla (ramiro) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21441 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21441.patch The qscale calculation heuristic is very simplistic and doesn't even round-trip (re-encoding a file with the reported QP does not reproduce the same debug QP). Also, the qscale_table field from MJpegDecodeContext was unused since 759001c534. >>From accb1095797f643044a5cabd78c58c6e7455a02c Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Sat, 10 Jan 2026 00:03:13 +0100 Subject: [PATCH] avcodec/mjpegdec: remove FF_DEBUG_QP from mjpegdec The qscale calculation heuristic is very simplistic and doesn't even round-trip (re-encoding a file with the reported QP does not reproduce the same debug QP). Also, the qscale_table field from MJpegDecodeContext was unused since 759001c534. --- libavcodec/mjpegbdec.c | 5 ----- libavcodec/mjpegdec.c | 14 -------------- libavcodec/mjpegdec.h | 2 -- 3 files changed, 21 deletions(-) diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 79eed6eaa6..94ca7f7f40 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -147,11 +147,6 @@ read_header: return buf_size; *got_frame = 1; - if (!s->lossless && avctx->debug & FF_DEBUG_QP) { - av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", - FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2])); - } - return buf_size; } diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 3af4b05551..225211a316 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -231,12 +231,6 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) return AVERROR_INVALIDDATA; } } - - // XXX FIXME fine-tune, and perhaps add dc too - s->qscale[index] = FFMAX(s->quant_matrixes[index][1], - s->quant_matrixes[index][8]) >> 1; - av_log(s->avctx, AV_LOG_DEBUG, "qscale[%d]: %d\n", - index, s->qscale[index]); len -= 1 + 64 * (1+pr); } return 0; @@ -2561,14 +2555,6 @@ eoi_parser: *got_frame = 1; s->got_picture = 0; - if (!s->lossless && avctx->debug & FF_DEBUG_QP) { - int qp = FFMAX3(s->qscale[0], - s->qscale[1], - s->qscale[2]); - - av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp); - } - goto the_end; case SOS: s->raw_scan_buffer = buf_ptr; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index c2f83ac949..7ffade4808 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -66,7 +66,6 @@ typedef struct MJpegDecodeContext { uint16_t quant_matrixes[4][64]; VLC vlcs[3][4]; - int qscale[4]; ///< quantizer scale calculated from quant_matrixes int orig_height; /* size given at codec init */ int first_picture; /* true if decoding first picture */ @@ -112,7 +111,6 @@ typedef struct MJpegDecodeContext { AVFrame *picture_ptr; /* pointer to picture structure */ int got_picture; ///< we found a SOF and picture is valid, too. int linesize[MAX_COMPONENTS]; ///< linesize << interlaced - int8_t *qscale_table; DECLARE_ALIGNED(32, int16_t, block)[64]; int16_t (*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive mode) uint8_t *last_nnz[MAX_COMPONENTS]; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org