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 AF34646CB5 for ; Tue, 8 Aug 2023 16:40:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29C6968C81B; Tue, 8 Aug 2023 19:40:00 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFE1068C780 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GXxBT1A2j0tYD0fjBE6TAbnQZn8iZkxd2khYMSV9+MlHTCTOX6G9DjCzRwPZzwPiLv51Eu0EbTIEbYs79nO6wRsqDnpIyYcN04P2d+01rE1A7Qo2eKOK6JYX5vvrN2ofNxTFSmQHbrX3PkRsES+TWmQK8H0TvvMWvkw+nR7HvUjJDkRdV/C+QYXGUuuUCkUYhMFJRs5cRSHvQvoZl+4paZz+tJ0RPK5n7n17Zlcjc6DZ0gKHcjQC12qPKGzxZS4SsWJtEEL2lZj/QlaGQmjwd+d/tf4uPY+c2YaQXlLHGP06Fjc0ZzcHL5xVQY1KkxidQHxLvMD6WS7mPXUmllJBuQ== 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=Guwb3t8uIy2FkP1gYqa+7TDdglYDWSmyRFNXpFNpwk0=; b=Oxc/GsmU9YjfgWMt5hpZo3Ch3r4Ib1fXimp0nliMF2v19qtGq1lNdozJBC5kw7l5FEZZ++m8wEF97EbOEJjat5ZTecBHrngL7IXhJOOuDvDuZ55IFF6mJ+uv0rhMETATaU39Q8DoFqXQJziUYAXJy4gVGkt2eqQrMSxTfm0iuyDe7/RkSH2Pl2EfhT/1jSU7da0pp6XUzPL8C2j9YgPkpn7JSoDYsCSYExnnIE6CqGcdclBlYFavYlQSfYZ8sbZtVbW0tu1cM4LcAeLkxHg3bJ3lLJbPlcS25fLRcK4ax7QbnjlpIWTgyHBHeLPAwRGfLvaVK/nhtn+XHJUXyKol0Q== 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=Guwb3t8uIy2FkP1gYqa+7TDdglYDWSmyRFNXpFNpwk0=; b=hfbZomVGSwN4U0KsuYsV3/jVi6NVGOMft+3UutdIa+3Df0hf+eZCadUxWsmZv8NVvExeDJLY+8AUxMf15a9Xq6xBdvkuXx1S0z1GbgHdFW9Y+5FRezJI85hSfVpBk/so/2evphzAbdKaj6qmot1XVPFICWw3IObAkZ4lrRf/OnqS/RwiyjexScUhTQKHtOKY12/XLWGV0uB3M7WlrHODAKoSMm7KARYUFcttZBU/65B0ldsloT3KiKEi/8WJnb44VN3TheQAHR8htm0SUrzyqRH/3C+IQvkKfmaq0m4TKgGnZwELcWyQ2d0jPhQ9+FcKyZqb6gzb8ecr45hX7kLEZA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:48 +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.6652.021; Tue, 8 Aug 2023 16:39:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [BX6i7W40K4vDYTFQiPSqhe30cwk8RgM0PGPsiVx0fHc=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: 529fdbf5-b762-4b94-0faf-08db982e1447 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mmaq/Mhy8TAf/PrQ0Dzpn5q4WgDsUSQDz4hj9J0VJN2D/KUryEdptBW8OcVbXfFCuZJcycumZ8xDA6vDMt7Jrf1iz9dtuOmKimiScTXAV1FNl0413qElRwVzWAG3jg2ZcomwAC5a/9rscw3AOi1y7JSIxcXsHAm6xo6eCAMvXcI4nkmkmEbmQCNkdWZZxseCKjUJlaec0+3B77Fj3mve5xLct3di2viGwmo+rFb/yTtMq9S8YKIXLBlLzQVT3UuwdkMv+D0qz4lpLmj63CWGbakEZXc+isbWgB7ybgonhZogZTEPYjMH72QF98r/ifDJ13/Krg5mqF1Fj5kaAz158KnAzM6iwlMjMlHed3TIS8rRJSSSP/BM6aEw1jfxqMFGAqtUNAYOHVRIa2dY+J7IbSqSSSeLF1NfMDi4WRCEAp9AZ0XE8BAbvbHmFEbeSRPdj3aPf0aJf9WFYFwO6yThk3IYtu5+uovkptSWGoEQV5bE0ahhxNt6Wo8JMLvYf9ihkeleIMR1l1hAt+34va3GU4/979KQR0WRCNIiXkpwcTypi6vgJvpeFRgOq7i0gWeFGHLSQl/OnVt4m26t1DhYZgH/6xVs7KrnC38Vv0MPeklaxWzZFnh008qMH5L/zhrtdVWSWX1QuJqbfwkkIPbT0wn6yp40R3tdt2AJISGt6DNFaL2+B7ica3bB17Yn1X24/S2X4sOy4ZkK5aiSQ9ves30s+V4lR5mDbSiot2b/xOqEx6t39+NaRR9G57roUvcZ9H4baBXWlNqMXNh5+b9Dsg X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2XuZrr5WEyH+Be/uq2Y4JgKTg2k5iOtqOvFMzWMH27qeWV0bh3tipXt/XF4o5avAKJjEdVVzMJ8kczvO3GvQzyHQtk4LdkEhT+LCZ952ZMIHFzo5bK5lSzywuQ2PVagkPX3AuL4L1nPVM0OZlWHcn2DuIQjf05cWo0nQkAq8ybSR6dxT15jOdR8Qg69p0uT9RqKK6vGp4Gk2xcjF2xO2fLjjxvnTIGUybigR0ig5AcKfjTeVZFj1G1SaVU1s2Cqz+Pk8CRIUjhF6dqHuTioNxAAbbRooqW44yEkcsI87cU9tMLfV5HKdCx2zeHXfSBlEWpTdJ/oNNml7Cc2RkWf8xLRvu0YydfSqw5T7phzp8gX82Yd9OQIxt04yj570NMMQxF4VBABCXt7eUZoxnPj95zkNGQgLETBkwRxFBnhZXszA8CJo9wiqt9duTa36jqEcEOxi8+wNXsB3Eg/iWn/8pZEnZ0bYy0gFsCXYgd5LGTk1iMdVy7Uos1PwmRCCaiGW8q6wGjOXx5iBeI42n1gvJ2wUXGmrTr4MyQ0fLm14WyvvwYsAtKOLGxIINslrbY6GpqvWKSIbNvtRVV7GT2LMChGhFaKlzyUeKsXK83m+Djp+g5bfcg6iLPnrJrTEfQ9J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uLytL9qJorg3wmc8lKXZx1RQ3imcfq6R7qc2B+/3Nt9oekt1tEqI1BabL7oK?= =?us-ascii?Q?rN0Nu80vqVDhcCMK6NGygVSBVWavxnODW9RSwAg3z7+qdLisdenE2eu5Sk5m?= =?us-ascii?Q?9DSNi9kDtzj1yr9+ySCKDk6wquI1IxTDtM+lNmsv0yR76CrpNjWJyimoL2W2?= =?us-ascii?Q?jtGxRvlNMuJaiQrwlJdSf5pviCg/+8arGvmkIrR+i3ly176/9wnrmd6oHFr+?= =?us-ascii?Q?4HbGmLFgUYTCJGwrA1ucVxirKtAf/qGwSeYGboWvfa3/j9FMmteYfegiUKwc?= =?us-ascii?Q?2Oh1Fh7R9x1QIDuxihP4pSjd3i2G68ka9fUF+V8uSQSRXttiMJDs/mHvJaVj?= =?us-ascii?Q?iRDvC4a5RbTRoay4VWlleKiVUIoECE0Ta113ZKAIJWwt95mXnLZsuegBpT0k?= =?us-ascii?Q?Swv9+wbllJ5apJmHjV1u8HJ3hhxtWJHfdYAHiZXBI5BfrCAY61FarQHNtTr3?= =?us-ascii?Q?dSgPtz0A+Hs7oYBncoEbmwMRpcWP8hSvgK7/3rxzt3LWxwRRaYI+ryDwtDLg?= =?us-ascii?Q?yibvfQ4rCvQJ6gOncG/bD6WZsoP/2kRkwEbn3MzjGIQwTxmu7URv35M+11kI?= =?us-ascii?Q?7m7xugj0eR3TjQfzSZLjAJ2yekR6n/Wyxf28FA0EUOef2zKjRicgMAP2OPFJ?= =?us-ascii?Q?Dplp7gRwJ0yXNLuag7uqXSjnmxYsVuslrSUozHcwGW3E16mBeGn2zZNyWCCi?= =?us-ascii?Q?Ypc6gqLJ6qqsMFuF0Fame8ofIQFkF2gupI/WP4vYf6rEQBOKZm1qiYaX60lO?= =?us-ascii?Q?C5FAsYnrruX6mOH2KuaDOWo5Thmt+T61A8IrRDTkRdv91aTdyIsIhpy6Xx6T?= =?us-ascii?Q?8+5JTS4hFFxuIaEH4XrU1SFa5HM0Bjqv2GMLltL+Ox6gZzATXyOdNrrFb09y?= =?us-ascii?Q?6OuMkSOK9ieTo6mLgWEREz+tPbFWLYoiE215antqEBjB7jnTS3CK84KoVyte?= =?us-ascii?Q?aWB5LfdKT++B828ugta72P6Sb+YfqZYW6nTc8Snz0rYi2Fx/uIiEQYKWJ51O?= =?us-ascii?Q?Ix/pZDVHNrk2mL8AYvk1jiUi1xL/zFT1cOONJifeq3I0JuYJEE049DT+4g3R?= =?us-ascii?Q?Ze7Rl79BIhGmn064CkCqMuR6K2xJQgSkg5qIE0ilLSqAghP2Ca0oBqfGyHnQ?= =?us-ascii?Q?0n0eCVK4kJNYnxm+3DhD9KMBZJOWDM+VhJ9Kibg9GSVJm7EZZ36aJVlN070n?= =?us-ascii?Q?BuoKeMhQ4cMC58w9Z4CebOPoWEzYtTs2dYJHAw3RdwruigYob/AFLqu/i7Ih?= =?us-ascii?Q?/68jrvbhbcELft8tLKOp?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 529fdbf5-b762-4b94-0faf-08db982e1447 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:48.1410 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 11/15] avformat/dovi_isom: Don't use AVFormatContext* 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: Pass it as void* instead. While just at it, also constify the pointee of AVDOVIDecoderConfigurationRecord* in ff_isom_put_dvcc_dvvc(). Signed-off-by: Andreas Rheinhardt --- libavformat/dovi_isom.c | 12 +++++++----- libavformat/dovi_isom.h | 7 ++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c index 76681b9451..c8fdf566e4 100644 --- a/libavformat/dovi_isom.c +++ b/libavformat/dovi_isom.c @@ -28,7 +28,8 @@ #include "avformat.h" #include "dovi_isom.h" -int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size) +int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st, + const uint8_t *buf_ptr, uint64_t size) { uint32_t buf; AVDOVIDecoderConfigurationRecord *dovi; @@ -70,7 +71,7 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf return ret; } - av_log(s, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " + av_log(logctx, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_profile, dovi->dv_level, @@ -82,8 +83,8 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf return 0; } -void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], - AVDOVIDecoderConfigurationRecord *dovi) +void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE], + const AVDOVIDecoderConfigurationRecord *dovi) { PutBitContext pb; @@ -106,7 +107,8 @@ void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], flush_put_bits(&pb); - av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " + av_log(logctx, AV_LOG_DEBUG, + "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", dovi->dv_profile > 10 ? "dvwC" : (dovi->dv_profile > 7 ? "dvvC" : "dvcC"), dovi->dv_version_major, dovi->dv_version_minor, diff --git a/libavformat/dovi_isom.h b/libavformat/dovi_isom.h index 1526164319..1221a52793 100644 --- a/libavformat/dovi_isom.h +++ b/libavformat/dovi_isom.h @@ -28,8 +28,9 @@ #define ISOM_DVCC_DVVC_SIZE 24 -int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size); -void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], - AVDOVIDecoderConfigurationRecord *dovi); +int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st, + const uint8_t *buf_ptr, uint64_t size); +void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE], + const AVDOVIDecoderConfigurationRecord *dovi); #endif /* AVFORMAT_DOVI_ISOM_H */ -- 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".