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 C402C48B4A for ; Sat, 3 Feb 2024 13:35:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D32568D081; Sat, 3 Feb 2024 15:35:57 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2107.outbound.protection.outlook.com [40.92.59.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0B5E68C9F6 for ; Sat, 3 Feb 2024 15:35:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=frQ9ZCYGI36Cs9pmN00ldGyIsiObrTPu5IE9imGD2F0ddYMjinb0FVn9vLPmPXSsaLV3nDpO87kfHi8FCYKCTQ8Gw179k6WNZRrFKTux8TaJiWCtLwW+lAzF5lOCcpG5CbgcHyB33cHQkCIyzwUtpVmdpt7f7Z2jmQeqQ6A07z01z0iaBCCNybAb+jvq7WJFvxls27avLJE72jENdJom0pu9kBGwj2P8CgQt3Xr6Jp/M+eG1Ik0qPNrSuHWClF3Ftj0p5Cwpl6G4m5IrdBlXcK11VpFC9kT2gN5AwtaZUU84tysCkrIfxUv3Zlb82wuydUKN67mAdTH+xL0vjgFO4w== 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=s9LJ8OZ8g6m4IbIEkLL2NI0xLoX+Hvu4LsWG74GTWqg=; b=ZuCKeZMWj7xxjrGoSvgApL0XC8NFTy57ACDx138NRtY5iV6eML63IZcaJDdq40IZttVPeRsTaK/LCLdtN7a5fj9Uve2bwTRKpQDjEcdG+/KbDXmaP2yPD8RoX1bsis9UIGokRjTqN6xHeG/8K077YibSyR1jocZ6hWXjNLZhvC0YJ8PbYiqdrJhMtCX4+M7M4LW6343e7sdYjutSOH8SFWbFXt/TccgR1O9fJcK7rPJlDRbEPc2m698illU0Bn1ONVZd0SEqqV8hCdW/WzYDWJKx9hNVW9vL98vxQddLLc5CrHNTkgp3g9UW8jdAuAxWdPVe032PPp3ZXodaqs6z2Q== 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=s9LJ8OZ8g6m4IbIEkLL2NI0xLoX+Hvu4LsWG74GTWqg=; b=HxHmiPaSHJKH03akaF652wyGB4i9D7cZgiW6PWAcUeEpoL5iWy6aJW8qQCmWLYVqXM0S1QevEbLISXIaedtPC6hZ80prnipBeowpF/qxLDx0Jwv5JCqzUcJ9LWRPMzzX16lI3/gBx4OEsAZdG0f+isl1gR3MRWXDHqj9aBJlcPmIlb0BK/20X9h+2vojhrFE/C/WjxCfnbjGNhpbaRCj0MxIvYE4iTYkuE7qq2vURnUCOOxYi0sIcHt/InDwYvHHiJEAd/igWRpxAFy11yhoRe11oOjpLd0inW/qBK4LEmSl2BybV74JjbFoopOzNpLn5ZM++kRM9uDk1595rArFOQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0227.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 13:35:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Sat, 3 Feb 2024 13:35:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 14:37:35 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [rmDycwrQSjfp6sYlv/dxEVwbzsit1iMrNgMAg1NSN7M=] X-ClientProxiedBy: ZR2P278CA0067.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203133736.1977471-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0227:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e01617b-1911-4895-5446-08dc24bd0862 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicB5exlFIk//zMwlfXTGcGWg7HnaYsjvo1Fib+5RwvSQdaaKVQRe2tKXq11IxuF1H+C5yGARLACJhIKASY2Vsk02vxVTVxZNsn6kxMBzxTYs9iKxfFCjNDOZhDGJA75sKtdKfTqrPoOWwt+oku4xkUKPMMlPZLJNAIujEwB9NTGtqRLOO9oEfZtxTCBr+HWD3z9cX84UGxr3rlv19Mqh+ZYma0PYQnxX1QBw0JF54udxFcTSMovcTdF8EkDeLJje1lXoSGUiGMvF5XAL+QxNGyAU125UAhKUxyOdPAZ3PjrXThMu6qfho+cv/+02ZYvmDKZmy5v4TJkFQp6MyFw+a1n40FhRR9j8LF+Blqcm2la+o/UZzcXlMJ1G+nH5uZDPsbBqHkEXRU2sFE1lnS3jaOEqq90FAoewEZVZbjceJAzVO8Y8a2MwfCThg3g/FrL4U8/VQicQ730Zaz+dDkwBhCOOhEn6IRaHztNRs8fUYFshU3ztlia61ea/sOYUKVS3Tj8R+ytr0rPxZd7r2n2X49FxhjpqT1cZnzANaiwn83wB41J7rIyQ6RpuV9IFqL02TT0+rsOqQSRJ2CvbudX6NRBJUmGTRL91wdn49a6UgKepKQTLDZ5CjRWpNEFjgj3zmXW4nvws62BGMkX9XrvioDOpIcBrkhweq41EeZUOe60rFKLnB5DrT3FApJqLI5QG+H80+lfruAC/yzcDCLgOmqzLy9CmvX7FXr2ge7i8EG8cFg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qI8ae0LIH8IoqQ7DgpMfAlZ5O/Far1YuCWJN9JxqGLn32yokr/WljAnp8Uv/Wgo7UN+33baqPUu/4lKAqPmaorq5Lg/xojOO6U3haqHN2QaFiGq9cCBcuFPL4Fux69oFbYbSzECRqH8pt8FIrAWrqceQtG+siR8EdGM15jMXoQvWfAjUWo7firClkVTx2Ng7l8TZRxahq6Wls3jvigIHzoBxc4jcuukfdXNP0VeHFhmg1mHgryoYUWL4iMhKI4wCYr6re5QLE7krldaYg1btHvX3apNkEXVoGPIZX1tIjCpeWhGFr50wQmG7dzaw2xcVwFgjpcejodDHjbeTN1BuKly9JYGY4bCtWMnA4zfYflAfpPFsCoUpQmn1EmzNWW2CK99B1O/++2QrcrOkUMdqzQesI9gTgVcGeIIIJJdfYlTrhG0n+FHQO49rK7qXh3SYU6s4VHZHa8zBXh9fVnrvfJeCKX7+TNsBGfZ5n3aDl6ROOBtIHQ2l/UnFe6fM6TYB+Gz/s92lKDAIv3OuQ4fR3XxmdX5peB0dllpDeghBe2nNLYq8lmM7/7cvsPH1W5960da4sscqsklURX4MCKv2IGpC1s62Rk3sxLO7jmU7Ixnahnocfh6CawOMunvg2bEB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JKhDnmAdT4QmySjNNxnRRk5K6gLqtRSNC409834byeBWY1pwrlZdYyuOb6Pb?= =?us-ascii?Q?U9RJzdpkrGPBtHR72/cuE9tiFaxdSyCPHRowTYV21vjFlaqnEoDeWAAjA1eL?= =?us-ascii?Q?cfWD4iz+5V03Xv6Jj+IM57r8VIfP5bSym+nqoi4ct75tnNI/a0dwyAsa0DD6?= =?us-ascii?Q?xIvWIfIyvJLAqAW4IBMeqUi/bvs1PMgTyQQZ4xOrg7GKchNgoJtazduyuOy1?= =?us-ascii?Q?nNceYLtQuGBpcLUEC+pCMPUpwMtKPtqSjkvylpwM/I3Pr7aJ+L5SqsFRG/rK?= =?us-ascii?Q?LLAcsOqzS/LnHj0Ef6iblmIgzkSneq7tnzXBHJUpMGBFQfbMWwnayRW03t2P?= =?us-ascii?Q?gfer1QDkzHKC4R09ezMlokJSehA+BHc5tdqTpeRj4LsZoFeOrW899zHTD5B8?= =?us-ascii?Q?2KYfj6igoMzdTuKMlNtcLXBwfHQVl11sa2/FSSvbl5vxB+o0QbU8TvA3xD2O?= =?us-ascii?Q?4IYd/ifaPVlVTze+ormggl+1fZG/1TimwPEqSS4Xrmf/SUFE2kTLGzU4YgYI?= =?us-ascii?Q?bWJ7ySAk/YuGeN2nfIN4aL944tFYfWq+oUA3marqUboQRcQ/ykjO6WesZL7b?= =?us-ascii?Q?vxJ7ZaAdug12yQYpgzfIeJWAn1GHsKAvP/1lLNVc3WzOjhFVVvbkGDYJgPe5?= =?us-ascii?Q?YFPh1CDqq2dF1SJvHGNvvHiAlCBP72b3hLlTLobwmq7PpfeU++uAXRumrcyF?= =?us-ascii?Q?JxnfP8Op5KvxLA+k+PyyCfTl9AsFyrCwXMxQxMIAJGvH91J4GPD93i+ij4qa?= =?us-ascii?Q?hm2JCrExPKlvEZCMZj2l9ZkJdnkCoKYCw4XuYUWNfIqFq3g5auo9ft46Nxal?= =?us-ascii?Q?f3hVUgl7+8PorcX18uOYEKiWf57OYg8mlBWaewE7flmeCsgGMIB8+ain3fu/?= =?us-ascii?Q?VmstchR19Mf75TDZfaJrw6UXfEC0tVCB1u/h5gmvnFhdNFgZYEigROP5nQFX?= =?us-ascii?Q?EpIpDtXVCu8vpHEQ/ix4crWclZXW2W5gRM/V/yeZg6zhqCOuk0lHL19oC7VQ?= =?us-ascii?Q?3ew+O+nr0rJkOGyeXSS/7AOtKAPxxBGXdC2ezOH1VJqszbgEZo4w7uTO1km4?= =?us-ascii?Q?Wyj+mOMldc5XGt/0IoNd3RCqK1MPFdmNDh+ueAmoQYGv2lAUB7j+CSVXkM5B?= =?us-ascii?Q?07eRQ5HKHNoXjA2iWAhl4HMM6najWSh16O+adKTMANzbGSLd1Sq6dmzHer1e?= =?us-ascii?Q?W9m0P4bJcQpIVq6k89BnJFzgLkZSDH1Zf/RJOwl01GRuO7ktFigsE82NhRFW?= =?us-ascii?Q?12m0Xml4iVyZ8uTEVThY?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e01617b-1911-4895-5446-08dc24bd0862 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 13:35:49.0545 (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: PR3P250MB0227 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/ccfifo: Inline trivial functions 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: Besides being extremly simple this also avoids including ff_ccfifo_ccdetected() unnecessarily (it is only used by decklink). This is possible because this is not avpriv, but duplicated into lavd if necessary. Signed-off-by: Andreas Rheinhardt --- libavfilter/ccfifo.c | 11 ----------- libavfilter/ccfifo.h | 13 +++++++++++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libavfilter/ccfifo.c b/libavfilter/ccfifo.c index 6ae61a4b15..29108822be 100644 --- a/libavfilter/ccfifo.c +++ b/libavfilter/ccfifo.c @@ -24,7 +24,6 @@ #include "ccfifo.h" #define MAX_CC_ELEMENTS 128 -#define CC_BYTES_PER_ENTRY 3 struct cc_lookup { int num; @@ -89,16 +88,6 @@ error: return AVERROR(ENOMEM); } -int ff_ccfifo_getoutputsize(const CCFifo *ccf) -{ - return ccf->expected_cc_count * CC_BYTES_PER_ENTRY; -} - -int ff_ccfifo_ccdetected(const CCFifo *ccf) -{ - return ccf->cc_detected; -} - int ff_ccfifo_injectbytes(CCFifo *ccf, uint8_t *cc_data, size_t len) { int cc_608_tuples = 0; diff --git a/libavfilter/ccfifo.h b/libavfilter/ccfifo.h index a3c302b6b2..565a837a00 100644 --- a/libavfilter/ccfifo.h +++ b/libavfilter/ccfifo.h @@ -33,6 +33,8 @@ #include "libavutil/frame.h" #include "libavutil/fifo.h" +#define CC_BYTES_PER_ENTRY 3 + typedef struct CCFifo { AVFifo *cc_608_fifo; AVFifo *cc_708_fifo; @@ -88,7 +90,11 @@ int ff_ccfifo_extractbytes(CCFifo *ccf, uint8_t *data, size_t len); * an appropriately sized buffer and pass it to ff_ccfifo_injectbytes() * */ -int ff_ccfifo_getoutputsize(const CCFifo *ccf); +static inline int ff_ccfifo_getoutputsize(const CCFifo *ccf) +{ + return ccf->expected_cc_count * CC_BYTES_PER_ENTRY; +} + /** * Insert CC data from the FIFO into an AVFrame (as side data) @@ -113,6 +119,9 @@ int ff_ccfifo_injectbytes(CCFifo *ccf, uint8_t *data, size_t len); * Returns 1 if captions have been found as a prior call * to ff_ccfifo_extract() or ff_ccfifo_extractbytes() */ -int ff_ccfifo_ccdetected(const CCFifo *ccf); +static inline int ff_ccfifo_ccdetected(const CCFifo *ccf) +{ + return ccf->cc_detected; +} #endif /* AVFILTER_CCFIFO_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".