From patchwork Mon Sep 11 13:36:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2143296pzb; Mon, 11 Sep 2023 06:35:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4pZXYNt8XE0R0cJQGNSz42uWS18+oP7MJPMLf7p+VObOSn1773UvAIm2Xwkplj61ZXLK1 X-Received: by 2002:a17:906:10cb:b0:9a5:d48f:c906 with SMTP id v11-20020a17090610cb00b009a5d48fc906mr8951247ejv.15.1694439359628; Mon, 11 Sep 2023 06:35:59 -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 l9-20020a170906230900b0099da059a970si6539251eja.132.2023.09.11.06.35.58; Mon, 11 Sep 2023 06:35:59 -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=GydI1tA1; 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 0B26168C92F; Mon, 11 Sep 2023 16:35:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2019.outbound.protection.outlook.com [40.92.75.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F38B568C88D for ; Mon, 11 Sep 2023 16:35:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bvyOy8jq1In8X5MnzkCpJyOKKi4fkUTo0IVW24eG01+PYAD8FlRY65VUuf6brs9YKe/CC7pFuQ3PC9lCdxoshuD6+hddiMhPb9KTZkDTHt1RPVtA7OfH/UENfrz7dr8JumfVzdLciL34y1Y2syz8vwjEh2TWz3nD2k8H0CmOQXVOv50TlzDqyvdk32I49EYpTmCH1vvTAKOL0rqX69M+vArdeAboq5Dv3y2J7GpK1aUtKv0MBvYvbPkf5PIm2vP/uOD3OIsgBt2YQf+1CiRIUVlZCX3Y2ht1GB24H5YNXRjbAfds47uaflpJrJ2s3SmNXXwo8fVwSfUfuXolup+L1Q== 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=5KHIYGCAEa8IQg/NwCW39wlReIgc8032B7CNrIp7RCM=; b=dwvCJux1VIpnMEIR+JAgQc8dX2l3aAoxd6lQb1XQ1WAoOKh0Wn3yql5qCeNwHksjZ4Who/VVIAdY15j+Q+Dm54T/tPrXdITgSC/J/vYfAmBrWFbPPJ89kIOmNJw2QBK4mfMQpp2tp03d9I2RixjITyPmi5EtbSvtILOPxI+ZRE868ddTfZGTkU0zR8f+MoKgUkmjXBZZVadN8UOCLDH9Nx5Xy8G7crI7cuz9/SGOp6Zv3q33PYnY148OmCqoXCKw01lp9eRn3qeuogFIm/4efWYAGib7I19aE1NK70gy3mxvPJVuFaUtgMoP2DsJBIUR0kI/c2tykxkQcidzPjJVEw== 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=5KHIYGCAEa8IQg/NwCW39wlReIgc8032B7CNrIp7RCM=; b=GydI1tA1ulH30FPORhAZ6fnB1SaaLjUXLWmrAXUh5xbpTHJBS6DqhIFoGjoptDWVDS4Z4+m68KlqkzTiJKdkzWPrfYMFUd3sC11urjHmjww/UNshHDUTBg9kTwh2aMkzX5Hb5CtxJ28mcVMgeJzvIK44HEvOcIOMIBJJR9JjNk2nnGPM2hz5KF9IF2U7Fk5HVHquNp8uL2EeaQvrCncTj9Mh+rOPrxjEcxtGRbb9NOfSHSkNEcmmof0TLIBkGxO0Xzd5oIJLD5iRPyjREKiGyDGJ0k9FwWrlL6yl1hb0J2GnQM54fiyo0AqXbgYKUVcz9XXYA+qEg6XoOPgllnt5DA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0390.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 13:35:45 +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.6768.029; Mon, 11 Sep 2023 13:35:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 15:36:58 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [s4ox6BnwYqiCGd1GFoU0eaBYouVwq2+b] X-ClientProxiedBy: ZR0P278CA0175.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230911133658.4178874-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0390:EE_ X-MS-Office365-Filtering-Correlation-Id: f6166aa1-56fa-4029-407d-08dbb2cc008c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4l/Hpo8Ed5q0nDuJg0pOTHGRuVJdffWEkoGP5LtVOeVBxS3myLdXbhaOVQFgWeeCPwuLcWF/f2Gz+bQh9YCzij5UIPnQfXna4BRBdsFc4M4MhwGhkXN3vpsY7zNuNlVvaEVwZjYeDO5Zb7VXZY2+7BHlHoO5c27n7QmycdzSTJaAhXbnO/j/2cUcg+oTf05pnIVwqq7OYvFasgV26Gk8xc2aW1r4cXG8HDW8tnE+qHmXnIkgtTk/QMQgphzkQZKqqhCCp7c9NA/fFohoO7UduDTGOExDisbgdOfs0FrHhc6cRSQKsnvm1ZzFS8OGdwl5hQY4ayMFQYamkc/pwMJ1luM/lf/zVSVwEM2AGBHX3gKZvWOHaZ9837CPSZQNog95bgE4/mNiZIHVemfZkIc9sWoR7hjOik1keCIPcwJQQgG6yMi+1b3t+WtjE0Uh0e4v8X8KXRB6Xfu5BM5LgfMXLU0PG17LckyS5pnpPer8gmK7Ig1NhvTcLUEq6ygMWi0GeOdCWZ7w0XfYCKCcPLYiHrsNuJleoF1q+wmh4G6GKOecUpq9Yb9AIFqgP21om49neWq8tcifouVRGzlqrhKaVI1wdx3iIbOfy5/LT/GfLpg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LXFWSi9aVEho0dL+Zc2KDdqIBovjIji0sXBPtGhqaFgRrFc1ZmFrFrwTuqPMrhN5r9wn8BhS1c3MRYT120D+2kvfZIKtomfirzwCv2WSoLrwFElbtL8H9yJaFcuJC8WDuR0Ip2loSCju5EyXRlfY6YTeXSzWv+jxumqkX23Mu2qKDhWoJT+5x/fPh+1jtFsyIJnr2S09lesiWosGUJJ0Wh1n49rhlrEMGCb5X29eq9to6fZ9PMc12YV3X6uIEQZZoSjfGznJTWzPt4jzpXlD7ntD8udFYj13Zo+MZ/uq9Wgcke8RfdE072zBaIXmQNwKstpyBANPBWtxiNDwu2WCznbMaQeJ2X+D3AO/SaJQ50jYGL4vlZ7QddDNpuNw3q1w6McZN9ARa07FHuIQxCq/cfMeBUHc8Iwszjs6lKFicnCllT0TwpOu3D53IfEDuwQNa+bVcanTNd0fs/DdjUqYZ3oINTvqIQoReMsVL5dHGnG0Fl1hd2sojydBm7Qh2jeZdIAH8xl05L5pDyYZU7M4eRceourFI8xtfxDAp2vegjoHXu6v+9SxBXtnbxLe+nAVc8/KRBgmRMtv7UKHdluJTOxuwHoAWk8y5b4v1LogSFdcuL4ZTZk6So0VUV1G4CzREQBH35LNC1tPthujkf8oRKN11XDeORPwnK0C/7HpynD0PQKpzunTyn7XeJOjVhuOXZkU6AZHWhjPKmz09haWzT9RjwSaeirRFZqJjae917d4btA9ztqa9hQt9yq2zhFW8jZFR7Yh3d4+D+f0+SBb5bjAzidxl62KleMTyx7nKxBYU98WPHmJdc1W820n2WFaFca9Z9drxtrYnd1n5WA2PuAR8mxXvEIFjGczDCopJvjF5Zw3ux9QOQfLfrJTnQ/n6cw+PMo6AbVwMVBSiMniiE8BpSYAS4B9+cOtTkt3nqVMuEiYuLnsP8olmBl99YuovtGBdCkmH5Zmv3aao5tnmILnhZd8JhD5OrhrUghJoAAEscqbwoeD9loZrSLwuTo8MAlLUPZuNGa4modi5HEhkT9gkvUOlK2aq5CaOk55s6EbiBnisi/4NtOuY8HS407rPuoknW2gf8gbYoGfBWSxUtK0rtC6tYL9rvvQQjqWNzOHs5sMWVipkbq8jH87bXc2CW9uB4tcdkC6QrRPeUpVHcffHMtcU9i1O9hNkutI1eX5sFSFKkvdDvwuYKk9VT+iM5HjRsrxbz759TsHppBJbySgAkmufd8pOBWPqyd07yy0+ZoBvyItlcqd1xZCzZN0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6166aa1-56fa-4029-407d-08dbb2cc008c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 13:35:45.8207 (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: AM8P250MB0390 Subject: [FFmpeg-devel] [PATCH] avformat: Inline raw_codec_id where known 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: 1D8aG0OUZiVY Signed-off-by: Andreas Rheinhardt --- libavformat/aacdec.c | 2 +- libavformat/adxdec.c | 2 +- libavformat/dfpwmdec.c | 2 +- libavformat/gsmdec.c | 2 +- libavformat/loasdec.c | 2 +- libavformat/serdec.c | 2 +- libavformat/wsddec.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 41c9a36239..4da98a6884 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -113,7 +113,7 @@ static int adts_aac_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->codec_id = s->iformat->raw_codec_id; + st->codecpar->codec_id = AV_CODEC_ID_AAC; ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; ff_id3v1_read(s); diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c index d808adbf3b..b6bd3303a7 100644 --- a/libavformat/adxdec.c +++ b/libavformat/adxdec.c @@ -120,7 +120,7 @@ static int adx_read_header(AVFormatContext *s) par->ch_layout.nb_channels = channels; par->codec_type = AVMEDIA_TYPE_AUDIO; - par->codec_id = s->iformat->raw_codec_id; + par->codec_id = AV_CODEC_ID_ADPCM_ADX; par->bit_rate = (int64_t)par->sample_rate * par->ch_layout.nb_channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES; avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, par->sample_rate); diff --git a/libavformat/dfpwmdec.c b/libavformat/dfpwmdec.c index 685b95148c..b92b00f13a 100644 --- a/libavformat/dfpwmdec.c +++ b/libavformat/dfpwmdec.c @@ -50,7 +50,7 @@ static int dfpwm_read_header(AVFormatContext *s) par = st->codecpar; par->codec_type = AVMEDIA_TYPE_AUDIO; - par->codec_id = s->iformat->raw_codec_id; + par->codec_id = AV_CODEC_ID_DFPWM; par->sample_rate = s1->sample_rate; #if FF_API_OLD_CHANNEL_LAYOUT if (s1->ch_layout.nb_channels) { diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c index 09dc0e0fb3..7150daa510 100644 --- a/libavformat/gsmdec.c +++ b/libavformat/gsmdec.c @@ -78,7 +78,7 @@ static int gsm_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->codec_id = s->iformat->raw_codec_id; + st->codecpar->codec_id = AV_CODEC_ID_GSM; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = c->sample_rate; st->codecpar->bit_rate = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES; diff --git a/libavformat/loasdec.c b/libavformat/loasdec.c index e739b6c196..7b8b2ea4bc 100644 --- a/libavformat/loasdec.c +++ b/libavformat/loasdec.c @@ -74,7 +74,7 @@ static int loas_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->codec_id = s->iformat->raw_codec_id; + st->codecpar->codec_id = AV_CODEC_ID_AAC_LATM; ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; //LCM of all possible AAC sample rates diff --git a/libavformat/serdec.c b/libavformat/serdec.c index 11add35b32..639c899249 100644 --- a/libavformat/serdec.c +++ b/libavformat/serdec.c @@ -80,7 +80,7 @@ static int ser_read_header(AVFormatContext *s) } st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - st->codecpar->codec_id = s->iformat->raw_codec_id; + st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; avpriv_set_pts_info(st, 64, ser->framerate.den, ser->framerate.num); diff --git a/libavformat/wsddec.c b/libavformat/wsddec.c index 9bee4d51bb..8153d898dd 100644 --- a/libavformat/wsddec.c +++ b/libavformat/wsddec.c @@ -125,7 +125,7 @@ static int wsd_read_header(AVFormatContext *s) av_dict_set(&s->metadata, "playback_time", playback_time, 0); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->codec_id = s->iformat->raw_codec_id; + st->codecpar->codec_id = AV_CODEC_ID_DSD_MSBF; st->codecpar->sample_rate = avio_rb32(pb) / 8; avio_skip(pb, 4); st->codecpar->ch_layout.nb_channels = avio_r8(pb) & 0xF;