From patchwork Tue May 10 07:33:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3284181pzb; Tue, 10 May 2022 00:34:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJws63IssvzNQvyZ5RjVy/HXjzlJcH+46dX3zygNKvQlQpNeNFb5ut6xbwkLGlck3HbzqnvK X-Received: by 2002:a17:907:7282:b0:6fa:9365:f922 with SMTP id dt2-20020a170907728200b006fa9365f922mr4290189ejc.262.1652168056662; Tue, 10 May 2022 00:34:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb44-20020a170907162c00b006e7edaf2b8asi9963865ejc.371.2022.05.10.00.34.16; Tue, 10 May 2022 00:34:16 -0700 (PDT) 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=MCY9LDC8; 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 6818368B3AE; Tue, 10 May 2022 10:34:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2020.outbound.protection.outlook.com [40.92.91.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A12D4680446 for ; Tue, 10 May 2022 10:34:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R1P/W1JzTVkF6W+DVbYdoBSxSze2pW0x5BjnZPeyPR4qNUUb2ro1C6esZ2z9xKIbuHJQ6lEYa+9+bpBkjmv6jmLV2SpLO+Qf/nakI1FEoqV/ikGg2SDZGmnMwlvUyyvtX7ZP18OlY2C8hgTxQAqN6+aP4cRy2mDCH2WqSTDVRdigADVvzJs4RswYuHXiW6cdcZLTbftzkJDH4AwKCmrZQVQNY9JFE1ww7fh7HyRAlaSeDBy2hT3pkff70atkwoqqE2VCQ07zJRqf1snmEpBJVnBB17wQAHq09Nxs5jWJullQIoI0hHP7VFaBLmYKyQsVxxfZbi2grICXr8P7uV+slA== 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=rPcXa8NU2ogHVv+gXJjgBfSWiLZwcvPUtBWRQqZnHdg=; b=SsPp3CnjXj34bKQsVlA8jbjmlj60Rkz9L214yHu4b9IGBjDqkiNv5qAx68RwStQeLz8ovo7imp/fN/7V2pf00rMoBReit21VN4jRrHbG5V9I47u08I6YYGnqR7OEX92CGy4NMJxFZjlIT8zSwguQhYlUOEpl8bBBzzbiPtt63RV6aOCIlQXvihb8x2f6ujSd4qwPfz3d3jKR0W/E71Ur7JPua1xyuoZExbp4ALIAxULglWNsKTxhqdlQTq2r0/CRheUKNXM1YPtShDeqqIDIPDl1trk7QIxRLxVqRxCGgwRxv8BGAAvvNr0xLMu0G+kY8JE+q/KdKubV33EC8/BMig== 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=rPcXa8NU2ogHVv+gXJjgBfSWiLZwcvPUtBWRQqZnHdg=; b=MCY9LDC8G1/QeadH5cPWE+CgMoa+hiCJuM3myxVFgvEUT+odzcds0hNk2gfCnHe/qtKAKtAXKylrJsdrTkqLxU/E1xiDpxrhFl9SzDxg2xkFihAZj6i/0Q2cZUerdY95A2fpjFFpaKfAmhbewP1G3Ol4QKe2wu/f4UlmNO+EZ6gh/tILEILio6hwuFVJ6PqvdZE0ENqwUT0oFvdldyN/Pt+CxLKLIX9did3kCt4nsa8zyauZdLaJWSZQCt6ZvnAHhJXC5CtQ3h02XULESrDo6ByKVl4leHNK6bR1FXGin9dbinsvzg+ECf40XKPtdZ5Vaaxm93yTVbwLfcolJ1sEIA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM7PR01MB6564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:1a4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.18; Tue, 10 May 2022 07:34:05 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%9]) with mapi id 15.20.5227.023; Tue, 10 May 2022 07:34:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 May 2022 09:33:56 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [03VkB4/GXv8YlXgtT8q6ui13Iwt9SqNt] X-ClientProxiedBy: ZR0P278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::14) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220510073357.480674-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f508aae-39b7-416b-2233-08da325775f0 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuz2s4BD6D7i49evanEJ8PLqnX6MxIE9aVdeEPrQLcmsHwj2HnaCjDzxge8dZ78GePKzILZ55zRaGalHxTU3wnG+A35gpaZJB2HSyFG48y7N8eoM8n9wXPuGcYCkf78khWkBdj62g5U4brqpMIs0vqdr1AeGFIhhhd8dQv326XrZI1mgvqoP5c53hoECtMl34mCYKAKLk6JNGw7Oj6bZoMXbfnNSmf0LKO6KjVlqgrWK93UCvnhrbCzi4lihQoNbA7qmxn1NWlqSt3UTcKtL+NAfBQ2k8w41l6pxHIfsp0G7ygD7Jscp2SIZ0+NZo7iIUmpHP+pgDqqQQDifsf21RLXxvcBZ1hYYYRNjA1OZRBLlEm94ZrVJDjC54ituuA0eKKpYeoQtVhLttGUSMLytwMc+Oi5bIHf7nX+gHbtWbpZ7jYr28FWrWMwYQvTBaj8uGWQ7LnX3DwpGuhopZHjLsvMFNG2Iau6/HVjTnqPKaT0spC/YWqEwWfFu59Q2H/uP5L7CdBU9U22dsZA+OYe9u3Mndye3uk0ErkL8B5KmthrtiqhpR5OqlJ87sRnbRC0LYBmOSCl8t5d1ukn+SS80717hR/cwo3JDfvWKQBUsmjZJOXSMIz0DN2jGf3wjcTpX+3lKprcgYX3vBs0iZDGnzYvp29lHHaNC+IlebpzAlicd3UPEca4ungM+3LpKMCRQ7MiKmaR61JsrdblBON8+aqQImLwyGeNzUVVFFG45vRlt6Zp1zVojOT56n5RUSjAoEgJGCkaKS9dRGgbUPMaVctT X-MS-TrafficTypeDiagnostic: AM7PR01MB6564:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r0WG00FYbXND8HyEyKsgX6c8ESI54qNqL1qkGpa6M3f02XBskynsZXrBPpJSVPcPx/KzGA/uIDW7FwJepSO9eZnSvGsXyN+HcRBur3HqlrWPNxI/s8eS8Sap9YKw+6/dkcZ4JiGXF81tHDqrTL2rbkXCp8I67FjKLN5tP8dro2JyjnyUAmIy9ax8QxjY4EjUdLMH4Cz5UQ5nzJuTtccbF+MGgW+leQHaAt12lOsJWvi1k8tYYe37gMLM5WhIDGHA0VX14FG1Nuz7zoBW62zo6HXk5Vdefs/unQm+m/azkLClJrG5UsNprLslg+K+PkprK4VQfLj3mz6YnARJXyXArCZgRvsjdQwYGnTOu6HXf+6bGksRXNQH05JlpxP1O1aBTwdKApCpjVgtE0Urbxt8G6lDtWEvFqRG8zSxm5ToE09Qg9XF7b8CgfwqKEJfstsNsXYSQ6CmF+QN9w+YMbmKlwXJ/UpfrDeRdxuWOZlWSGPN7QQGOJWvbl2z4O4eqdnAWIoCYdmrfWz7t12F7Oz2w8ZPbsHKHxDKnLN6espwKz7Gs9tWcQ2T2ANDCHhbVD5l+0s+xQvfLx1vRHU2qkYkYbvQ/beL5SKgvtMBzjIMwDjbjcX7SRzThRrRMSwRvZgMuSB5gyttojqg0cZnIJmt7g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FtBbzCJWf40yFrkmdS6ypPNSua7FDQrzp24IrVxuU/VK3pqpVurAmKxkzOgjx2nnVNjBz4Ei6+C9G4KAOCpto+5H+dpawqwFSwx7qbBnv49WoS9XkywsJSDJdJh31sk2MSkAvbCoyJSrTJhQ9AYH6J7RwivOABStHj+/4a9e0UhH2UUXfz7eH/EXRzH5N1/1COIx4y/SXafTnT4jfcnQLubio/iqHi6kWFmK06GJsA4R66fi9kIvBdxG56tCdczLNROt4Tpre/BCdmjsDtFZWqJoAJlXeN2kwxHwt9WnJE/DUFqdyy+05OMOIPajjclIeoXDIR/Xj+ztSLU5nL7hDvxE99u/NPDaQlljil4kcZfh6vvIQG6pXx1bG39P+ygWQDHn5AjW+DUjQAT9HHp3yx3g7IdE33KJ+RJeTrwEV3G3j6Xh0dW7L/7uY5QV7qSmO9vez/2+ipx9QR8fyq11598REY4ocrA2saXieOEduWa444ykx7Y2z9loLl8ICDMltiBPnfR6do7mbvI1Tl0SfUpM9AfuW9bjDxhgFbY/XpHzwh5F8LLWUt4/XPAd4ZEgE+Tq0xl9AT8xOjlTg/yGxYc6plQ7+OudpEKqmiFt8otLff7/bx92gl8PRsD3aFN0CFL9LNWZ3LR0dlsaa9P8ryDgSHrXOaTBrjnUX9IK1uHsfZsVEyFAQ1177gMxOBeJM9f1WLSp3SksShnNYwLEoxgne2z1FGClLO6wTrsxR+4xtP0Izn6kaGw0AwzAR1oy0+6egz365FuifmXjQLmNZf+Sal8xjQ7WuWwaMYuUqjGqKZOKCR8kfx3p0Csan0yGJA4FAcldkE/J5S3T5lsGoHUg3hziMbpg93sl0rbIFu6YkAFeEfYPGsAVSEL2JvJRMxV8hGKp4Z128Wakq9LJjI6y0sZOz6kLr5g9ia/Ub/64MD0ONqMMm+TfdcTmmLA002zkBWxXsBz9o4iylkb0EUkRA3r1/iknhxAPPlOv/YdRD0+4BdLvKCvOfXxQvkeKuxNsds6Tq3FmqOCAskHRySxZwWWM1IDbv+bNScy6KgXBWFXWmuiyuWy4i4tJI3AoNVAkdkYo7QXnyFapMVtjuFGlG+xUU0z8bEI9FqjZcIzcL+74VGQuqMFZ+GmRN7mC/VHPZAgAZQZow2w6ixWtqMKMWpmjXd/tKNG5ZA3521ih37+A78vMe+hzGWE04S5Um8JB++iIvh1/6CADbTmDFX3CxNWiitau5QJPwT7juPClYSFlt1HSFpYYzsWDlnr2zpQfFWYE8xDhbNDsYQ3gCItIq6UzPTL3pl0057ejs3LQwaeLeJwd31EwHMNfOzjtTXLiPMgoDcRKQWe6fasleeWzd3/j9Ur5Pi0AyAkuRJO6IQr8Bt4OQYlgJCKwbVVFdzYiX0q4FwsZtGf0IrQNxptq7EW/MUfFtMllZ+55bcQnh2PL72nXB/Yo1gAA4Tz3aumJu1r4X3F8XmYagflqQg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f508aae-39b7-416b-2233-08da325775f0 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 07:34:05.1530 (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: AM7PR01MB6564 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/internal: Move FFERROR_REDO to demux.h 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: lTMLdb9bv0uF It is demuxer-only. Signed-off-by: Andreas Rheinhardt --- libavformat/demux.h | 6 ++++++ libavformat/internal.h | 6 ------ libavformat/lxfdec.c | 1 + libavformat/smacker.c | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/demux.h b/libavformat/demux.h index a008c3dba1..1f57e062f6 100644 --- a/libavformat/demux.h +++ b/libavformat/demux.h @@ -55,6 +55,12 @@ typedef struct FFStreamInfo { int fps_last_dts_idx; } FFStreamInfo; +/** + * Returned by demuxers to indicate that data was consumed but discarded + * (ignored streams or junk data). The framework will re-call the demuxer. + */ +#define FFERROR_REDO FFERRTAG('R','E','D','O') + #define RELATIVE_TS_BASE (INT64_MAX - (1LL << 48)) static av_always_inline int is_relative(int64_t ts) diff --git a/libavformat/internal.h b/libavformat/internal.h index 44516578b0..5363c0c355 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -651,12 +651,6 @@ int ff_alloc_extradata(AVCodecParameters *par, int size); */ int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src); -/** - * Returned by demuxers to indicate that data was consumed but discarded - * (ignored streams or junk data). The framework will re-call the demuxer. - */ -#define FFERROR_REDO FFERRTAG('R','E','D','O') - /* * A wrapper around AVFormatContext.io_close that should be used * instead of calling the pointer directly. diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index 2d0270d718..8003ae98b7 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -24,6 +24,7 @@ #include "libavutil/intreadwrite.h" #include "libavcodec/bytestream.h" #include "avformat.h" +#include "demux.h" #include "internal.h" #define LXF_MAX_PACKET_HEADER_SIZE 256 diff --git a/libavformat/smacker.c b/libavformat/smacker.c index eac50040d7..1d54e8e917 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -29,6 +29,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio_internal.h" +#include "demux.h" #include "internal.h" #define SMACKER_PAL 0x01