From patchwork Sat May 7 11:28:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35655 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2121969pzb; Sat, 7 May 2022 04:32:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcp6viGZd7D+FiMkP92nCmR37O5POcqhiyNPuiGW8R/VxHCaKikoEi6aiqcTCTbd/HZf/X X-Received: by 2002:a17:907:d16:b0:6f8:c054:29ac with SMTP id gn22-20020a1709070d1600b006f8c05429acmr711288ejc.96.1651923135103; Sat, 07 May 2022 04:32:15 -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 m5-20020a056402430500b0041d983f82b8si8427198edc.44.2022.05.07.04.32.14; Sat, 07 May 2022 04:32:15 -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=pYQ1QPKG; 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 BFF8D68B452; Sat, 7 May 2022 14:30:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068094.outbound.protection.outlook.com [40.92.68.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 167F468B452 for ; Sat, 7 May 2022 14:29:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iYMMik4gek6wkg0N94088h72L+us6Z+bwjT8YDq5fPbeRzsxcSdpuF7GcTTEZpWfTbp6Xo5lN16McKsn7nWwDoKUzkNB6Hlc8oJMeCMFel7YUPDQb6vxVvlbfYRhSn9FWhqlxQcDwqA0usC0os6jmBH0h8bjK3fSZq/LA00Fq/m+clMdwMB3O1Ll819DSwMWMtZgP/MG4aGtvx3maT6WRUIag2GqZ1RWrD4Tw79rVt91kdIKi43ookUrvrF5JZX1dZXJsikJsy6j+VJJT2v6v1svwBiT0MWCcdj50iOoncC4EA8MV+6PNx8MmkJFP/kc38RU9/8W2krNIABZB8c9Iw== 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=XMIA9ObIbYkUpmp81yEbjy1x+K/JH/A8hGtbmUc6vYg=; b=FPmMlST/rx8V6UnsUhkPw/tTPVaIGB2xAUSdt/N3qaCarxKfQKMNy2UXLKXxvsf5sCuooEkiQkVX8TyRLFYnr+IYeyWY4ZvAU1GnjrsNQpbJleEmlXl87/l0O/l3H/tbrrmekStOCWO6kRE1K5HSN1LqEZM2wLZgjNx9tExmRTPQ8sTYDdB/AnlHlMWVzmr5utIkVHGVPWtq2goX1SvRvc2KAQzH/L6nPuWpf0iJEA2DLvCaDNJ6ch1KlrZNeLmwMGn2skzLQGExFfO9l0CBU9mO/Efqpf8zsREM81pDNIqt9ETuW+2/ICX7k+CvugzW/BHtDBxQ31f064G/M+xqMQ== 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=XMIA9ObIbYkUpmp81yEbjy1x+K/JH/A8hGtbmUc6vYg=; b=pYQ1QPKGfmjNpEbvQ+kF5e48ojlcB8T6KOURRYUWhmp1ZRG8QW+wAXwDUStGGCVpOyehkQdxAh9660TbcrD+qP4Oj7F2rQqvEJwUMfZblwfuFXyScptAaRwYjeMMHZfM2e3kNFQAhRSJAd+YsIlAYlpFwGLZZq+oyB4OgmjW+sVHHk3ABE124U9B8+VkDjfJT9s5fkM3QXypM+G8YSmOwi1X3h3Eo2LvM/eSb34R2DhBsXZAcIvRv1U4F90O7iOdSey8JmcxOJo2jK7spj7jZG3g3vCgnHUIrLtsbnxr/pijTkcEpY1lTo784Ox7neMm+mRbWkXLIA71bdpOnQHZ1w== 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:29:57 +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:29:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:07 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [+1DT0YNfNwhkEeiJxntLNxaqa9uXLprJ] 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-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5866570d-facc-47b6-8e4b-08da301cea2a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItwfhliS6Qrd3myL6M/B3M9ccQiWdPlXDo6B/1O9TwWTBDh0eMCvDUNwRFH9ILM7xKx1JRVNyl+YXSBfQMn1Yk45OaetXY8w8sfwrxteUk1Z+fjWJSbnvSsv7xvMfB9C68nQZVcKZ/XYHdkPN1G16N78c9neJkdPN3e6zoTcR7aNiXCntYqpuSulBlpRRy+LHQDk5QPcxjsAfpmE5UnJwalFu1elr9RDsboqO0tu7T7X5bjjlWgYfxkRVKiX1osdG4htUCHD8sPEc4D3FNxddeIgrkhnJXo/lvqhGs+Idvy0rg0wS/CH+oJ8foKwxPmidcISEOsxu7lFc4S7CIcE7Dtp+Wy73KqJ8eJ3FwHOdlgZwl0bSoIRXtoMCR8NKFtPMqTXoPZvVsC+IAP+UzIjb5y4e0yQ8C91XTtT63MHLdG5wYQZcevGH23w0+Bl4vJOEsjA34enEJLRt+QjpAKR/MgaO8ru4pMfX4eXLdtrb/ZlS2hOyq0PJk9vMxcmt8U7IZ7RBLNuSS9yNdId38a/bFenMPLh0nj/k29kH3AMnqENQzO/wwiYseDhPyIhOWg26gsdXnhsrN5JDJ8fLS3n+2ovc77DiETkRXWE3BhRXrIqkZF1Mbrqb/Bf6bpFda6OIe7/zsfYxjVzguVbILn3BWgqW7F87+D6Wo9W3OjaBlHSt4Ql2F85g5rMoLBzg7Ee+WbMapTQG4gq4tFh0S9bCUk5qVNGyfs8mPouVa4RwGAwm8= X-MS-TrafficTypeDiagnostic: DB6PR01MB3895:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zUe+7JM6Eu4R77NKQQuYzCzvUQd5fRdBQRcvmRZZCFLu85V/dqaSvNXbBQjuqF62Olr6ziv2H9e6bflYdypE9UHqQJxjRDPKSSWhDddakh+ONhERUgo0mkefEZvdEJBVyJaoRm+SmSPj38HNUjBOr7MM0Ii2YgV4XB1w7oFvr0hKfm8+05QKlDQyrjQUlmIXTAVjnUCK4IFn9tTuXv9gJ62D3H34Se5nutJ6dq0wrTvwQpxs/iiKz/QOTSqXJQTCB5PPQAPnenftY8z6GiQcgMeWmXf/clff5iV0fxahxACrmYPANVxds1wMFTOUP4nh3427OnDaiGsFujUIuXbXzyidFZJid7s0LryFQi0hmckrPVdIWhEzXXuPARyEhsbGXGMRgDU9ZGVkdbsdeUFNk+ARn/TnnJlxiJtGF2S0yapioZIu1OSXEIFHTow0symQ4vpyA8fNhXkEztbrUhJ8MIXLwBZKbwvKhG7w1Y2INZnNzWLstlzVSDJ7exC+0Bd+kluAXFnzigGw/NIN1pEhld2SuGc5AAVlkNoulL6jsNRx/Yfyz1LDeo8/J38lUgZl1MsQha0TWd50hkfL3qjSd7cUrV40szfd0hvdO5auc5HKclJJsFCUR369aS9lGwpK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j+YhVoQ4w59f2VQLYGTP6zIDjkvIFFIwhxSDLUbhfArf3RJHRAtGF+f0sL32kBtXqCqU11EACjYe0x3girc7VdrxowI4zk4RqL+wfhCL1Jsg1yrqNZ5lHh0fb7hCcfPhANCNOsNWgdjLsUOjOMf1jtebwzkZXGS4+nSXCpMHW07U9/wTmiqhilY+oXQg7uxiTutL9sUmdZT+A5fwbBC0/oRsP9D9LhMXHj1KGIing+L8L9TFJxjQ41Fv90J8uZEoD0c0/Pspb1BUm1X/hIl0LoiCuSdPX1A11x2EbTfmZsmMVmk7GG71nJ1eu6aPTHPeHNmX27YvKx+pHH8ebz7n7h+zOYmO7KqKWvAn82EcpZ4tOnZfW1lQd5dO5C5rv9CXuAsn+emA2w7sDG1zWR0Fh9UemX3BLGd4ycSzenftlOo0mCDtipQH6NA7DeXtLbdcSKg6aD+pw7z3HkuwvwVeERhJ7IOuRLnNyTSY7CscPUzM0ON0mQD9lp0ap9x76sxgPlxH9JavNdQ/WUB2vaHkR2NhuMgHq5YuJ5j+hXGfP+nt1njcj5AGPGJfff8KfAx6Em/tJmgr2R1w5f83t5RTuPhTz039yTU83jl44YSVhBccaJ+UyEQCO0pQnebDnGDaHRhmT9fwaCmjivyihJLrZhnvrg5bB0l2mGXBg4JE9KriP+EzG6qXE+y1apTqqytznv7hH/SJuNiaf5XIyu7hz9ADGoyBnMAPPP27GoU/rCO0asfhIHuGLOAIfGFNZCf1aCE4+W7CNkbm3OJ/ZlFC/QkE5KKqs/ASEiEzfKZ2Rtff8z4ftamukFzzCghwxQ78SbJneQS+pJ3YkZ+cpXLrXGLmSKsIvJbohdMz+zOFSc0pqa/xN1m5sagiV5DfCYoj/kmp/cRVPmgPIZevuXBzCfcAm1QupPNvLxNSYCFsDoxEUFDzuo6pI1VqIOgd+vvVnj1bljiBKF3JLWh+ftIhH2UM2T0hgfs90KT7q4Ho3IrKIsboTsYDZJ6NXIhh+S/XDPnYFMEp6qHF61JucmUKHHBKef2CZHf8+HMgqiDy6tA2pBgwjI+R/+j4b6FNfjx2ffIfLlF5xeKJ57EvE34lCjyCqSNzCTcoPF2oEeHNSH2wQXUJ8XPJWy9HiCExNKO6LyWuFWzv9stJZg8Y36l4xG32ZLYHt0k8MMs6eP2Q6WKxyhUa8SpHU0n9972HLRPVkiiHXd1/t6OzTPt3u2DWmgusZt87S9BiZ85+D5tTKqYlFDPyY2MdBWaF/EDlB0Rc3WCuFTJWD+m7ukEvuGva+cUSrpb+6yDuuVxzXK5ywMuIJKVtBtbV1sURIe2r78OmiCXA3SEQdDKtPoV2yT/ZXrb2r5FlNji8WSpnXXIxgHy9KNQv4tImBBq4jriaDlplnubMpmGpJyfDeCElgTidSeQKFe8+g2ntt2PyUDxblDVn5IwoVv3YUeQq6eiwGsw0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5866570d-facc-47b6-8e4b-08da301cea2a 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:29:57.3939 (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 21/44] avformat/utils: Move avformat_queue_attached_pictures 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: tkXFskgW8E0X AVStream.attached_pic is only used for demuxers. Signed-off-by: Andreas Rheinhardt --- libavformat/demux_utils.c | 24 ++++++++++++++++++++++++ libavformat/utils.c | 23 ----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c index 0ec9f3b2fa..ca5750d1ef 100644 --- a/libavformat/demux_utils.c +++ b/libavformat/demux_utils.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/packet_internal.h" #include "avformat.h" #include "demux.h" #include "internal.h" @@ -83,3 +84,26 @@ void av_format_inject_global_side_data(AVFormatContext *s) ffstream(st)->inject_global_side_data = 1; } } + +int avformat_queue_attached_pictures(AVFormatContext *s) +{ + FFFormatContext *const si = ffformatcontext(s); + int ret; + for (unsigned i = 0; i < s->nb_streams; i++) + if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC && + s->streams[i]->discard < AVDISCARD_ALL) { + if (s->streams[i]->attached_pic.size <= 0) { + av_log(s, AV_LOG_WARNING, + "Attached picture on stream %d has invalid size, " + "ignoring\n", i); + continue; + } + + ret = avpriv_packet_list_put(&si->raw_packet_buffer, + &s->streams[i]->attached_pic, + av_packet_ref, 0); + if (ret < 0) + return ret; + } + return 0; +} diff --git a/libavformat/utils.c b/libavformat/utils.c index b20dad2458..492fca000a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -175,29 +175,6 @@ int av_filename_number_test(const char *filename) (av_get_frame_filename(buf, sizeof(buf), filename, 1) >= 0); } -int avformat_queue_attached_pictures(AVFormatContext *s) -{ - FFFormatContext *const si = ffformatcontext(s); - int ret; - for (unsigned i = 0; i < s->nb_streams; i++) - if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC && - s->streams[i]->discard < AVDISCARD_ALL) { - if (s->streams[i]->attached_pic.size <= 0) { - av_log(s, AV_LOG_WARNING, - "Attached picture on stream %d has invalid size, " - "ignoring\n", i); - continue; - } - - ret = avpriv_packet_list_put(&si->raw_packet_buffer, - &s->streams[i]->attached_pic, - av_packet_ref, 0); - if (ret < 0) - return ret; - } - return 0; -} - int ff_add_attached_pic(AVFormatContext *s, AVStream *st0, AVIOContext *pb, AVBufferRef **buf, int size) {