From patchwork Fri Feb 4 15:16:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34119 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp3493065iov; Fri, 4 Feb 2022 07:17:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyS2kEZHd5b+4VK29ajtgxyWQGtGRNbjfZjQloxsZg6bZi5RumLLNaQO8scUNRfbI0+Mtv X-Received: by 2002:a17:907:86a2:: with SMTP id qa34mr2913977ejc.674.1643987827635; Fri, 04 Feb 2022 07:17:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc19si1437023ejc.382.2022.02.04.07.17.06; Fri, 04 Feb 2022 07:17:07 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Nba10YBr; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5426F68B278; Fri, 4 Feb 2022 17:17:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064071.outbound.protection.outlook.com [40.92.64.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7201C68B229 for ; Fri, 4 Feb 2022 17:16:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T1YhBIunKU3n9nmrh1iSNHjruElbLiz29h7+7AB9Ro6AnsUYSF0iIyvCnI9c8yHqpgCHF6kE8GlRc0A4pt7y94xM7QdPYVRViRKvd+lAUFcFdDv2EMwmwUuM87qYOtVBq9iQmV7M+8sc3z33plf2gE5wEVRPfW2TwV/vVgxNmX5xRilEuBa8w0mHVthhQM6Hlg5JVL18TlzQ5Am4Y6JjWewDdXojqh/eA6jSy/jJurH/zPllUqLxEnUvNFHsDltZMFfseKgUrpDlSQ4GOqrSn+z3i9ssEWQrPUYjR2myZZshSLThDyCevmZPAy0E832a7S2b4IgAfXzzmuWEA8y3hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DxUF11Q8N1ZTXhPu7xA0vHjEHqkgc8fPZOp6Dal96D0=; b=GZbISh05p/ysRaqcBWtSuO5hy/e/PTDjp0GvZ7zW3hGN/jQf7DfpkNjGMB6Zq8JqSYNxxeSvUwiJEPaSD1wcjMiQq3eYlVfZ3uPYcnGevy3VXmwIDctFVwxN5oAbjMb+DJs2OMHf9am1aDYcBx7rRzsllUo34n+KZDq+I8ZX5eTqWWnvge+aGvYPsLJZfL26NxuG/DDPE4ga8KMcXAF8noWKk1YQwn4sRuse00VM8OoIjHoqVJtVFc7rtGznS3ARr8F2Z3vic/SrHe2A9A5n/i7BqtmSkhC7yBo1i2t/eugSbOgxhpPaeC8qbbzawqF52THohg3xD6DnFLfyCBgCjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DxUF11Q8N1ZTXhPu7xA0vHjEHqkgc8fPZOp6Dal96D0=; b=Nba10YBrYXcMoM4hNBM1SQuLqn3nHp7uCMFME+j9H63nrmWxxsXR+FE23RBcNNrVIPbk/9jzKg8tC/btGso30/vx9l8v31KZobSLFGhcFl1xfkW2EAHNeWMSclap+I16JIsEG6HhZ+4lQVWo3jpA7Q5W+HwlqXLkXgmzXXTrqi6nTPeWkCC35dz109j9ttyPucCyszwOTItowHuDW3t8PRZqPXzuktu/F+nITgZdTG9S/rPjBblIrTNMwOe4w1XhAtuMFes0ioAl6+g0PxRDcT++62tFmiiWvpX2cZcwmeAXqWvYVbFz7P/lh+PM9kSU0MAhACuBu0CJx7zbaaX3iA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4282.eurprd03.prod.outlook.com (2603:10a6:10:18::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Fri, 4 Feb 2022 15:16:56 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4951.014; Fri, 4 Feb 2022 15:16:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Feb 2022 16:16:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [0DpCaHQ+qV4DkNyboiTiZtiMuldoYeyG] X-ClientProxiedBy: AM5PR0101CA0032.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::45) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220204151648.2148917-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4307dbd6-a0a0-4276-8d91-08d9e7f16170 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSjtu7sMDnYCqklgc/dtjmmFGVlpQafz+mp/J5B63NdXJ/xdyH2KRbMkq+ZJfV3Ezo6S2XfvlPDwm+YyjP2nUPrviRMTP2mbsfJUUGa/75dTeTNzO1Pi/EajiAQ21hN/VNEkO8xp+zd0WAHR6TFcM8RpySYrbaFf8m/tPc8M56rV3xuhaO1Dq2VT0dR+akDv5b7f7NeZDhFlOPC3Gp6SoFZNBZK7QpBlVgwCHmz2lXPB9V548bVjAxZLfb28hEFk1i2Y+04q8a5jxf6lM+6cHPCQq2muDKuPIjvWNklAAkwNu957uFQioKDkA6fdUup+jLk8u6hIU66FfnsvvzcxvsGeC1nBBGoOWmjhNx7tQNYoBp85FbkIpI5aeMEd8CnifmyCVoz5Ie4u7tMXcQQEFov0M3/G/JOT40dTyngP6q1OGdm1zN6bmdyQxYb6c1RKsTtc3DOeedEoUHLq2CGXUPxtJinwZeEmAzO0PAU1J1X4MPJtSNTS9kfujAvwcwUZMBv4VpNyp7d/FiHx5eBx6JQYeJsdEFjuaUL80h4ZpYsTHuUwwwvTWD/ggtVKZJQ89wPJFLaWkyH93wsf9C210qb9QKBZSwxLWk/bNOW/pUPp6vvcwQEZtoGzCo6ZtSOXNl/Rkf84Y0l3q0g5/1kJkMv+gbggFkF5ERGEXp6w02fvYAoqOCT8rEOgv7CW5Z6dOOiOwvS56gzZWkpMFGDsuHXIi9micNca62MHJRoxlrOPMDjRD9eSiFvAqdhafSV6t4= X-MS-TrafficTypeDiagnostic: DB7PR03MB4282:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f3OsfSX3qjUH8SpvjKAsyxTqANVxGYqP4YQSI4rqF1O6uCa+AX23395gOXFj/o0mEOPe3b+rEq7CHRlvOYCU+7IxV0KD28fSo0aTYY1jnT6fCoCrhSvau+lVlr9eh3LKvr+xWBINLY/c1vBxMiHzHpTw6GEYhayiInW8HGXaTJxOrNL1qIwVXeXJ39cG0cdhxoYvVFzsfMsmc+sd6XnEnWFcwYbvyC6CC8+H8IaQXFD77FE0tElIt9D6XI0QEdWEGM2R/MMwd4Qb31Srjuq/5mX0/0O1+GEmUmzkkBPldCLZ4Hq2JFSRaMgAtgsrK3SdXUJGIm10wVobs0pHkyxGsukp5TJftIa5K6WuJYsMmeIeLy+6CtLhp+Z1aY6IY7Jm07X+cEcHgk0xGPBabVSugKsFBkbBk2jM9Iktp6BGidARNogHAdJ9MmdZqvPy7BKbrqLO9DdE5kbut7GQwop2xzef+rOgGkMr+avc121M5Ret6J+SYywWb/xK/doEukuWwgyKB7MDdN/8s4f6PHx2Ec2zdZhewNAOIngvpb5/ZoCzy5n2CYOEQGaOiv1/PSMZqWepAZ3lqgRPcNMUOjvHBg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jPqhRpot3+YY/ozdJKk0npUaiOwdFqYmUsDIBOhECPrwDtCLTpdJ/83cIUx+3g2Qkqkv3plBl0FRj6s0R0eAmDUoqP5iuhPJGLEuPL+L7v/jdXibR7PHc1tTiX/UtBa11681ytlngzCj5XcNWpq+mFLJTrIiZdAoyTD74I40WhOM/tFTw/tdVBuVMCYcMwpFVT9mnXxbHBHiMDFVS+jGFPHCJHA9FuEDTnsq9j+o7D0175Q4nd3brejxSFDgeXRecJDJrpGaHngUNzZdluHnKaf5/3FSoEqkB/HB5n8/vqz2AEpuTiJD7XitCAMRgKWsWecb/wQ13ALDK0L9zWhRYZvvOQ1C36eXm7YoIC+BytAIrVccZG3N9RMRVWw5P5otp7QfHJLaZZHR0cVLFVN0q7iqJPX1j4tvt7Zti7GS3SMw3YwuG6ocM+wM9t/o4wWA4HEyUY4wPc2bjCq1U6ZPTCCJ0H8aJD+7sWQRfZly7H4aJy77UTh8fuwVKivk34SQEi2NkWxC/jNVBUV/VpgbwSlTRhIwIBN12gmKtDA3LZoKmju2JZi8rFZdLGFFZzQ7tOmNLoMx/SqtTEZCyLpgATzNrD9Uh581oaxk8b688+uVZbvvl1vWR8XEDP6EMEmkHnA5ySNREC5T5CLn6s8FaUAqI+u8y0ZJaikWIs1Lws9OOBi2L5lG7PWqO/ebPPOARekanitnig5UNUKdf8kyEQHw8KMJp4JyBrMeaBjz0hn3ydl6WukH+iJVRCarnqQNe6y56CavwaVdVQl8lVcM/HZH+u6fG6KuRWuxwdwWSLReSot8MdIP9d5qkr/r3eVcv3NkNQHl6HPPIbKiSJvUChR+ynYG48Ala2/DHFlEa7MGLgSoyHT4nYDMCyQ7EYaUOrTDGamaLyMrEClSwwjBmyKbIN8TT3fPSYV/WzqVnOkAIcw1lwL44uki86z0gw0llYyx6QiIhS5wAZcXXy4DlA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4307dbd6-a0a0-4276-8d91-08d9e7f16170 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 15:16:55.9567 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB4282 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/cbs_jpeg: Remove redundant counter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yjCpmckY7Uap Use -1 as the position in ff_cbs_insert_unit_data() which implicitly reuses frag->nb_units as the counter. Also switch to a do-while-loop, as it is more natural than a for-loop now that the counter is gone. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_jpeg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c index 7d3e10fcc8..ae263ba038 100644 --- a/libavcodec/cbs_jpeg.c +++ b/libavcodec/cbs_jpeg.c @@ -110,7 +110,7 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, AVBufferRef *data_ref; uint8_t *data; size_t data_size; - int unit, start, end, marker, next_start, next_marker; + int start, end, marker, next_start, next_marker; int err, i, j, length; if (frag->data_size < 4) { @@ -144,7 +144,7 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, marker = frag->data[i]; start = i + 1; - for (unit = 0;; unit++) { + do { if (marker == JPEG_MARKER_EOI) { break; } else if (marker == JPEG_MARKER_SOS) { @@ -226,16 +226,14 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, data_ref = frag->data_ref; } - err = ff_cbs_insert_unit_data(frag, unit, marker, + err = ff_cbs_insert_unit_data(frag, -1, marker, data, data_size, data_ref); if (err < 0) return err; - if (next_marker == -1) - break; marker = next_marker; start = next_start; - } + } while (next_marker != -1); return 0; }