From patchwork Mon Jan 24 18:48:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp578092ioh; Mon, 24 Jan 2022 10:49:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfq2zU0HDvCGexz7ij/v1GytOh8r5Qq23wCt1sMM2GhsXXi6ZD6wq5a1Ln+qqZZeNsvAJJ X-Received: by 2002:a17:906:d9b:: with SMTP id m27mr13622368eji.364.1643050167549; Mon, 24 Jan 2022 10:49:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z6si2834715edc.603.2022.01.24.10.49.26; Mon, 24 Jan 2022 10:49:27 -0800 (PST) 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=Mx6dOkIs; 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 EF12D68B165; Mon, 24 Jan 2022 20:49:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069088.outbound.protection.outlook.com [40.92.69.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C41F68B149 for ; Mon, 24 Jan 2022 20:48:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kuPsrCUYx6rWdYn34+cVXgkW09MlwZvLoRGFwa/hTWEawa5im0BKqQK003kEZ0RL0HyM1Mnj7ehrEu/1p4QvuO21OcRK0e8au8IiE9gKFNS5mHVv/1GC251/zNqI/TtuT23W65PD3I5Il+tjm4AmZ4Sg2+U/SfLeSgOzXkDpKcLRDtDfLvNO6mi4cjBNG+e75WxQojFukb0Fj2U/JtALQ6h+zpGcO4OPwhhuEb0/lS95an5jAOX+WC4Ftt/cp3cGIaCd1PksOMNtZkUgCFIdKn84Onq+4iCEnrmydowCcwtK1MnfcMLa3be8vWzogC9kdeDFO9ukNNoNFdrinXaelQ== 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=L7N/GdVygOgdvG2qqUfdbFoTar93DqWYwMKN2wMf3II=; b=TUeTex1kASHa/if9jP/GcUwEBV9DM0rMtLzz1a8v8dfp6rqlagw8V2ke1Hzo3E8CudO1PwqF5BaY+hmuM41rpZJNmzST0BapEkiwypijB/03c2ck1YnAPjdUwNHTuwoqFpxgjSZJ1UvpLTdg1T89xIgCxJxuj55jM/gKEjeFuV/Wx4Y2PHwf6RkcRmBf2H/6LxDrdU6OcH9bs+FMwYZcONbjYJPNGwZN5/CYGhWdPshyBqOJkM9oMmHr/49fCLww+QWvTWJflg54cAapvMalSx4wmDhXv7YtHUHXwo9C9hJ2inKiLBbUGWxZtoQCAW1sDKq2GFzRMo2LIMovXOLZiA== 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=L7N/GdVygOgdvG2qqUfdbFoTar93DqWYwMKN2wMf3II=; b=Mx6dOkIslDDD+p/efJmmywmCnrwohvRJR10WIHHLF5xduInpILTuCCdzhvMX2+vVxw+hfelT/SYyOkpZc+vg0RBmZviFI9LgyQ7mKvre1J1PwnMxE3riZXTTvY9FhsIk4RJI7DzcYkVUpq2UMpDRmu9fJFAjRiwD49+8Rtg9igPchO0LdZrk2YFrAw3M29Z25AEaKK7kTx16qUT9w/3kLct35y5f6y15P5F8RGBZ4RK7G6EB5YyO1LOM69klgbm0OTWrIgctK06Hl0UrkaZJyABKEbh1d/5Zanilr53RI7tSTRiPoBnuO3BvlzI1jPib+YKnpOovdEE8Z4jP0ar0ew== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by HE1PR0302MB2732.eurprd03.prod.outlook.com (2603:10a6:3:f0::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 18:48:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 18:48:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 19:48:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124170014.17189-1-anton@khirnov.net> References: <20220124170014.17189-1-anton@khirnov.net> X-TMN: [REvYYSGMRE9r2zsiLv0gm5aIpNuSqSLK] X-ClientProxiedBy: AM4PR0701CA0016.eurprd07.prod.outlook.com (2603:10a6:200:42::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124184827.584491-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b9474a73-eff3-47ed-6791-08d9df6a267c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXG2AS1I1R/T45K/68k5ZmO19fqc+6PtBB1oGYfUkMfFGY6QKD0Xpq5yPGJ3pHjQEcaWrLRQ9G4+ynl/qYdu8whSQScbeDOe2nU1UtiV/5JYrejaEeSfMypPRi3F2YBaGakGLyCFIAlxW2q+ZVsq/o7l+pxkUxyN+dthao1cWmP1P6HqSTM91T4EEi0qFewh2y9YY9zoao53JKfZrcDIg0QZ7xYSP7N+zUPSDstrw0bpFzYZctcULqb4upI2fMTBbu/kOhncPD0BPVr8De2tBvT9cYo8jBnwSlj9opU+tOqMsGJJ3e5RTCqz7ysISkIiyOA+A6GkJrctxnJOHRzv1smEeIAL+f8hjvO20AikImoS2nZTMAGpd35MXtMvIqlA8OaaJlGhjaNoZawgWeg8/iUKQTGNMToGn1umX7T5hXeXYR3dRNqKp/iSXMDDUAsAA7Ir9dOpV0wfZdGI5F1NgdWYqKDJwzFU3e70AzgcOI7MsF/VeZK6lOrxV+YMBraGgEDt0wYGSK0ppmcOSOnu0BnFf+MokT4onUXyXf/O7tR9+IXcS66DA4ntSTY8LSLfx/oaWyXBWoy6lYyL9OT/+fVmO7SWf5bGHmQpoWNS0WI1RIKa+NSgexbG5o7n7fTryE/ct/5k9O7CfkVFJCqwBrzmxYul5231QJwC2ffl2IfoVO+hALRSxCDzL0gWfuyuWt7b1jwGDDzytjxSrAAOaVM0D9X7fOWDYA= X-MS-TrafficTypeDiagnostic: HE1PR0302MB2732:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kwx/6zpTsR7+GR1V24fGlsuZSuQH1reZhAh3vwU0doQOlMbmZP7HtTxhNCMO6J+jPamD01lvVMH92Xr4fiEScOwdEsz/g89IsjJxCdjl48bhS66ZVWpdfZ2sOPNexpCtfYLJfbYbPicqbyvHLblCAxcYqAI9DPWbPeSFBhNR4g7CskI34QlB0AhyzqBoUHFockgyxaRQzAIsREho1STadicJflpGAl2w8T8DyHUTirgxjYEihgNUKOlamPRLRbhY1ynSbNLIA/XX2CzNG9N9Bi0dGrfXJs+1nE7KDqtDgdUUAqHL1lZCTnmveNf6GW7poIo84D7ihyKoNGiQbBMJXPBBPVLWJymIKCPqsV0ov99lSnVQ6AWHXclDmwd41xGbznoCkxFhc1rf9HjTJjr5tb7ox7DrGWVJ81v7deyGSX6vYMFaQ4S/y/HFTp+LBMGo32ngRI3m/hSQL5BaEg0aa/3MnmOVCmlTMcAXoZJ2/g7BaxoxJ/8ZKXD9/2Y/Q+C06GkcimC2VFrCcQvtfLsxRp4JQRz5OQ/gt0lR/pnYqx3hK/h16aw60pAu7B24pSGtD1Xn4PQU4UsKQAAPqbC7SA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fpRlGgSOOvzKZTBiW7D6VVbnIGTObiJAsWq+X6T4STCd5erRcCLKM4WNchTczemXzXJHENUpLlNbLNpz/JhiIBoFTIpcw/xaKXSVyMi4Xgm9jEuD/WpuJeYrQ48UW5+j/fdYdV7c3ppE+437lnCpL7YM60a8HmzHA+4IZlA7eeZC2AJXEtrhT7KEdTJ9qkX4XtWYQLrK1vQdGmxiK5hOpRiP/6MrGeBzT+hP+1mvdlqQWVPUUd/zvs6WNxHeUcSxzdUhC3G1kihOeb8PDChqUWZz4xajK5nCGTx9w/f5EXxdKKC2AG9RAXdH91qI7nwfv4L5d7Rt77yg0k7aciFXbsYDBkLMOY9nLlDw74QbMVqgcqG8sDX/TA49EqsOkkpGW7bY0g0k4Dz3hr8fu8n9qkW5MCNioZltcpV9lqpCsBPcEA/nxHU/aWb290HGM0eTJQ7ZTaWSSphXRFFpsVxEB8Ontbb5dkAyZBPj6idRJbR7dwiy9gZ37TRvqNOvXQxFrUtO0h9UYpyUOqXkXN/s2oSEVNGJN4+cg2Yv2NE3WjlJe9ytvgH3PKvX4tH5qBmZYr2SBvupokfIgu5dILSBd1I30SY2E57bdSiK4ZIrGn+9Zln8k90U427atW1A4i94z48w/b681h3hKkfKk0uDhXyyVnjiL10hx0pCAjNK7N7IPMTeLEVmQdmsj7iKM/IBBTGP53M8hjvjcAbdfmu2cdT5ge0OmZoyniI1ZLufVv8igGHXBfkooiCnWi9UvxmJo0ZziwYdBOc8HfugJPA8d/rMRzEHOELWXT5vtzl61rJ/vt1FzVaBJ9bIl2bGdJQMgH40diwRsejcxACM3xGCnDYgODOPI3YhBbwt4uE4ioa4GIQ3jv7hE1NEKWS9yY1xCtwL/0GEj4JPfx8Oj116d6kDb3QImxr0wZMkVRylbAMVyUL7lGTEYF0RAN9v6ZiW9rDhwvLFdEugnHI9Ztn88A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9474a73-eff3-47ed-6791-08d9df6a267c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 18:48:45.7037 (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: HE1PR0302MB2732 Subject: [FFmpeg-devel] [PATCH 18/18] avcodec/h264_parse: Move ff_h264_get_profile() to h264_ps.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: GfW6CT0rVfvv It is a more fitting place for it. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_parse.h | 5 ----- libavcodec/h264_ps.h | 5 +++++ libavcodec/mediacodecdec.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 3901b46ac2..4b79bd63eb 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -124,11 +124,6 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, int *is_avc, int *nal_length_size, int err_recognition, void *logctx); -/** - * compute profile from sps - */ -int ff_h264_get_profile(const SPS *sps); - static av_always_inline uint32_t pack16to32(unsigned a, unsigned b) { #if HAVE_BIGENDIAN diff --git a/libavcodec/h264_ps.h b/libavcodec/h264_ps.h index 3f1ab72e38..dc52835ed4 100644 --- a/libavcodec/h264_ps.h +++ b/libavcodec/h264_ps.h @@ -152,6 +152,11 @@ typedef struct H264ParamSets { int overread_warning_printed[2]; } H264ParamSets; +/** + * compute profile from sps + */ +int ff_h264_get_profile(const SPS *sps); + /** * Decode SPS */ diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 04d5026e68..e8af00ec00 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -33,6 +33,7 @@ #include "avcodec.h" #include "decode.h" #include "h264_parse.h" +#include "h264_ps.h" #include "hevc_parse.h" #include "hwconfig.h" #include "internal.h"