From patchwork Wed Dec 22 03:25:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6022517iog; Tue, 21 Dec 2021 19:26:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgga6BrYiAYll/rUeOWcXie1R/fOzC6NzrKCbCoAKVk5sRiiDQMa/U/ceuqKI/t9abVXCk X-Received: by 2002:a17:907:7f0a:: with SMTP id qf10mr947902ejc.372.1640143575989; Tue, 21 Dec 2021 19:26:15 -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 z6si478732edd.554.2021.12.21.19.26.15; Tue, 21 Dec 2021 19:26:15 -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=QYRMYRh7; 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 7834768AFFD; Wed, 22 Dec 2021 05:25:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F418268AF8F for ; Wed, 22 Dec 2021 05:25:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VCtztogrCXUtsAGb+GaFfbKpSCVwkYP2Y/ntuvBQex+5yr0gggGRCjTFtYQlGbRblWr57RwqtJJssT9xnwmzmDs7ONp+WAlYMoCPO1vNcTS7GE2lw3DsaBZEXRRTwUrumM/ONj/ps8LSwxLYRIupeyVyClK+zu/QJBs3FjzeZw1AXb/LFDsXa/RzSdgvgFjKZFDb3VvQaOqDG0yJZZkG3idhD0nbFq8DlAoAPbd4NRO699e4FTiDBp9xdwJsLgesGvWlGh1cH4yiYrEEsiVSpWy95huP/9/q8ueoo/Quov+M5wflati6hNJ2twTC4HToPEzwOxvh9FqBQVH0Pd0a0w== 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=TqAiBDQEhibqbrprylJgW2Qq8gdgHyVjPCIp0VZlKl0=; b=erpnWHGEQuvzqL5a+6XpGX6st1KWmq4LA3sh/d/IM1HZ/IL71HJ/HsMklQjL2UEzQ6AXmtPAISJD1dl12v9iWdI8j2ePYdJeVVWyKVqsHJ8XP+FC55hTI89QW25b1BS8cw5SoX84Q/Xah6ATDNhf1Llda5WTb3mciLGHnIcEtALRNaaF5X4kXcOnEelaZVifl+saKahucq//kITmogDUdEJtLNR4WjIps7FysS3Rn/uPJo3DZK4u+qRg14eao6sMJKowbb97ige/dQBT0Vc9934XM8giNGh2TyYBfHejjazNWSRZaCmPyDxRLQ8LQtBpG8RWM+k8ipuFDixx84xWUA== 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=TqAiBDQEhibqbrprylJgW2Qq8gdgHyVjPCIp0VZlKl0=; b=QYRMYRh7ySoASdBF152v/P2UePDkTl6cEeV5jL4ORK9ppTKWAFQyrm4EQxjeJ2qwR0YezuYTAmH6veMBs6uAyOOGURqDw7OBT1iZOnQd082ueXzoyNY8loCgG02sqG2iLxSXjojrK7aagHR6rwUqLrf05I3SeD08YAnsoolGyJy+naSBm+OH9OO05UWxL6/vgS/10ttUAA1xtjEkf/S4cXh41fR0uOgw6QN/K95v4lu4dd82UTGR8LvsPCi3d+mzcFEWJzWv245Wm/+YF3lh2ym/adUXQuq5RtkoC041QP4hK2nPxYMTlnu6mToY0GY54ihUI8QnlyQwqXUD3hBOUQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4104.eurprd03.prod.outlook.com (2603:10a6:20b:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.15; Wed, 22 Dec 2021 03:25:28 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.022; Wed, 22 Dec 2021 03:25:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Dec 2021 04:25:06 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [r58DiLIbCEj0LrFZrvS3rEXIDfxtLmiC] X-ClientProxiedBy: AS9PR06CA0323.eurprd06.prod.outlook.com (2603:10a6:20b:45b::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211222032514.896794-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd52c232-cfbf-4677-2f94-08d9c4fab34a X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4yb2cybJNudDfGQ0qijppvo3vUkeYervHrfPVo02Pi2XPZjE2cgJOrrLyCeRjCvsgplUZMNjve6z9y9ck6uAHj1TQ9GYFtZoE00xsd37VK5jRWe84HBU3ae+5A01mJ6izyuSx0/NiNKxcFVbw7YxkAIMvVI2WolG/0FQH5j0LMSJiGODcbTxibHtK2iDpfziyQIMzrkkG1A5kb5CtG3TQzm8BDvXUyJx+SA2IHi89RDq3v0VqPsOA+spGIE+RpwCrTMUJkyTbQlj4koTv0Y1vgUfOUuDvF6gEdSJFzLFZOmz446F6T3rQNzlbkIipQih1VecEJ0SyCjhaZh9v0gcAIDSIUwmOWOxghQspFLzHDr5Nix52hotOpkSI3yEAVlVMuZ/7n0pU55aBcrcTGW/4zvbadU+fWnhIZJJxc3rPxUjjbBrX80U2I5vDjqq6UFcyuJVQ7+8tYt8QuyfdGs3ujS4xPSkLp/aQvGj1lRAXwh0AlIWzVrGVYzRpUXkt+dgKipqPyn9qkD6pfcePK2pYecp7PO+jH3M5O1Sb6qJj9WwFdmpRBVQvzf7ndJH0b7LkxVGWFKFw5wgBaSPCYkIHE7Oayga5bzs7D16D3JxfrtkzbkNbr+j2Yo1lfFbtWZRo1sY5W40D8TDG6q7kKuakpDcZCrqAqi92M5lKzeRWnjas6kvYQmYKjfPILC7N8ANr8J+fdhjjfl8OXipfKsxZ1Xwu5aIb+WISOgq+YJVfGnpMU4b2zhJXC6e5imJKoRVvt6 X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2k/GhiKc4ahp7seu37mj5rXwn9bYNGpb79RYKzt7AYaB5CwA814QeIBzGEsQROY+9iIBdVOt92OW7pKZE/IEIl/1ql9Sv6CuTb/kGYHCU1P96GwGcvpzGlUxuvtPXzYU/pskwOCwq07eaKu77m+I//aB6sP44kcj9wkM3VSMtJVQp7PS4bLUsPQ6dViwV6uRiws1RE+X8uHVreFl0qn638Whijrb3nzasc3Y6foBuOl0uqxvChRPIAT9VzOFky7Hv3CSqRFQ0RTdps7v+pEuS3jpdkea5M66lknX0427udW97J5I21sDbzXs01MZ7RKNCZRJzi8zA1tkA5yM1F/llR+cQjc/OVlpHTuPvgy8SXksOLpR4FvC5w5PAbFlspSKKFqSvC8MlEMz18oeFZJRV92I8mnq1U9WfWzX4brRPmiQYPiFvVi6feajU6GaVB7oBmuYiH+ytOc/5xCYwRDWuw/+oYa/8zzopF3RnC74o5fp4pV7hjdfDeIsgMOhsob1dVNgAv26KBWnxVnDl3bXXQ2k81PeRDo/6ekK+WcrWcv1krtmpRABRTslePwzT3JsPrLVsYEZil7CQIbQ8P5kcw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4SqA3Jq/Du+8MS77/8Yy9lZkcb7eTyBhX6hNBq9zuT+bCwfrp/yr5O5ahKAZi4uOZBpZn40mxvZXpOiWxIl2O5qbNC+3YhjraUll0QYqv3zfaqF3CxfaFWItg5tXMerp40Dpr+QRIUGyhGDGwlRMq3BntT/vAdtXiAuEwt16JP8IqQFMuSSjuxjW5MqyQCI1cWNtkeBB0076G+jCNjmz52fq4YD8YB6EWMGqVoJfebnCuOXj8USPFU968wtxDluzcw/BeVNz0F1EXJuUlihiS0ElvZsm0O1x3+CrU8WVXjTfQoSWF9/aZlci07xhgr2ezHsEwlxpI5chbgP5Rd5TgcCZ36TTn8TQbeWqFURd9NNdU8wfEQtdaKhhZrrPL93Ugo5A1uzQYiCZ1GW1oVoyCbjMBT0NQVcZvTajMIH2Wu4VQcvCnSy4cc6yWCdTrn0xU4QuEUhygWqiESXyjY/rDAlgh93sKAkALUvHj03sFIIZxd29ApQLOEGZGhLRC0sWklSFLsRN46l2MhAjuesw16POaTssPzWujjNL2rmiqt8zEcffmN8MjHbSD+0KIebJL4gbqWVkyaydKGpVUMfuAhjxUEAPIfqO5jsDc+3pkjWEgZyhjOh3Hxd1Rkvn9xkNgc9C0SInhVTxz9KnnM01Wz5bXLtulqNKnF6Zx9IG6Zrj77VtBFhQX9gcU9dxwkqdK1C7xrg6eq9PL0e6ex26G6udNDBfM929GYFr2G4tVtTF9YjnlSkcbY5wdYrIRBx7bdnmzjREEWOaEzIsPVmUGcwbDiTbqv1PkwiBWd+nGO3Vs8a8eEtedL9Js7VsC+6ETu/K5WhaoBGpJePB9lJWayrtqb1e1MaOS3VEP7g3SxnhgLApsrvF0S6huPmTMIWVUeqyqe8MH9mhd3j//mDXZ3l10LpMPL+5GHxb2l17cqCVGqzlIvcr2aRuQ/QmUzbI6pqkAmPnIDYR4Eq4xPEONA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd52c232-cfbf-4677-2f94-08d9c4fab34a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 03:25:28.1299 (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: AM6PR03MB4104 Subject: [FFmpeg-devel] [PATCH 06/14] avcodec/mjpegenc_common: Move code for MJPEG/AMV to mjpegenc 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: QXk6HzkAJEpW Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 4 ++++ libavcodec/mjpegenc_common.c | 14 ++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index b682036f87..c1b759f7a8 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -78,6 +78,10 @@ static void mjpeg_encode_picture_header(MpegEncContext *s) { ff_mjpeg_encode_picture_header(s->avctx, &s->pb, &s->intra_scantable, s->pred, s->intra_matrix, s->chroma_intra_matrix); + + s->esc_pos = put_bytes_count(&s->pb, 0); + for (int i = 1; i < s->slice_context_count; i++) + s->thread_context[i]->esc_pos = 0; } void ff_mjpeg_amv_encode_picture_header(MpegEncContext *s) diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 0c6a98c394..8046e4b8f7 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -224,7 +224,6 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, { const int lossless = avctx->codec_id != AV_CODEC_ID_MJPEG && avctx->codec_id != AV_CODEC_ID_AMV; int hsample[4], vsample[4]; - int i; int components = 3 + (avctx->pix_fmt == AV_PIX_FMT_BGRA); int chroma_matrix = !!memcmp(luma_intra_matrix, chroma_intra_matrix, @@ -235,7 +234,8 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, put_marker(pb, SOI); // hack for AMV mjpeg format - if(avctx->codec_id == AV_CODEC_ID_AMV) goto end; + if (avctx->codec_id == AV_CODEC_ID_AMV) + return; jpeg_put_comments(avctx, pb); @@ -319,16 +319,6 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, } put_bits(pb, 8, 0); /* Ah/Al (not used) */ - -end: - if (!lossless) { - MpegEncContext *s = avctx->priv_data; - av_assert0(avctx->codec->priv_data_size > sizeof(MpegEncContext)); - - s->esc_pos = put_bytes_count(pb, 0); - for(i=1; islice_context_count; i++) - s->thread_context[i]->esc_pos = 0; - } } void ff_mjpeg_escape_FF(PutBitContext *pb, int start)