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 91CE743A26 for ; Wed, 4 Jan 2023 16:26:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F7C668BCCF; Wed, 4 Jan 2023 18:26:28 +0200 (EET) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2070.outbound.protection.outlook.com [40.92.58.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5124268B6F0 for ; Wed, 4 Jan 2023 18:26:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e/5a3gj7qywffXkFor4CRlFIosuoLXmNzbNXMuGoS7q52xOxHgpZ9IYlN9HKfmsE8Iht2wZiaYOaps073daqtmkAIETZH8ImiDzmwui144NMJ045UPZhVkEMe3Y5Fe2QnwPWMHETm6pIPPY6SwX2Zimbv1RlZZQ7QAu+De5nMfdCCiITPYPwic7RV1JcuXEGsEvTfvwH18CG3qjYpjOcn79jwbzGexeApgP/EaJ0SZtde+uFbOHx8jHS/Jj3aVK4MNJds7FBLq4oD+cdjOhQPm6JX207PpP3AKVWkf2QUFAUCI1aY5iyixY2ukjOptNs+WOdnPG627vidEbjlfFrYA== 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=nMt4GSE4Sg29UqTvfAoDOETlHG+20hmiGNDb49/lb6M=; b=h40SYiRHCqr/47tXo0pYvYEGHT4xTZXNPHVlGgMpWjvfo2IzSoQDZsNz1fIoOGnG2uv85ims/1J4iTZqmHj700qH+7M+qQn9rDtdQZYRKF0VSR5my5ZHsiM5KpAF1wdasPUpDsylws7B+DX4qdJOK4A5stJ955fNYxiAlmrbXeFnmKoXG5RdYFuTgMfLm+PxXyeiVkn0MLzhwF0C2YxPvcT9TGMvgsTxMMGiRDCe7NOrgkh7L3slkFM++HU009Gt0ltL6wIUU+E1hbdZV15FgKte8oe5raq7i3XrHgL2VmUH3QWxzN94aYQBZhPld7ccJcn/nqsUlzoysAwmyK1oSw== 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=nMt4GSE4Sg29UqTvfAoDOETlHG+20hmiGNDb49/lb6M=; b=Ihyzv4aDOS5Crsu+TCe0xYTQkR3WO80O+Uu+WTXzTAGS3Y2oZCj0acwGST9QCkQ/fn1TN6QdQbyKd6dC9ZiN3gj5HZ1iTIWevQp/7Gt0KdvNsAFwEvqhlygLw+38WBTD5mdYc177DfJ6GrFKH4eFuj7qEd1924ELbrQnRQTxjzfvjEMkHYZsR0eW+8nc37t3jPOGsBLH2zembsLjgV7j/RK2+yKxLnLu4t1m/bulZtXwkpscezq+Z5wDEPGKJj7mpoCsJfxChR+eDcB9uEs1fJSqzbYcic7fWKTG9CXMj64lfWtKhdqizAhj0qthHq79MaXWK1qCvw2GfdX9SDQF3A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0432.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4a7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Wed, 4 Jan 2023 16:26:20 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2%6]) with mapi id 15.20.5944.019; Wed, 4 Jan 2023 16:26:20 +0000 Message-ID: Date: Wed, 4 Jan 2023 17:26:48 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221127170351.11477-1-anton@khirnov.net> <20221127170351.11477-22-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20221127170351.11477-22-anton@khirnov.net> X-TMN: [dbe+5SSN/nq/5sNzTeHYhMDKJfPVplPk] X-ClientProxiedBy: ZR0P278CA0138.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0432:EE_ X-MS-Office365-Filtering-Correlation-Id: 373a2d28-bca2-4a87-74f0-08daee7069c6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 22wEOnFeFQ/a6EkodUeu/FqArL48cz4KAmJXYGBPF+RYAsTykq9MJQ5YJd3t58tRTgXRfBlAEZm3Y+u4Xa3o9eKZ4POoYdVJtxjKgh0i8kD5rtCCFFiQ4mCuDPqfyJYmcSxRA3Ivz+Szav5nyx5cUD57oto0Zcjm8zYhOgCkEnGo3Kt6PzOppyim079CMu9aVKdWMFUu2ssDoXiq9EmBudOtK20/rpKqzlre+xYISfCoMtNqKUA7189qSR0UdzNcWKxoCQX9bD+qKeBkxTXKgV0HkZXI6FkUDN2A8BYnZcBI14F0B+9nUyEvqthKK7L3kUhmHzmiY2rxnyETXTW+IywGfaVWn49DkTAQ0RjcVfZsT7Iw1qdJoc86873QI2IWrufDBOFNaamZXzQc5bR9cR0DWvoXMm65tdjzPy36vzrsuAiv/waNj43qAJHFUU1v/cjYxw7vB2lWLh34opB5uY9V7aXsM2Z3p/tWGKa+eof28fPn+g2GKkyUqPbry19butGXJi4wNpJHHiyKKpnR5S8f4oNys9tzU7MljbF8eNe/SQeT8NR3yQKBeyiRtSBma42kg+GwaeJgDtMsEGOWANhsCHMBqGFl2WiLbEqKYxhAvsRVARQDDE8S89AVwvhIRnDMTfcDRyMG2edGUNOMThB2rN8OT1vdNBRXVBDihM4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UURNNGcyVXJIeUhVR0I2c1V5dkY0VHZEVUhQK1BNZXVhUjU4U2VLMWlYTnk0?= =?utf-8?B?RmpQTFJBbzNsSjVOMm5pY3lxQ3dCUTYvcy96cnUyRW93aWJMbm55UVJ0T2Jq?= =?utf-8?B?Z2MzaVl3VVFaaTR5YXFsS0cwZmNIb3d3anRvZDMvUUJaZkFvRTUxOWZRMXFI?= =?utf-8?B?Z2VWNm16VFc4K2J6d21XempNTm52cy96VXVFckdMd2FuZElsSUtxL1o4bmly?= =?utf-8?B?VmVhdnVSaGUvTlpuQklkUnpKK2VpRXQ1Mm9rejkwaktPWTFzZHRFcU4vOVpx?= =?utf-8?B?ZE9BZUV5NmtOMExKZUZyUXVaL1lkWnJUdzRPdlh2SGhWa3VnN1VMVjBnR2k5?= =?utf-8?B?Y0dnQ09UWnJ6bjNHeCtmb3JCUCtPOEwybVVEMFhPWUFIZS9aMnNRNjJEL0RX?= =?utf-8?B?NTRObHhKOWZVRXZpMkp5VjV1N2pMRXlmajdGa3kzNEsyY1lVdVF5QXF1QVlp?= =?utf-8?B?aFM2dStDNFU1bEdzdmdLQ2loeVVnZFo3L3FNR3E0L1VlcTQ3UGs4aFlTbDV6?= =?utf-8?B?c0FkcjUwU253a3crOHpjVEdDdHNvNnNjK1M2c0NQaDJzemU2OG5XdFdHcGI3?= =?utf-8?B?VHdodDRHSXBDNGtPQ1hzaS9WR0N3MGkzNEpVaWloaWdOZ2JRa1lKK1M5VUJj?= =?utf-8?B?bXpQc2M5d1ZGSUpaU0h3cE14YktreUUzUzdHdWsxcXVtYkNPYjd5QzE3bHJr?= =?utf-8?B?end1eitoMnlhZGFOREpPbEM2QW9ud09SZFF2SjhTZ2xyRHJTNUF0aVVqbkRL?= =?utf-8?B?dkFWU3g4bXdiWTBpa01JbkhSTXB4T3RQQnRXSGxQNXBqSjUwN3poeXdOT0ZI?= =?utf-8?B?VCtrSGxRRjZHZG5KbWd5L2krL0JYVkNuMXlpdHlPaWlIb1U0dGFYTmYzNy9B?= =?utf-8?B?d0NFNW5pUUcvSkJwaUlKc21CbVcySDRvanJXYVZYM1p5U3JQYTBYNWhEQzQy?= =?utf-8?B?ZjFwQTE2bHl3OVhraFVDcXBvZ0VqNEgzRGpzdnE5eWFVQTR4ZTVIOU9XdURr?= =?utf-8?B?dnh6cVdpaVlTbGtBZ2FLYVdFTWd6cUJNRE5tWG5FYlBIU2s0eUQ0OTNtZ0gx?= =?utf-8?B?NlpYZzJhWFp5RkJkYjdybEwvMnhjR1BtV0x0NEhBSU5hOFA3WndWWXhGbUpF?= =?utf-8?B?Y2lLakNTVEM2dXl6cWJnd2t1S0k1a1kzMGpabTZnWnp4Ty9CM1JuY3JnTCs4?= =?utf-8?B?MEk2Z0ZzZHEwSlptZkh4Y21DOC85T3FORnBRZjhMWE5VUi92M2tqR1c1Q01i?= =?utf-8?B?akZLaFRDUEFva09zaHhFd3J2OWFNeDZvdzNGSHNyeHZ5SWNxQVkreTJhYVlj?= =?utf-8?B?UzhkbzNPcUE1d3VPeEhINXBtbXFEdFNkNm80QW9XYkVlMU1MUTN4Tjd0cFlj?= =?utf-8?B?NnIwV2lOZWhpYzd1dkprQzVnWlh3QW5UYTM2bkRPQ3ZDb2djbmpDamluUmEv?= =?utf-8?B?aXFJSGhLSC9Wa3JkRHhqU01Ea1Vvc0tRaElqWjNsTnFyWEJRVmllcjNMeWlU?= =?utf-8?B?Uk9yalhHb0RXelhXWG1RVVg2OFptNmE4U2tYZ1Zic0lNWXg2NUdEbGtLcjdB?= =?utf-8?B?MVhVUEZ2bkJqWnQrVjNQRmpRNUFLajBqMytTdmJJU0JnQ2xXUEUxMUpUREh6?= =?utf-8?B?eUxNSTFKOHpDb3NlZ1UrTGtaSjFjTFJTdDFkNWpXZmp6QlBJa2FzS1FlNE5m?= =?utf-8?B?NjJoYmgyek9pQkRVNmFCclh5OVUxMUU5ckxiRkFoRjZJNThhS1ZsWGxCbnZC?= =?utf-8?Q?thGAlzUmir4qMFNmQc=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 373a2d28-bca2-4a87-74f0-08daee7069c6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 16:26:20.7832 (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: AS1P250MB0432 Subject: Re: [FFmpeg-devel] [PATCH 22/30] lavc/adxenc: support AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE 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 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: Anton Khirnov: > --- > libavcodec/adxenc.c | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c > index e1bf344b01..9e0ceb61eb 100644 > --- a/libavcodec/adxenc.c > +++ b/libavcodec/adxenc.c > @@ -185,6 +185,18 @@ static int adx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, > > avpkt->pts = frame->pts; > avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); > + > + if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { > + avpkt->opaque = frame->opaque; > + if (frame->opaque_ref) { > + avpkt->opaque_ref = av_buffer_ref(frame->opaque_ref); > + if (!avpkt->opaque_ref) > + return AVERROR(ENOMEM); > + } > + } > + > + avctx->reordered_opaque = frame->reordered_opaque; I don't like that you are adding this piece of code both here, in encode.c, in ffv1enc.c, in pngenc.c and libtheoraenc.c. Why don't you factor this out? > + > *got_packet_ptr = 1; > return 0; > } > @@ -194,7 +206,8 @@ const FFCodec ff_adpcm_adx_encoder = { > CODEC_LONG_NAME("SEGA CRI ADX ADPCM"), > .p.type = AVMEDIA_TYPE_AUDIO, > .p.id = AV_CODEC_ID_ADPCM_ADX, > - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, > + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | > + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, > .priv_data_size = sizeof(ADXContext), > .init = adx_encode_init, > FF_CODEC_ENCODE_CB(adx_encode_frame), _______________________________________________ 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".