From patchwork Fri Aug 11 10:43:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b1b:b0:130:ccc6:6c4b with SMTP id l27csp1256814pzh; Fri, 11 Aug 2023 03:42:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGG0BBWK82aTM+AbaTNUSg6XSCUlDiayZ4F+PUVtc+N89YEUAHCZlhGzELwWW1NBMvyHe1t X-Received: by 2002:a17:906:8a45:b0:99b:d4a0:1329 with SMTP id gx5-20020a1709068a4500b0099bd4a01329mr1378129ejc.38.1691750555493; Fri, 11 Aug 2023 03:42:35 -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 a22-20020a170906685600b00988565fbf63si3243275ejs.437.2023.08.11.03.42.33; Fri, 11 Aug 2023 03:42:35 -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="ft+/Q5kX"; 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 2CD1268C7A3; Fri, 11 Aug 2023 13:42:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2092.outbound.protection.outlook.com [40.92.58.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F0CC68C732 for ; Fri, 11 Aug 2023 13:42:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ko4QBIhYBqYRlw9cDC99yptdPeovhDYbiP/KU+Trh84784gJY+Brxy1TyysS+xFYrpJXzuVaV9ji6TlMwBegnxgGPqvlscJL+dJ5nOGW1M1pdP3VvC6+O4VOOKT5athIqkEYN5Sp05BHARBxCpcI/sdKbwu+SwJGFGw0SW2rV2y+u6Qr1So8dytH200FFkwIOUORzkKQKCFvGh7uTAVGpGhBbezoMeVVFqVt8fyfNIG3zq7NbP2xH2Xg/VKXQjNe8uHmZEzyIP0u8S4ulRvBK1ORIcew8Fk/ThKEQQ1kbJn7ZS64R7eGIJ2OO7fuxPxB7utErNKulBGman1RUPd0ow== 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=WDTiHAhCMxsZKmLObqlsszKrTbBBO9NB4R49ZCuV+E8=; b=G4kScnOcPzIKqYIJRUjg4P296Qm14Ux2LbjKvzM86BaE2htNG62E1AvF4h5dFnFgmhDecUVPbJaF5HQ+qehq+ll38XNMPNvd7B94drztw/0HUBqAo3HmiIJ6FndYa+gB1zSOQydhZu2H9+qRfwDgpSqsXjC6nmiWtZd/l6tm+mqg0LIp3usm2NLJveHOtHpwMGx4T3sowRyN/IfCII+kyGzPilcQp3N8x3eerBJeiDgTLk6tpmHG/nqVZlwjdfv0qUf61AiWFrRYABB8UFSmwqsrhHrcwgfch/GEDNG43XuXLaZPRIcizI+aoeKKEgreAClA/o1iFswohOPAiRxYUA== 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=WDTiHAhCMxsZKmLObqlsszKrTbBBO9NB4R49ZCuV+E8=; b=ft+/Q5kXwNSU/h2kpdPlhzmreasdLJ1377d3N/FRCE9QDU0BEzfwylVloQgVWMTQIz4fTpRlVhGi71HE/oEcl5cD84bHwkXFmDjlaqqwsKkj+yivyuKVnzMx4Xh8DInCtcHwO3F8cBDu3d1TkK7i9xG5GGe1Lj1kEg2kAJEGuGQDWYelBCHvJs6A9143Q1IGZ71LTnwNsEf6Oiu0exkRZQ5W1XDTWAYmaDntjebwBjdBiCxKfw0HuFj+tNec9XV45vY0FVLcm97dC04VyKuTz5W7GytQYjLTXl2mhQ06VnftgrASqrCyNsoa6s7M5IWm8dd3KGlwDKA6SyWeFrSopA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0273.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 10:42:20 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.029; Fri, 11 Aug 2023 10:42:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Aug 2023 12:43:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nIO9kxUA0ySyS1uVKBOBBRDNedNpk+fpXe16wWhWw14=] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230811104328.2278289-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0273:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e543118-1c5b-43b0-b266-08db9a57a3f2 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpEPU/wJLY7hod/UA3ILpuOlH19mr8a1WxXmh7+YeLwmK466og7mG4l0hYXpWNfpIWU1DqkRniR6oJ/vV2xRbxNY/bdxnv/R7du0nk0PDkLryXoxqnL2q67p7f662vmYJFF9nVNc5gQUIrfRrOn0gWxcPxe3yHMcZzdP5ttsAXPahacb98xb8CaB9d8idrMYTLREAP5AqpSSMThSITPtwkz3NzUrt13487/jFobNLOxbQmGj7r56LcckTf9wq+jK9Dt14xRo+SqNcK2ByhjNSjylB5bXxVgvycKpb/wxyGgo0mW/A4Wz7gC+nEnoKcN+anEOV36ohFYXKNxGWX8OBxm9bQUshJ0bi+zB0MZ4vM/LBduEjLq8s6Hftr74zLkYULKqvo9J+qklTkE7n7jpdWs1EjH6QLRDYc72lRodydTrEfYNba8qiOL9719frBkN6niKNHeQtiHZR2NPHoe1Y1jA6eERO11R5HXmO4z8wxGDxVggJoztFpCxgbvzzzNXZSdzJU0sPLEgZUTcTc/m1uQN3dV90J7D0WvZJeVeS252MBSwtjW1zKytp8X7y9zwVqkSkWury90f4iUuvMkwfeYXCe1L3JOWDKIR92fWcLetntB1gyt6qbYt7PvWr68vciyP7tCQ4SYgIp+zSNo1u5pTMz5jELsilZ7Inf93hxh1ubL6ANVZahKzs12Y3hdkfXFNk4iMeMiMmiAAomZzkKxrEA+hFWqZvdIR2OyqazhFTLdWXTwX29cLq+Mmwk4JMI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ahwWEmlTm9hYYmBWPWdIGe7AxwZcs7g4pZm4KXmg5jeOkqNYQ8lJ35g9fLmu5iJNAZV9H63+IJGAh26YzdhVNrjYbqndid9HvNGGhinatLRWVKEJ4oc6uQmyAzl32Wh83A87E5H4XvH4bN2rWGmrlWy4biYR7G3sYZH2tw1o7pTvUjRf+DLLysc6eE8EGfogRH7lw24cRYEVjRGxxzQvod5FMl2Q0v3SrrBdXIJq5p9i3IsevsEy4xmVbqUJegKFIqGyWtUoDWcOcl1jLsLBRfkZmUDkaEE8yaqlYVv0hLPzbsi4UBKIITdKtmg7vCGhBRTGhPAs2b506OZicofOWF0nl7QsXEAvD8wDOTgINRhdWFFJBaHbMTSz/rvQXr+ieYkm7+u2NA1g4Hh/DCtXzGKPCE+UiEs2BTGxQwhOmmBxSxVeyVIaw2rN3LzkvBMvXKwCN8oYZ7gFyIAekm/giVhmsyA2rMWMSPvnA6wn4G8FDCNe9vSrl3IazORCdj7wkBzmc002eN+LVatFy31FepICx+UNpq31WNr3SQFzc66r3kx8tciOB1wnTdvkC3wteCNBCOurNKgQLsfxJzdMvk7730BDAn6HgGJ4nbyqpcOjlb1ZovIPxYZNpPSJ4JOl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TB4V88Y5CnXKXfPS198fNmLaqh/e00N0WRwCJ5UkZQ02v/vpTzKmrTEAd7XtBkv7QwlRqi1uUSct9nup9xnIRNeht8PiVEzzCMSw/j4ox7Udpi2TpT1HQBcP5T1P9VjA9J95t+UoK+kHEDX6fPH2vxOI9QTkN08gkpwPmFaRKw3zI5BYNJL+NDfG847xZMImcp44u1bjI9gqgJGl/cYM6L9K7hBJRZH3j5z7KB7FaNwJVSm9k/jXpVzU0ackM3fFgE5ztvqSqx/jzGbtpuD4szPmWyoPWfJLKkmgKMx5vPI3kSpyqOLbb97kMq1g7V2vdC8QRwAOwCI5n2mbMMjigSyzIHNDJYG6x1/a7DN96a2kQCOmPXxq94cr01edZW0jgetup8dwGzB8DHJtMxpS0L/I38vDLfziyYfHey98HPTYud1bVZEvuY0FeCVXAONe4EKZClvyimixLsN8xA9xVHU2Xb3w1TJ0gXIkNp15nNKUOuNGQn5jdgKeEeBUVo5QB4zVBclBV7IgHSAA+VqTLVaKYYIaHyIzay2fNTQ0q0XZgR9ff6VrEYso+UliA8ZbESbi5BJkDLM++rQAtQxc3jloIW0Hf4qS79jxvtmZhnjDSkwdGo6BXyrgm/heiMkb5mIYc2DHCirN3QXZ9cUQHNcQxnwHQ+dccRBjTdBSDsKLm0PNhUpM1uHEh+g6t2SbvMXsJnrprz5H/IRErXPnRsuWcpgbeeZZpt+JgHxofODlOGAUKSxQp38Bcuga9IAxkhHxpSPSdQwXHYgaL46gW8MbYSaOR+QVe4VTEJY0+6oUjvEAEMxZdvJfAwP4D+UVvJCwfrQ84DWVKjw00u4eFy+TOJITzPVaeITbyQjWClMn3PiHzigCzHHjh1ZhaZoksbWGcd5wghL8C25Ymq/+BDrr4MF51G7NT1D3KmOZGbNVIB6xkcBFP7SyEjk4YfuPfzcVsNskiSc0NQZ/nqQjZxHd3c7uG2jRLCebH35YIgCsfeHShHzhtmATsqw1W1MXSqAbRq85GdG5R917NcJ7o2PnW8Jjbf8X8uxwOnhnx6cVksSbyUd8Md2LUaV6P4dS6j6b5jSs3xJNBRU7eUMDE+GMjwBxxzor+GulJxEKi5ubnAx2d8N/Sum5Wv0e+nqL8N0J1tXeaT3Gwy59vlIR/dBLsza3nD56Q+w2MoemfABw43k8wpzXiItZNPP1pIZpzQg3g2Tkyx9ViZOPB+fFv/oWWv4aBv5lgJrm17/nNqk97UGf+42aNHqW1ANczuiD X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e543118-1c5b-43b0-b266-08db9a57a3f2 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 10:42:20.8914 (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: PR3P250MB0273 Subject: [FFmpeg-devel] [PATCH 2/9] avformat/matroska: Move ff_matroska_video_stereo_plane to demuxer 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: ERdZF4AmSsEf Only used there. Signed-off-by: Andreas Rheinhardt --- libavformat/matroska.c | 6 ------ libavformat/matroska.h | 1 - libavformat/matroskadec.c | 8 +++++++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 79b2d09984..acfacc85dd 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -146,12 +146,6 @@ const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_ "block_rl", }; -const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = { - "left", - "right", - "background", -}; - int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode) { AVStereo3D *stereo; diff --git a/libavformat/matroska.h b/libavformat/matroska.h index ead7c085b9..c5b5a4b310 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -387,7 +387,6 @@ extern const CodecTags ff_mkv_codec_tags[]; extern const CodecTags ff_webm_codec_tags[]; extern const AVMetadataConv ff_mkv_metadata_conv[]; extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB]; -extern const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT]; /* AVStream Metadata tag keys for WebM Dash Manifest */ #define INITIALIZATION_RANGE "webm_dash_manifest_initialization_range" diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 49950956b6..c6042eed2b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -824,6 +824,12 @@ static const CodecMime mkv_mime_tags[] = { {"" , AV_CODEC_ID_NONE} }; +static const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = { + "left", + "right", + "background", +}; + static const char *const matroska_doctypes[] = { "matroska", "webm" }; /* @@ -2991,7 +2997,7 @@ static int matroska_parse_tracks(AVFormatContext *s) if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT) continue; snprintf(buf, sizeof(buf), "%s_%d", - ff_matroska_video_stereo_plane[planes[j].type], i); + matroska_video_stereo_plane[planes[j].type], i); for (k=0; k < matroska->tracks.nb_elem; k++) if (planes[j].uid == tracks[k].uid && tracks[k].stream) { av_dict_set(&tracks[k].stream->metadata,