From patchwork Sat May 7 11:28:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35658 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2122193pzb; Sat, 7 May 2022 04:32:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmdZ8mZGC35GsHOI6ZHlyjlHPIWrHq0EBVQUCUP/iyREvMRj4jmBp5gFiw1iq0AaOQY/jH X-Received: by 2002:a05:6402:2713:b0:427:d414:3bf6 with SMTP id y19-20020a056402271300b00427d4143bf6mr8230809edd.180.1651923167657; Sat, 07 May 2022 04:32:47 -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 b23-20020a170906709700b006e81dd29c00si7271291ejk.569.2022.05.07.04.32.47; Sat, 07 May 2022 04:32:47 -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=sxzvfZSq; 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 EE50F68B3A8; Sat, 7 May 2022 14:30:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074057.outbound.protection.outlook.com [40.92.74.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9086068B48C for ; Sat, 7 May 2022 14:30:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JhAxHRt64Ju+k65YfPYZ3VYX55D0atgEaLztgySVpr3FnSWYi/okynp/p+DBzu9SADpHBjqiAfK9Di/Lue8pRBj6ykTtZZYls1GfbyHj6P6NiRGuGyQ2VLG9eKUqKBHo94XdSk9VsBNK67v9BnHXBMQtAzEt73pLABC5EdXe+zGNdzswRFquP9Z4apcjvlaFgOe6n4lXH050LpjZvSSRQV30GMzb+mb4TPBJ6r3o1GxwOqL8f4DskCTXHvljEwr8Yv7ocEnWvm1OyffMGV0ExqOE/McgwB2+K5GUpIXFcEazgOKRoCiomcL70cSkVUVTc3j7u3OMZOS401vcUYX+Iw== 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=eEN5kLkvDAcKmQulqxaZUBTHvCaHtigNL9lSJCxqVVA=; b=FgvadUX4WXGGAuJlmPBAAMWZorm67Tf/9KmsRSNfp4oiCcCcQxJbfBRxpIz/vPXCpORuU7G1Rf1MGXYtyS9hGtO8+ObTeuIQqCyhQMSL2PHZ5mZToWKcxmsmhLws4Qu4X4rJiYHLvzUYiW4bVzKOi0wvDYTsIdRb38HucvAVKbfadw+t+VJBBPbphGHLAcVa07Hbgdpuo1YDzhpqBZXRhhzoBbTHd07CxshnGQOvJ6zZ2u1RdTFGW9HAXSWgoy9LhqY2g4F8Vp1I4tytfbNv5ssFhVDaORhw6hzXJuuP0+q3WtXqjQUUf5N2CCZtwhxgzQ5OtW6k2h0QR10XpejXCw== 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=eEN5kLkvDAcKmQulqxaZUBTHvCaHtigNL9lSJCxqVVA=; b=sxzvfZSqc5z62hczP9QTwcy3C4zpY2cCY6F1Xb4VRDZ+1apfDKjDYMNGCKDShAy8VE5+TWr5cvrJn3qsfT1MCdsRoQJOSYn8dIL9YlhiHJTMZ82CQXGuOpeGzyDCn8xpPrERfVSTRDKgM7oFS/5Pzj76/QuaINcT4ZUQpYTz02WZbx+uBXWuHQW22KGZMldd1BuJ/KbSuTUNU61YVqNHtCvwzV2rIVaf8uQJ//6vuZaBtkb59J0fvNdCI4PmuOCWEDFKSIwC1297re7yxqhSK/xIfYrviGfTAyxwvKFJMDblGlLYdm1Ghdj2pgfZ7IPLS0KmI8kvalpqpc5+fa1k9Q== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR01MB3895.eurprd01.prod.exchangelabs.com (2603:10a6:6:4b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:30:14 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:30:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:10 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [0hmiLSoo7xy3t7bUds4iGzScXnIptoK3] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecf799d9-527a-4bdf-c823-08da301cf43a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVZjuqTokTVdg9S7+crVfX8QTrC4DbkSasPGpmR04WtI+tTODY2J8DByD5njwg8cfoDmcHJH49XN5/KLiwd5g9CiaTpQgKaeSVoG9fDTlSdEy+HuAOiuv9w9bNKcJGfGbS1fPu8j5FCM4d/aX5Twe3dAdZaibGfVdAiTBa8M/bnGbXzoSoi9yzOmGISmqR0I2ICgJJS717I702iOosZgwxLb07ySKdgBRKFUZshRRfmqBSXG/vcWz7sN2wy6u8VLwt8Zpv1B2UUdHrFY3IpuwfaYWdzQiTCsyfb2o1KwltJnMNaKTaLv6TMkQ4F+iLTAvU319qxGOAxUyd3gZYB0o7MT9reme9DG4fsmX5kZYlflVWycKKLtX2r+xsA0brM92YFgzy3RRu085nQBe0l053VUHFxwlorBj3BHV+HMDIInZg6+/7xEaA61TxFufAOEg7WQv9MuEw1x1NE1zUskm8XQzdgG18OxKIfyDZtlCo3TzquymCmvNAN2syRVdCifttiowX81NKGsrEqJhhoUxs+QRq8w8Qw0M/gu/HkRLxlWfoUpJCZYJ+d4TdrCQi/dJt0czfnO8zF4MyWQ/j6XzuLq5DdIN8KLjYQfneXbdvD2rHzP3G1gxGqoHqFXFbLCG5SmMXSnKOwjjeIBPp6hhUg9rSmk9GLH+XqaK29/zCntnyWTeznhP4hChG6kUSTu8H8aghXMx9/rHvA+58mpzz8QkyPpYf8K1s= X-MS-TrafficTypeDiagnostic: DB6PR01MB3895:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w5WDNenvHR36KHRZObiJa8YMittx94Q4295RrsDA6w0uMFm/r3cmnbKiZAyNIBHXYFNwfy6mjPLyFnKCkVOXOf8WhxHsb/xmTSvXE+MTyi6d6nDAUAq/rQ5waKYwN/YS1gBE6UvVL8FPlQvoAvODRvQA94IRc4iiNyVCEF9NS6y9eXXf3vpuownVjPV4fGlj0l5zBcSKgdpMPIzKM023rW8zbET5bj+kCZjH1Ko5Gnddo/c6Uh0U2LnYNHoePY0S0Gitdf1nRZFeQ3EPD/3RZ5Z4xJgqXNXuoysZMwQe7Kz33objH6MMZFxBtWfEiI+6z88x2vkAZ12UwIJmgzrz3sB8K/7PuPvRQWLHoYkj47LC2oGmYgZkL3EH3plHbxF8Rv6SEUxK2Tsqzx3hF3FgtpABzZ2exv2Y/Gj1PSJojiMU4zrfCA4wmDbEmFSCS+4kDtLnFgQScfCvsiQWVZQ3VUIz2NgrL+xI267phdTIJRxpa+6AmqyQUmoprpVEiPBmsd6fM8FrZISv/acAs42t1Ix40oxoWFPOz4RpjgoiLNDQld18wtfNronzUhOlumBigCF4Rps58V3Pyl94xz9eQ7dgvmt03Bd+WCkogswSwLIuqU13vQzUg/wmnB4XBk7E X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dfs5K3nEXLZ+c7A55yPEPgG0nIPWHI0sIGkE+APN3R+2y/8EUyiUOC/xZTx3OKqRQug4TDEfWfw+p2vi1BrF0zJcbmfGhTQgF5rpl2H7h+U4ED0IxBA3w0jcCoyg6kRqksRwzMW6ujnztCAC/But4RV0sfiZannDH4bsmbTtrE+DSvqWyZ4RgJRBr+OvzZQUovAB3t80r+m+86YfDXR80jYbL4qVQkYCzw/AJAS3xXBF4CH3t6Sk4Z1oMppi7j6uEedEyKHbHi3OI2MongFNF40MEh45/sJ77AvWwszD4xSdGlBTfGhuI8Xb3UWDQkIn7XlNslodBPkf4wbyYDSfiMSzynoKEiBEx0NxqTMcTLjwie7kqjCD3wgvYYBWaJbuebx9Iy9PzP+0IcGdFX1OB6hQuf5iS6r7A0t524dwN9/CVyEgLmMconvNXd7EOm/LM315dhYjIQcyX8hkHIK7w261Y6aTPIQKs+xxOu6sVFrJNCFw9DtaCSSxe1nNaE5I+TAUiViMaTW8WywBSSMnpnjIRXleTIy+LWL6TEVSpIC3C9S9fXmY1xXwhKvAEW/2sz8lNd25VlXlftjXrVdqJ0JLLtz28JJSyOSEZc23glMdQBBjMnWwAtVpU6FHORD9kF8GeFbzXQmIIt16/z0+zEtBEAmtsi19JlwC8jayhyGQjrBgKvZyF9jBZurN0zKBW8KUzMBtlo6QXUQiF3xk9WuMdRkqhXLbpc6a9sFfltD5J+R7BAHp8I2RrSPIQbrpQwrVySrdcgCTbEZmk6IESTEaS0rmkCwg04U5ybatjm4o6LCx0dTWlvGCwNiENsUpulQ2po/JxK+auwYC1fIOHJJk16CyyUUvengADkN0UkY5xCTDUNguka04GskXEi2uSnaF4Wg9MX0jQ8LvHiTIBR1gUcpzwtbg76TvNsrcxhNSCbvFSwYugrrewyYG+A153dSIsjNyHuMR2ZafzOUi88C7Cg3kJPS7M7dW/e5SL634a7lUq6cL2HlQ4ptZ8HbkZpT/XMMWgvsf11l0V1PBjoinjiQ/U1qOxOt+qNqRUOmLzkFktbR9S1Dz3F19szAi1bGPs+JEqTt0lnxTmRgsWGd2rFkhctlux8k6GeqQHaCxoXzbkX5xREkkKnv+6gNouHNn9HW/ke1HuacqQ0Lrh88rnSNjVoJmeqV4xmgqf6pdfOlw7dNIOTWZqVTSnE6qm9D97Gysv7dnDaSyPhVbDdIT1OVoaih876iQsAQYWWxtPrrhPXTiLu85W6T8rHa0CzNfeusSMC/tx59HC/XS1a/ag0d2Ab990SsdJ7jHjMlAXVIBdeUPhch1mtNLc3vkC98/6seoC5TMUc7FYMJZ0xZQLFAIAeKY9gYNrGPTtD7W03wy47u3OnZE2E2zpzh+x9XReVGsAIez1e9BYNSNx6b5ZNa9G1Es712cjTfZKYynzEi2ODnRURhUlJw0xK8F X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecf799d9-527a-4bdf-c823-08da301cf43a X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:30:14.2775 (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: DB6PR01MB3895 Subject: [FFmpeg-devel] [PATCH 24/44] avformat/utils: Move av_read_(play|pause) to demux_utils.c 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: rHn5eKsX6KFp These functions are for demuxers only. Signed-off-by: Andreas Rheinhardt --- libavformat/demux_utils.c | 18 ++++++++++++++++++ libavformat/utils.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c index ee8a05a54f..93c6b0fe68 100644 --- a/libavformat/demux_utils.c +++ b/libavformat/demux_utils.c @@ -197,3 +197,21 @@ FF_ENABLE_DEPRECATION_WARNINGS } return 0; } + +int av_read_play(AVFormatContext *s) +{ + if (s->iformat->read_play) + return s->iformat->read_play(s); + if (s->pb) + return avio_pause(s->pb, 0); + return AVERROR(ENOSYS); +} + +int av_read_pause(AVFormatContext *s) +{ + if (s->iformat->read_pause) + return s->iformat->read_pause(s); + if (s->pb) + return avio_pause(s->pb, 1); + return AVERROR(ENOSYS); +} diff --git a/libavformat/utils.c b/libavformat/utils.c index 5249607745..50e8298241 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -458,24 +458,6 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, /*******************************************************/ -int av_read_play(AVFormatContext *s) -{ - if (s->iformat->read_play) - return s->iformat->read_play(s); - if (s->pb) - return avio_pause(s->pb, 0); - return AVERROR(ENOSYS); -} - -int av_read_pause(AVFormatContext *s) -{ - if (s->iformat->read_pause) - return s->iformat->read_pause(s); - if (s->pb) - return avio_pause(s->pb, 1); - return AVERROR(ENOSYS); -} - int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) { /* Free existing side data*/