From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9ACAB479EA for ; Thu, 28 Sep 2023 21:36:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEBFC68CBE9; Fri, 29 Sep 2023 00:35:45 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2106.outbound.protection.outlook.com [40.92.66.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D478D68CBDF for ; Fri, 29 Sep 2023 00:35:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ldoOd0R/TXL5mdAFZJ92I8slPlNBE4Lj6MraHfOLEyGhoc2PDr1f2rTM/uRoRo66PKdaK6VW9Q+x3Lvvzxj2GaAILRRaw0Aon6LnvJEuUxLGLGAg6XxsGmxp9qNZ08DRJ7pW0oEP9ySd5x9c7DczVCvZHta8mPIaczY55T0pSwdiQM8VRgOlin8SKMMR2ca24VkFPaUcugWqIa48zHnTvg+wzHhC0B7EXOsFdHqUe8/WzvAR2eDLCRAzfdJua6EiNHZAdynBnRnthm6d5jRhNy+cli13sejZEtLAwwp0iFXhT2pH5nIeCxzII/J1s/IkJOMd/8394vQBKdj5HZwu/Q== 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=4gvSxc1aF14CRRjgaVjARmmi1OThZBPtFFmD+wvOH1o=; b=AdVP/lKFHCI9QqsR5GUFO2Oqqy8km66BS+EuxPvPC5i8ARVevMJqcBSPQgk/XZ5XHvpXchDtEG0sOv64dOiXiH76J70iB3k0DntlZxcMy8cUh4AuISBS5VS0VCyL6sHg8PIBGr9vprK5lcSYVDvJuVhI7qLr2OeQc9F2eqbYv60agYF/dC6s77U9xrI/h2pxvz6btMVI8ksUF+n3htp2TF9waIhDxxQ8EMJnHuBKBPeZOtVf2ronMnPY8KJIdQe1Lv0Xu/IJrRyCF3/Yb4vOGQEupkHBGnn4VpJTQmR6g24mUelXPlK9u0otGaMpq0VaMqAncOOv1RTYHzPLc3GbDA== 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=4gvSxc1aF14CRRjgaVjARmmi1OThZBPtFFmD+wvOH1o=; b=mqqrE71fr2zMcIOvDafJQqI4GkQQMUgg0cp/vapZNN7YTwo4CFJhncsPUKbmnRA7JofPETTocKqx3rC+vBMtUrfb0K8MVlLmWV7Gdl4zVOvu0ad2llzzVxJCJf3Xu0oRtkHrXFbxgKyYBhHaHHJHKaFl/973mZzLS14LxZ/aTK8cdzfbR/LXvCE/2qoCth8XMRdlAebnRl0SJl+ilTfb0Znpvo9JPPLgaiOKORpntMLBOOybNg1LDLtZ2nxjYTSq/4g9mx5/KsP8ltg70Y5tWAKcIPfxgpCloNonkjCjljcWHmEh2h3aM2BHauxHKkKuoN0Fae+Xj7p/ZpgxmekhCQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rNtHIl9tUU34osjW2lb5k59PajFDK7qR] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: bc77d471-386e-434d-5519-08dbc06addcb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1KKDI/hgBeuKMmF70HVu70zMJBwNA3QTlMkSFwwnSl/b5dbBJbRTxrshFgzYogSopyvXcZ6jwta3Kmbkgx4ybiMMkhM5cJoIlaL8YE8F8XxJ9Jq/PvY78jthkSK9RJKYkjUi/lV8TVYSk+ZUaIWiTrk0aNluFiefrQcWxOHPEXkEPPdJRz16P5Ayhtn8XQ+B2ERw0P2b6bRYizcq8I3p78QLgtDlFGeB5tpMHAkRh8lN+JHlwf6sfZO2GUy/f3oa3DkxmgJMODL1wOq2iSY+cCkJZsTbsJRsEltYxvNN8MY+1X4fWjvU/GVZ9nngQnr1HIGxrT+YSfLkEyLuts7lOuc4PG8iWT3ZLgNIPsTuQCZpB8wMGhJSyGq+3Rg1BB5esUUswb7Up++IbjvAycE3Gm8Ic/Nd5MQ7pc6CiRRKInkMegnCllCPW8GutHYV+8RM+ZPC056PxaNMgQMjzAiQeJyrpHqHxpt8p5Xz0sXvQS3ypit7b45s8ISR0hc5rgkJX2NzI0UJiwJVnT9j9eK3VUWf49e9SUE7sF9mKDXfFNlq/cdEMfjW/rf9FNBeNY+ZxsSuBaZT0OQACfL32pnZ8O2TI6BsdIi/KqBV5/yHcWZNhyQUS25EPR4oAARJYAwt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fUSwVJFMJDEnNzsvFfcu8Nf4MtiMOLohmocw6lp0Koo2/584re+Jem2pI6Ts?= =?us-ascii?Q?Icy1j+mqHAvP8AIDR8pqeHGMk7bPTGbw7mi33SW2vm2YC1Px3LQEamz5UYg9?= =?us-ascii?Q?NCKvzw6/XPFx0d/NLB9KvWhESCdnSkE6GnRz6+c+SFvnX8HjW/X4R56IYW7W?= =?us-ascii?Q?ZNZj1KlY1k+GvjxcsuCUb9duTSOTc5+07jswFl+qiZkc47BVXneavEukLgy8?= =?us-ascii?Q?5Vu/Or2Cq50Tv/NB9ji+SsgjHV7VBxXC2mi7hDViYbxkNhpH3t5aJxhk0SLc?= =?us-ascii?Q?DeU+TmkJxnRO9ZkLokb5SKbcOTDtF4E1ZSujKPXfMTRRYDsXXhxk+5Urfn22?= =?us-ascii?Q?R66r3WMXGIjqXYa5ueIvBDMGUjPqyoToWbjgAJCWDtZ9Xbpob/h4KOdUWQXK?= =?us-ascii?Q?qpabtsuESHpUtPMrKJ2QlLwO/DwngrN6a76qwGr8dDSpUWYoEv9Z5+893fB9?= =?us-ascii?Q?uoTzfBtSPH8noo1RxuZfxV5PgMiKQSKfb7lNqvYihoXrmL5u7QT2LarOBT6s?= =?us-ascii?Q?LV8XEypizA3HzyuGMtdtFuLWirN0KISqy0i5TcevwBkP3HwDD/A0HSpoRcH3?= =?us-ascii?Q?lC5NaIzBw3dbZpKTUAa9KIctpqUE7jaCL7HxgvmQMsHaYDPxyLYt4+Lv4bvE?= =?us-ascii?Q?hfc2esmhlFR5undinU8hzG/NwfHmnFB9pRzgvzis/P4MR5h9wk0kZJgqnyMM?= =?us-ascii?Q?cRtuOw5YxQhr8unXigI5gvNZkRSEXPsWJOSMK3NnzfGOUo+FmQhPgdGuzWeM?= =?us-ascii?Q?WdHsnneZ3zq7msNojmILWj2Yx8ICCe0xjtAYpHiSVLEkioOa8sdME/TEmrpG?= =?us-ascii?Q?pJwLPpbWvgGJ80Qn2/TEgOqCXsdh5kL1IUFTKF0H2cF14td2NL/IErrKaHw/?= =?us-ascii?Q?blKFqYPduabCYSHBW5HsDEbT1jWY4Ib8va0enVHFbTl719Tn/9DZaScgF5i9?= =?us-ascii?Q?fTNNRPbNAg285ZOoJzmnM0p2Z7kyLJpl6Qt2z1dSdjcUTBEgwI/ptwJZGzwo?= =?us-ascii?Q?rhUCg2a0/KSRMSk7D+lExTT3/NaB3RHaoIal4pDY4e90X3qXbovYRuRf6mn6?= =?us-ascii?Q?4KasyI8C+OH92gljXZs1M11GObzux2Px6I0qXIzSMsFg5A4w2i0tNNXTNGW1?= =?us-ascii?Q?AYej7pyZJFKqK4OQUuHjnwpY4kDRkQJFhv/QjsftIGvWCv0i4RMIntKNouEb?= =?us-ascii?Q?wjDkjuyx0tj8JxlgTpdhc8GyzrM9OOrTWPJhSQ4syApBFkFTQoWdWDIkYz1M?= =?us-ascii?Q?HnslBiHq2oTDyBTA3MYK?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc77d471-386e-434d-5519-08dbc06addcb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:42.5666 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 10/14] avcodec/roqvideo: Use void*, not AVCodecContext* for logctx 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Also stop setting the field once per encode-frame. Signed-off-by: Andreas Rheinhardt --- libavcodec/roqvideo.c | 4 ++-- libavcodec/roqvideo.h | 4 ++-- libavcodec/roqvideodec.c | 8 ++++---- libavcodec/roqvideoenc.c | 8 +++----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c index f9a3c8e083..ca8c8de967 100644 --- a/libavcodec/roqvideo.c +++ b/libavcodec/roqvideo.c @@ -111,13 +111,13 @@ static inline void apply_motion_generic(RoqContext *ri, int x, int y, int deltax /* check MV against frame boundaries */ if ((mx < 0) || (mx > ri->width - sz) || (my < 0) || (my > ri->height - sz)) { - av_log(ri->avctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n", + av_log(ri->logctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n", mx, my, ri->width, ri->height); return; } if (!ri->last_frame->data[0]) { - av_log(ri->avctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n"); + av_log(ri->logctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n"); return; } diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index 8318b6e5a0..2c2e42884d 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_ROQVIDEO_H #define AVCODEC_ROQVIDEO_H -#include "avcodec.h" +#include "libavutil/frame.h" typedef struct roq_cell { unsigned char y[4]; @@ -39,7 +39,7 @@ typedef struct motion_vect { typedef struct RoqContext { const AVClass *class; - AVCodecContext *avctx; + void *logctx; AVFrame *last_frame; AVFrame *current_frame; int width, height; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 6f2e48d2f3..bfc69a65c9 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -72,7 +72,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) xpos = ypos = 0; if (chunk_size > bytestream2_get_bytes_left(gb)) { - av_log(ri->avctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); + av_log(ri->logctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); chunk_size = bytestream2_get_bytes_left(gb); } @@ -80,7 +80,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) for (yp = ypos; yp < ypos + 16; yp += 8) for (xp = xpos; xp < xpos + 16; xp += 8) { if (bytestream2_tell(gb) >= chunk_start + chunk_size) { - av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); + av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { @@ -114,7 +114,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) if(k & 0x02) y += 4; if (bytestream2_tell(gb) >= chunk_start + chunk_size) { - av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); + av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { @@ -169,7 +169,7 @@ static av_cold int roq_decode_init(AVCodecContext *avctx) { RoqContext *s = avctx->priv_data; - s->avctx = avctx; + s->logctx = avctx; if (avctx->width % 16 || avctx->height % 16) { avpriv_request_sample(avctx, "Dimensions not being a multiple of 16"); diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index c25aa39b73..0933abf4f9 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -911,10 +911,10 @@ static int roq_encode_video(RoqEncContext *enc) /* Quake 3 can't handle chunks bigger than 65535 bytes */ if (tempData->mainChunkSize/8 > 65535 && enc->quake3_compat) { if (enc->lambda > 100000) { - av_log(roq->avctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n"); + av_log(roq->logctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n"); return AVERROR(EINVAL); } - av_log(roq->avctx, AV_LOG_ERROR, + av_log(roq->logctx, AV_LOG_ERROR, "Warning, generated a frame too big for Quake (%d > 65535), " "now switching to a bigger qscale value.\n", tempData->mainChunkSize/8); @@ -972,7 +972,7 @@ static av_cold int roq_encode_init(AVCodecContext *avctx) av_lfg_init(&enc->randctx, 1); - roq->avctx = avctx; + roq->logctx = avctx; enc->framesSinceKeyframe = 0; if ((avctx->width & 0xf) || (avctx->height & 0xf)) { @@ -1057,8 +1057,6 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, RoqContext *const roq = &enc->common; int size, ret; - roq->avctx = avctx; - enc->frame_to_enc = frame; if (frame->quality) -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".