From patchwork Sat May 7 11:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35659 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2122248pzb; Sat, 7 May 2022 04:32:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyatFJW9sGm6T4VFPxzOd2mDs8QbPuaUiaBRCPVED2Vn4JavBYXrrNGKllkTi1O/EidS17B X-Received: by 2002:a17:906:d54e:b0:6f6:3ea:8e7b with SMTP id cr14-20020a170906d54e00b006f603ea8e7bmr4693908ejc.292.1651923177907; Sat, 07 May 2022 04:32:57 -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 q3-20020a170906388300b006e0f2761f3bsi7143673ejd.840.2022.05.07.04.32.57; Sat, 07 May 2022 04:32:57 -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=fayW9BtR; 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 0F58868B37A; Sat, 7 May 2022 14:30:22 +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-oln040092068102.outbound.protection.outlook.com [40.92.68.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C182B68B37A for ; Sat, 7 May 2022 14:30:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EyATFh6tQVCEskd7DijxmXcStWF7OyB1fTU9ih0JtSJoftX7mXqAe/kh/VYU4++RNgVfBrW36EJMIgLICI4HiT/lDnmrPNZNe7Ay0A+OhQ/+yN4OIQlMtRfPqB4fhlIYPB816PCCRybxkCJmzbxIKTzAH9jM2IhOChLL6VfIyoFPV4RRld1EFv7sGHXAHNfntI4aRlwQZJGyXwExQ4zvdIyTwIZZvb9sBRyZ14WJN+dyo1Wft+VsomNs+2xtwKIgA058nxht12OShvxMzacAJ60738DAUy7d8Rw7uYbY4L/uixhLiCHzUjbXs4BVfIjSwQtmplriW9YKEKqMD7I95w== 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=/nB+vP5AEJ8cLFg09pv7Xggw62mglFmM3SU4VSTo3yE=; b=F65gaOTHFE6Qsx1x44pLLZqQ2HM9cHy/nCnAEPzS3qXcxTwYoT9ETUoN99JTLBLkrlqg9e2OcZmMhli+L37k8nNY9eWDnxqbbh8rpU653omGnBM/sCDaAV3ljMqoNETVZfLGMVFZRA4IpLPebORfZVbrmalXDjsYHiAu3PnuCD9bfvJxMG23D+2sDmlYm+FzND/EjK+uGljpJQ7Le1Lnus0X5rFL1iyEOe1aXYiVBsi4k4MrqjtGTsEDxydTkspKXnWQ1L6NfgE/GYwDP/xHGQ/tYAYADO8Z2pFeUHzr9GHV/BjU9b3BD67XvoejvPDam0ky5UwdijL5WN1nA0t/lw== 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=/nB+vP5AEJ8cLFg09pv7Xggw62mglFmM3SU4VSTo3yE=; b=fayW9BtRQMjkDs5q5NBcDW2kK35ksKrqFZoDNkqW/RTpEd/sgH/WXeYMhsKYqzRP+4W2pD7A9+678ZMTn0N+m549coyH0pz1rb/C0frudxYEmN0ET42ESJVFPOoHkGKV6zvgYj1rzUVJGPlNMymuni7UJ7Y4Ar3TKEcZgcvtFOdmQ2NDFc2h7cdWTafyX1OxEaN3edgy6Z64kSD88o8Ebw160r4lC2i7DsjbbQCFsJmd0gIFEArAq2E0gPyj+NM3r+CRYpRq9ZoEKZs+ueSe9lMn4PskpyPiw1CBEfJjkp2NejfKxwb4S4KLhlFB5u+yXrqISEakimFf+31H2aml+A== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:11 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [AOHc2jVrqMzBdkKz0FmbWGn2VMncU5yg] 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-24-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b5c8791f-be23-43e3-78e9-08da301cf6b7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItwS8FE+2BQf20ckMWOD5ksPaFrmYOzSZLxTRVo0MW4KDPFEHZCRPavz8hM1eVbjrKvNbxkbSm9ZQTws9uiLZelu9i/hS4xSLTZkpaeJeuOUSRGcorvAsT4btHrKpH6HPo7bpFiIpL9m3Xv0xkacGdvCgl4MkhPWhnr4FnIOfjUByCoAMD41YiQpaa3qugMcLhgBxvKcW/vTyZiuJlI/n4QHbHmR7Lw9JahDs0g2nNL6w1PdpJbC4PRqA+mxpRZt7p1m9HNR2o2ia5Zw1Y7PSCeWfUyHbAhgXRHZJjOalsA/U+NOQaB/AI5Goonbgx5RWqgWz8uWE4Tg5aIB41FSmJN87ycmzEx8ajV2NRKWZvVX8KTqA8IJi9jqvn2guMkKjTl//GbPlW6LP0ZqG2Ao/NhwQsZl51zBRG9/1gGVpOZOKaUu1YBKGYo1ePGeyZX0j2MhuDNeMe0mIKs9ytpVe0KoeLvTvZdHGA0PgH/XKDLNVIDh0GOYsu/zn+ZHtsVr7jxT72tTDFOt+X+we1rdX3USHUGvBwT/Bt2OPaQnSIHBEqHlrDD0kXdXdEUKBov5N8DWfIlhgXQuBYtQDZEmSTo8CwckltFQ5jLBfuuy1kgkiR7SnMAqPKz82B0PqLnQ2luLebdMH/jS3Muz/9lEh8VVjfNw9t9HRpTkQTbEnM5X/PaG3G11t1iRhN98JUcDa9tbH6FGxQ+F9pu8MLC3uUQxWs7w3D78lUT0B7oo3kZRqw= X-MS-TrafficTypeDiagnostic: DB6PR01MB3895:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sTvmQlgYgVPXhwYmdbZKshqPuPYMC5pFNj7P2l7tfxv0eqiJAXpg9yp4oFyaKGGHQGyLa4S0QtvhpNl0T9RtQLwQwJTiFYMzsXJwIKjtS0Mca2CvDizU3cBZDjJuxOsPX2lWyYwbX1Op/bkbnInWs3ygHi0ZEqQqgS7knAmjdV41hZn5dqRJMxStfxj1pnS1I4BFcNRHuZ86wcS1UuAdEgi9wQME/Z0noAkzfqs9DZyTzRqGoUOucgvlzw56RFjHdfkY9w1omYazazHk5Hhuy2EoE0H5+OdtXoa6ZKDTnoRCFdoNa3RmR9r9HIVUCvduOqZVgItdLNLjwetBx9Rrx4GbR0lL2MmySf1jSmGiZoKSfg3r8PVz37JXJuus9ZvyY40UOAYY5pBUXLgixg/vBVyHUpojrrKilZVbqnW1yRKqPic//5fK4nHhGBeRqPK2mcWnKc4eB8kPbKEiqdo+zi/SdlBULMo7QohMdR1wpF53K9al36Rib2t7eqieNltIJAybi7kHYdWzfrEp8N1QQn7OBGD/TwC0xBKQYAC5SvVCY9w4tblB47b3fAGoKfrIcVS1RJWTytvnWOAPSKVhd6fQtQIXypz8JnJBwxip6Ofww+EyBUBOuXuiM3goZBfT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NPkDD+fyNHe2FK9/9fOm0vlRjqC8CIWv8e8AA7gNlenaiSA7NH6Oq4dGuHqN6cEu0cpzD6GdKyGPELb5zr6OaNxc4nNkyvEpFf7EjPxbb9NEYYYZCLde/Ax/7ZNwcaTX8w/vAOtBhnxsGD+wNJ/kt95VnVBWdhVy0dAN0ndwg+MNbL3uSOD8/HyWutl07D/IqV0VAOK+A3DZijVCJnhGs7ogAX2phVo6R3u00TpvPRuBpcUqCGNcVHYgI+cISwXNCUEcF9ziJ2pniVHYCac2N2coble7yFVExSp3H929kiNQmnDzAgpY5EbNybgHZiQsa8bZr2ctIHc3OGoT5BOUVogmaHcRri8PR0yINS+O9OGyJbno7jDu+NexMrZ85f38Ujm9Dr4kOv5VOOmLeqOP23f36DC0vS7PCgschAXTwpH0hikPzzlsO8Pa1TfS76d1rFAlqqg59RWYcMWmDuJsewM0Ci3B+I0TeFgHVCcCOCHRhOwdBUsX0uiVg7tiH5sqAqKnXdE7KAlA8LXQBvTS9mttIBNm6m1qFDuo0zmUqYpMsCAqUCqKMWoifvDfRbq7kxX9uJfje13kJf5XQ7I9rvLr/P6bFQV1z36Lh+jixcVYyB4mQNv2y76YIRX1CnfjhpJxrNkqyKqXcfeTFN7pcaZvcbdBHBKdvIuNTUY11Y/cRvYNNjWZhmiIeeuP9CDkvAFaDKgrRs35sLIySu7EIR3Ry3mYqdD8HRTfXdEHCfHOZLflSg0bEsKVinh0MXMPfoFKtLCwvh1RKALQvRMQ962hv2PdjhGba4neJv7Z/gQnqeUscbTbgHvS0EFQG09skjrLc3HaCgeXvZLWZQBwZPrd9Q4224wBiiSwlEBiUVi+Kwg7Mw4m/fI6jI+018nKpve9lj+Ls0EsmIQO/cR+0n5LASe43MM09pytrU8zSmbQqjXWDXmgM34PGIqnH/vFcM9mffduT33LxFDXmTz/2ApSdevuHufD4wgdTrYbn8VXE2BerZ3O/gY9Cbi5eFdohz+kSmsDDjeeOt4ieAx0fDMR3jKs/A6+5QCUmHGDpfojDnv9aGl/OI9GMTqQsPRG9POg+7vxZCmZhIIffBrPCtFiM3r3o+kodIs4M3EI5XXBJ+XsGJh20DY4SP8lCtxx1Fwtk+HeyClsYrIyvvEtOBu0MhsL/TZvLYTESS7j3BX99xIHLMTZIA8P5F3XGtdiDHa3CZ2wnoC2XtU6OI4QfWxXQ2OB3T1iAZWfMxY9zIxeNOpJmGc+oy3Gfpwt4KELaGfmb31C+j4Wec9IgVM+54dpdp/kBNCcF9wkKGVszQ11Wjv+qQ15oGNJ6fyrUp6g0hbhumT3AKLzhRuhOJJJfLTiRs6Z/3I3pwKQ+xOGFz5T4Lf1T45h2Rd4K4eSVLgnSaUGmSw3Qo+3gXUOhjPvzj5sUHz4bpwEHHBu1CzDq/LoqJC6uFHDXtzu8uPIQ7jq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5c8791f-be23-43e3-78e9-08da301cf6b7 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:18.4970 (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 25/44] avformat/utils: Move ff_generate_avci_extradata 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: armyuTiYKKtk Only used by demuxers. Signed-off-by: Andreas Rheinhardt --- libavformat/demux.h | 6 ++ libavformat/demux_utils.c | 135 ++++++++++++++++++++++++++++++++++++++ libavformat/internal.h | 6 -- libavformat/utils.c | 135 -------------------------------------- 4 files changed, 141 insertions(+), 141 deletions(-) diff --git a/libavformat/demux.h b/libavformat/demux.h index 03f7c22bdd..64adaff07d 100644 --- a/libavformat/demux.h +++ b/libavformat/demux.h @@ -211,4 +211,10 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels, uint64_t channel_layout, int32_t sample_rate, int32_t width, int32_t height); +/** + * Generate standard extradata for AVC-Intra based on width/height and field + * order. + */ +int ff_generate_avci_extradata(AVStream *st); + #endif /* AVFORMAT_DEMUX_H */ diff --git a/libavformat/demux_utils.c b/libavformat/demux_utils.c index 93c6b0fe68..e42d2f3525 100644 --- a/libavformat/demux_utils.c +++ b/libavformat/demux_utils.c @@ -215,3 +215,138 @@ int av_read_pause(AVFormatContext *s) return avio_pause(s->pb, 1); return AVERROR(ENOSYS); } + +int ff_generate_avci_extradata(AVStream *st) +{ + static const uint8_t avci100_1080p_extradata[] = { + // SPS + 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29, + 0xb6, 0xd4, 0x20, 0x22, 0x33, 0x19, 0xc6, 0x63, + 0x23, 0x21, 0x01, 0x11, 0x98, 0xce, 0x33, 0x19, + 0x18, 0x21, 0x02, 0x56, 0xb9, 0x3d, 0x7d, 0x7e, + 0x4f, 0xe3, 0x3f, 0x11, 0xf1, 0x9e, 0x08, 0xb8, + 0x8c, 0x54, 0x43, 0xc0, 0x78, 0x02, 0x27, 0xe2, + 0x70, 0x1e, 0x30, 0x10, 0x10, 0x14, 0x00, 0x00, + 0x03, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0xca, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // PPS + 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x33, 0x48, + 0xd0 + }; + static const uint8_t avci100_1080i_extradata[] = { + // SPS + 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29, + 0xb6, 0xd4, 0x20, 0x22, 0x33, 0x19, 0xc6, 0x63, + 0x23, 0x21, 0x01, 0x11, 0x98, 0xce, 0x33, 0x19, + 0x18, 0x21, 0x03, 0x3a, 0x46, 0x65, 0x6a, 0x65, + 0x24, 0xad, 0xe9, 0x12, 0x32, 0x14, 0x1a, 0x26, + 0x34, 0xad, 0xa4, 0x41, 0x82, 0x23, 0x01, 0x50, + 0x2b, 0x1a, 0x24, 0x69, 0x48, 0x30, 0x40, 0x2e, + 0x11, 0x12, 0x08, 0xc6, 0x8c, 0x04, 0x41, 0x28, + 0x4c, 0x34, 0xf0, 0x1e, 0x01, 0x13, 0xf2, 0xe0, + 0x3c, 0x60, 0x20, 0x20, 0x28, 0x00, 0x00, 0x03, + 0x00, 0x08, 0x00, 0x00, 0x03, 0x01, 0x94, 0x20, + // PPS + 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x33, 0x48, + 0xd0 + }; + static const uint8_t avci50_1080p_extradata[] = { + // SPS + 0x00, 0x00, 0x00, 0x01, 0x67, 0x6e, 0x10, 0x28, + 0xa6, 0xd4, 0x20, 0x32, 0x33, 0x0c, 0x71, 0x18, + 0x88, 0x62, 0x10, 0x19, 0x19, 0x86, 0x38, 0x8c, + 0x44, 0x30, 0x21, 0x02, 0x56, 0x4e, 0x6f, 0x37, + 0xcd, 0xf9, 0xbf, 0x81, 0x6b, 0xf3, 0x7c, 0xde, + 0x6e, 0x6c, 0xd3, 0x3c, 0x05, 0xa0, 0x22, 0x7e, + 0x5f, 0xfc, 0x00, 0x0c, 0x00, 0x13, 0x8c, 0x04, + 0x04, 0x05, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, + 0x00, 0x03, 0x00, 0x32, 0x84, 0x00, 0x00, 0x00, + // PPS + 0x00, 0x00, 0x00, 0x01, 0x68, 0xee, 0x31, 0x12, + 0x11 + }; + static const uint8_t avci50_1080i_extradata[] = { + // SPS + 0x00, 0x00, 0x00, 0x01, 0x67, 0x6e, 0x10, 0x28, + 0xa6, 0xd4, 0x20, 0x32, 0x33, 0x0c, 0x71, 0x18, + 0x88, 0x62, 0x10, 0x19, 0x19, 0x86, 0x38, 0x8c, + 0x44, 0x30, 0x21, 0x02, 0x56, 0x4e, 0x6e, 0x61, + 0x87, 0x3e, 0x73, 0x4d, 0x98, 0x0c, 0x03, 0x06, + 0x9c, 0x0b, 0x73, 0xe6, 0xc0, 0xb5, 0x18, 0x63, + 0x0d, 0x39, 0xe0, 0x5b, 0x02, 0xd4, 0xc6, 0x19, + 0x1a, 0x79, 0x8c, 0x32, 0x34, 0x24, 0xf0, 0x16, + 0x81, 0x13, 0xf7, 0xff, 0x80, 0x02, 0x00, 0x01, + 0xf1, 0x80, 0x80, 0x80, 0xa0, 0x00, 0x00, 0x03, + 0x00, 0x20, 0x00, 0x00, 0x06, 0x50, 0x80, 0x00, + // PPS + 0x00, 0x00, 0x00, 0x01, 0x68, 0xee, 0x31, 0x12, + 0x11 + }; + static const uint8_t avci100_720p_extradata[] = { + // SPS + 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29, + 0xb6, 0xd4, 0x20, 0x2a, 0x33, 0x1d, 0xc7, 0x62, + 0xa1, 0x08, 0x40, 0x54, 0x66, 0x3b, 0x8e, 0xc5, + 0x42, 0x02, 0x10, 0x25, 0x64, 0x2c, 0x89, 0xe8, + 0x85, 0xe4, 0x21, 0x4b, 0x90, 0x83, 0x06, 0x95, + 0xd1, 0x06, 0x46, 0x97, 0x20, 0xc8, 0xd7, 0x43, + 0x08, 0x11, 0xc2, 0x1e, 0x4c, 0x91, 0x0f, 0x01, + 0x40, 0x16, 0xec, 0x07, 0x8c, 0x04, 0x04, 0x05, + 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x03, + 0x00, 0x64, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, + // PPS + 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x31, 0x12, + 0x11 + }; + static const uint8_t avci50_720p_extradata[] = { + // SPS + 0x00, 0x00, 0x00, 0x01, 0x67, 0x6e, 0x10, 0x20, + 0xa6, 0xd4, 0x20, 0x32, 0x33, 0x0c, 0x71, 0x18, + 0x88, 0x62, 0x10, 0x19, 0x19, 0x86, 0x38, 0x8c, + 0x44, 0x30, 0x21, 0x02, 0x56, 0x4e, 0x6f, 0x37, + 0xcd, 0xf9, 0xbf, 0x81, 0x6b, 0xf3, 0x7c, 0xde, + 0x6e, 0x6c, 0xd3, 0x3c, 0x0f, 0x01, 0x6e, 0xff, + 0xc0, 0x00, 0xc0, 0x01, 0x38, 0xc0, 0x40, 0x40, + 0x50, 0x00, 0x00, 0x03, 0x00, 0x10, 0x00, 0x00, + 0x06, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + // PPS + 0x00, 0x00, 0x00, 0x01, 0x68, 0xee, 0x31, 0x12, + 0x11 + }; + + const uint8_t *data = NULL; + int ret, size = 0; + + if (st->codecpar->width == 1920) { + if (st->codecpar->field_order == AV_FIELD_PROGRESSIVE) { + data = avci100_1080p_extradata; + size = sizeof(avci100_1080p_extradata); + } else { + data = avci100_1080i_extradata; + size = sizeof(avci100_1080i_extradata); + } + } else if (st->codecpar->width == 1440) { + if (st->codecpar->field_order == AV_FIELD_PROGRESSIVE) { + data = avci50_1080p_extradata; + size = sizeof(avci50_1080p_extradata); + } else { + data = avci50_1080i_extradata; + size = sizeof(avci50_1080i_extradata); + } + } else if (st->codecpar->width == 1280) { + data = avci100_720p_extradata; + size = sizeof(avci100_720p_extradata); + } else if (st->codecpar->width == 960) { + data = avci50_720p_extradata; + size = sizeof(avci50_720p_extradata); + } + + if (!size) + return 0; + + if ((ret = ff_alloc_extradata(st->codecpar, size)) < 0) + return ret; + memcpy(st->codecpar->extradata, data, size); + + return 0; +} diff --git a/libavformat/internal.h b/libavformat/internal.h index cd6240b0a3..4392f17d71 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -623,12 +623,6 @@ int ff_is_intra_only(enum AVCodecID id); */ enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags); -/** - * Generate standard extradata for AVC-Intra based on width/height and field - * order. - */ -int ff_generate_avci_extradata(AVStream *st); - /** * Copy side data from source to destination stream * diff --git a/libavformat/utils.c b/libavformat/utils.c index 50e8298241..98113086bd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1211,141 +1211,6 @@ error: return ret; } -int ff_generate_avci_extradata(AVStream *st) -{ - static const uint8_t avci100_1080p_extradata[] = { - // SPS - 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29, - 0xb6, 0xd4, 0x20, 0x22, 0x33, 0x19, 0xc6, 0x63, - 0x23, 0x21, 0x01, 0x11, 0x98, 0xce, 0x33, 0x19, - 0x18, 0x21, 0x02, 0x56, 0xb9, 0x3d, 0x7d, 0x7e, - 0x4f, 0xe3, 0x3f, 0x11, 0xf1, 0x9e, 0x08, 0xb8, - 0x8c, 0x54, 0x43, 0xc0, 0x78, 0x02, 0x27, 0xe2, - 0x70, 0x1e, 0x30, 0x10, 0x10, 0x14, 0x00, 0x00, - 0x03, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0xca, - 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - // PPS - 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x33, 0x48, - 0xd0 - }; - static const uint8_t avci100_1080i_extradata[] = { - // SPS - 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29, - 0xb6, 0xd4, 0x20, 0x22, 0x33, 0x19, 0xc6, 0x63, - 0x23, 0x21, 0x01, 0x11, 0x98, 0xce, 0x33, 0x19, - 0x18, 0x21, 0x03, 0x3a, 0x46, 0x65, 0x6a, 0x65, - 0x24, 0xad, 0xe9, 0x12, 0x32, 0x14, 0x1a, 0x26, - 0x34, 0xad, 0xa4, 0x41, 0x82, 0x23, 0x01, 0x50, - 0x2b, 0x1a, 0x24, 0x69, 0x48, 0x30, 0x40, 0x2e, - 0x11, 0x12, 0x08, 0xc6, 0x8c, 0x04, 0x41, 0x28, - 0x4c, 0x34, 0xf0, 0x1e, 0x01, 0x13, 0xf2, 0xe0, - 0x3c, 0x60, 0x20, 0x20, 0x28, 0x00, 0x00, 0x03, - 0x00, 0x08, 0x00, 0x00, 0x03, 0x01, 0x94, 0x20, - // PPS - 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x33, 0x48, - 0xd0 - }; - static const uint8_t avci50_1080p_extradata[] = { - // SPS - 0x00, 0x00, 0x00, 0x01, 0x67, 0x6e, 0x10, 0x28, - 0xa6, 0xd4, 0x20, 0x32, 0x33, 0x0c, 0x71, 0x18, - 0x88, 0x62, 0x10, 0x19, 0x19, 0x86, 0x38, 0x8c, - 0x44, 0x30, 0x21, 0x02, 0x56, 0x4e, 0x6f, 0x37, - 0xcd, 0xf9, 0xbf, 0x81, 0x6b, 0xf3, 0x7c, 0xde, - 0x6e, 0x6c, 0xd3, 0x3c, 0x05, 0xa0, 0x22, 0x7e, - 0x5f, 0xfc, 0x00, 0x0c, 0x00, 0x13, 0x8c, 0x04, - 0x04, 0x05, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, - 0x00, 0x03, 0x00, 0x32, 0x84, 0x00, 0x00, 0x00, - // PPS - 0x00, 0x00, 0x00, 0x01, 0x68, 0xee, 0x31, 0x12, - 0x11 - }; - static const uint8_t avci50_1080i_extradata[] = { - // SPS - 0x00, 0x00, 0x00, 0x01, 0x67, 0x6e, 0x10, 0x28, - 0xa6, 0xd4, 0x20, 0x32, 0x33, 0x0c, 0x71, 0x18, - 0x88, 0x62, 0x10, 0x19, 0x19, 0x86, 0x38, 0x8c, - 0x44, 0x30, 0x21, 0x02, 0x56, 0x4e, 0x6e, 0x61, - 0x87, 0x3e, 0x73, 0x4d, 0x98, 0x0c, 0x03, 0x06, - 0x9c, 0x0b, 0x73, 0xe6, 0xc0, 0xb5, 0x18, 0x63, - 0x0d, 0x39, 0xe0, 0x5b, 0x02, 0xd4, 0xc6, 0x19, - 0x1a, 0x79, 0x8c, 0x32, 0x34, 0x24, 0xf0, 0x16, - 0x81, 0x13, 0xf7, 0xff, 0x80, 0x02, 0x00, 0x01, - 0xf1, 0x80, 0x80, 0x80, 0xa0, 0x00, 0x00, 0x03, - 0x00, 0x20, 0x00, 0x00, 0x06, 0x50, 0x80, 0x00, - // PPS - 0x00, 0x00, 0x00, 0x01, 0x68, 0xee, 0x31, 0x12, - 0x11 - }; - static const uint8_t avci100_720p_extradata[] = { - // SPS - 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29, - 0xb6, 0xd4, 0x20, 0x2a, 0x33, 0x1d, 0xc7, 0x62, - 0xa1, 0x08, 0x40, 0x54, 0x66, 0x3b, 0x8e, 0xc5, - 0x42, 0x02, 0x10, 0x25, 0x64, 0x2c, 0x89, 0xe8, - 0x85, 0xe4, 0x21, 0x4b, 0x90, 0x83, 0x06, 0x95, - 0xd1, 0x06, 0x46, 0x97, 0x20, 0xc8, 0xd7, 0x43, - 0x08, 0x11, 0xc2, 0x1e, 0x4c, 0x91, 0x0f, 0x01, - 0x40, 0x16, 0xec, 0x07, 0x8c, 0x04, 0x04, 0x05, - 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x03, - 0x00, 0x64, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, - // PPS - 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x31, 0x12, - 0x11 - }; - static const uint8_t avci50_720p_extradata[] = { - // SPS - 0x00, 0x00, 0x00, 0x01, 0x67, 0x6e, 0x10, 0x20, - 0xa6, 0xd4, 0x20, 0x32, 0x33, 0x0c, 0x71, 0x18, - 0x88, 0x62, 0x10, 0x19, 0x19, 0x86, 0x38, 0x8c, - 0x44, 0x30, 0x21, 0x02, 0x56, 0x4e, 0x6f, 0x37, - 0xcd, 0xf9, 0xbf, 0x81, 0x6b, 0xf3, 0x7c, 0xde, - 0x6e, 0x6c, 0xd3, 0x3c, 0x0f, 0x01, 0x6e, 0xff, - 0xc0, 0x00, 0xc0, 0x01, 0x38, 0xc0, 0x40, 0x40, - 0x50, 0x00, 0x00, 0x03, 0x00, 0x10, 0x00, 0x00, - 0x06, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, - // PPS - 0x00, 0x00, 0x00, 0x01, 0x68, 0xee, 0x31, 0x12, - 0x11 - }; - - const uint8_t *data = NULL; - int ret, size = 0; - - if (st->codecpar->width == 1920) { - if (st->codecpar->field_order == AV_FIELD_PROGRESSIVE) { - data = avci100_1080p_extradata; - size = sizeof(avci100_1080p_extradata); - } else { - data = avci100_1080i_extradata; - size = sizeof(avci100_1080i_extradata); - } - } else if (st->codecpar->width == 1440) { - if (st->codecpar->field_order == AV_FIELD_PROGRESSIVE) { - data = avci50_1080p_extradata; - size = sizeof(avci50_1080p_extradata); - } else { - data = avci50_1080i_extradata; - size = sizeof(avci50_1080i_extradata); - } - } else if (st->codecpar->width == 1280) { - data = avci100_720p_extradata; - size = sizeof(avci100_720p_extradata); - } else if (st->codecpar->width == 960) { - data = avci50_720p_extradata; - size = sizeof(avci50_720p_extradata); - } - - if (!size) - return 0; - - if ((ret = ff_alloc_extradata(st->codecpar, size)) < 0) - return ret; - memcpy(st->codecpar->extradata, data, size); - - return 0; -} - uint8_t *av_stream_get_side_data(const AVStream *st, enum AVPacketSideDataType type, size_t *size) {