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 4C7464629F for ; Wed, 13 Sep 2023 19:42:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83EA568C9E3; Wed, 13 Sep 2023 22:42:43 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2047.outbound.protection.outlook.com [40.92.89.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1820868C9E2 for ; Wed, 13 Sep 2023 22:42:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EKBbUhcJ0+m+qbxdabujalpvKOdC90Uo0O02lUXe0FqpXDjmPIjURQzOImFGHpeZJ9Rh+MzSoAP5c9iezg+dQA19Oix8T05UATb/bJR2ctkOgujDR44DUfaY0GpFQddc5Fvk3ePs2Q0UskZ/b05+3R70CS1rd95Agt9rB7ar8BinlBE3+Tip/oq0moCJlaYxmfcz6dIgbz/7suo7VsE/3OsPy8PPSu9XdjpTV0dQecsO13ejt1j3rV9qSfxDvU0WH9Pbv/gVjPGFg+/zSFdlhLict03fBJ9vKwj7McI+tMHjJH7+w+AfFBXflLDd/oQzAkfyA0AUNwsrhNpmdlvOTw== 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=UgHiM2qN8H6YvkonzlTt61I230I8fJh9bagmfzQnLkI=; b=Cj/8ybZ4Pi47xlnCBM8A1SbToVX3NrBDGW9FvWrH6iWp2hZOYyyU/WdhpWZY6fVTPwtYYHAJjfPLPg/U0HK1hrojlcFA4JQC0/hs0iTJOeWpVGSMccgiNX9uAGoFw/z1DFGG1muBwOFa9pyrW46mYlz1IlBy/7EbM8bcULEyx0uGoVIooVdJX9NBUAEzzRaY/fOgkSijIHJgE676LTi6HTmPz/bkp9JsbP+IE2hBXIEuWyW9JxmZtFrm13zZ0SwMB8J8mmvf9Y89eb+eUGL9eZSeNS2XpLb2GaFJMNlNt66YE0MapVsxpT4t30PD9eMeHoHp35Xx8uvNPi9xKtfmoA== 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=UgHiM2qN8H6YvkonzlTt61I230I8fJh9bagmfzQnLkI=; b=ZpoeS3WQolGpG7E3KggFeRGSgSmgnYESO3NpXaL+FUu+fqIcMzu7s4B8BLm4ly7GkFOTVYVLsGQm0P+SdClcVY4BV0F1u/CxPSwx+eodGDl/fAOaAO3WkrYu9FFEHZAn7k6pd5CII5lvaHHRe9FJvd2HqOK8sxInGfW/igtyJmPHq9zAeeRjhhbiPbUj9ndXNNAveRJOQ771c/Q4fRKJibtFzSIOyT2z4UmRw/xzPUmb5khfkcCDsHNVM7eb29b08GBPUWxj/0Czi0306qfgpVn9aPcMA/npuTyWXMcJ5WqvC0//Qnic80q00gBMl+d3fyzF9rztF3RkMRzzHKHtfA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0291.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Wed, 13 Sep 2023 19:42:40 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::3fff:eb7b:b8e2:4dba]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::3fff:eb7b:b8e2:4dba%4]) with mapi id 15.20.6768.036; Wed, 13 Sep 2023 19:42:39 +0000 Message-ID: Date: Wed, 13 Sep 2023 21:43:57 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [MVBxbNo6gy58vDBCsSF/87jP3H5ViXM3] X-ClientProxiedBy: ZR0P278CA0130.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <2f7e75dc-9495-cea6-6fed-dc75f75e3a6f@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0291:EE_ X-MS-Office365-Filtering-Correlation-Id: 30f1448c-bb87-42b3-c07c-08dbb49196ba X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DpYKK7brGz8EbEmWEE2cSlmOD6kFm57I6TgPAqbVzc8XP7RINxs23Qja+maFabWciF8fzEGPxo39uHv8DChsGrnrI/2mdmxpdVr0GuueY2KVxfQZlR7ysUOhQDOD2+BXkkh8NNZ58RXHYysJKptpsUn761wNU52oXZVeh1SGv5WZa6VHLxPthqDqvuvKLUFLzM8Vr5/WB4VdpHyGDded3k87WybRCD7CT9nLCVgOqjEfSBid8ky4vBUfai/OBDxsB4xhPkJNDsGr9zK1U5AB5GGwzi6flJCMqb1kpqRKKctt1fHBC6xMho/S3SdtHt+mlV8VazqzNLvPy97eFC8H6kRsVUBU6IKLKfxJnzeyviFbXI77pVR6AZxVhDFHEY8wqPZOiiSe0Lhu+fXbDPmZchfeS+a6lQ4A6cI69flNlX/419m+UBfZI09tiW/2241uHts5gaxcWrMZwSlh86S7gcllJWrtgW8EGpm6XLRIEhXjCwnlYAJm4BvpuhsuZxiz9PmXQkExPOJ8BMxxlCtvbyJ0NF8TUlXZUnhZ2MAIrw502Ak6txmSyIrOhkrtami0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cUFDNGRyWDRkV1B3WGt2L01ySTFFVFFicG9DbzNHS3hWRitBSlhTdTh4NUVQ?= =?utf-8?B?ZDVuVWI3UFNMeHBMdTRXdUk4Zm1BVDdveE1aTkZwMm9SZXkzQ0VUeW1TYUhI?= =?utf-8?B?SEVpNHZJNE9QOWUyOHNiY2MwTWlvSXZkem9UaHZmZlZRK3JuS01NL2M4VUt3?= =?utf-8?B?R0l3Nkp4WVhXSk1tbkxmSzNuU2JObFYwVTcyaitXUnZNcytMZlVTVy9neFc3?= =?utf-8?B?a01PODROTC9wZVpUeXVzeXhZL2hTT1QvamRsMERJM0NrSU9PbmluVlhlSlZE?= =?utf-8?B?MC9JOUxTVFlsZ3NuM0Evd3JVQUh5b1ZtNitUY2pnS2tpMU9lZEVBc0pxeXBM?= =?utf-8?B?UUpNaCtJVE1udjRQT0c1ZUlVL01zS1NERmkxQ2dVczdxdmFQU3hySjdFc0pN?= =?utf-8?B?T1QxYTVBU0F6b1pYeXhjUmkyN3FXd2xiZE5vMzF5ZVJyd2FRZkh1VTlqTmRl?= =?utf-8?B?MTN4ZlM1V0xqanVTU2hwRFRDTkhlK1cxck5VMXY1QTRSM3ZUVzJiSU9HUjNp?= =?utf-8?B?d1Z2S3FPL2drTGZDUTZ6b0xFOFVtYStqWWp2akFRUkJnZGszZXZ0cEZvM1Ix?= =?utf-8?B?ZU9pb1NGQ0ZrZzc3N0JaampsTm9haVVJOUhqcW9tNzV0dFNNaGxKK1pNME9q?= =?utf-8?B?Wnprbi9hUVplbUIwRERNMXQvYlBWSDlFRllRUFdIekxjWncrUm44djdFTzhL?= =?utf-8?B?c0tjQy9YR0wvRzlqTEFXdmQ5SEErUVUxQ1dvQSt6RDVzYVd2ZXhFODBXdFZV?= =?utf-8?B?Nk51MlJ0WGNBY2lEdk9PaU9OQStHSE1DdnhJQ3BiSjY2azZnaG5VQUxqSHFv?= =?utf-8?B?Z0Ivbi9lRDhxUFFYbDc3NHQzU05tb2t4Mm5ReVVUYWJINXhRVjdvSm9SSms2?= =?utf-8?B?b09vdWVrK0pUTGh4L2tPT01vbmcxKy9Mb1gzUml1aHhNcmVVc1E2RG55MEVx?= =?utf-8?B?WmIwQmQ0MnBKQllsNlVWWFdYc2MrYWFhSHNCb08zVUowZm5hRUx2QlFvZEZ5?= =?utf-8?B?dFNnSmh1MWlxMDJzSmRWWFYzWDV3S3JYOEhGMEdxMFlEUWtaVUYzWDZUK3hZ?= =?utf-8?B?MC9zZzlob2NpcVJOcFZhTVQrWERJQkUrNVFBM3ZVS2FuR0ZuNVBKc3FYM2Zi?= =?utf-8?B?OEtHNmpIVTJaam5KcFdJWXVsN2N0Q0pJanlBeGx1M3EySzQ1V3ZlTkJUYVpa?= =?utf-8?B?Ymdvc1hsZnFDamhrTUFwNWozamRpTGIzRGdGa081S3BCb3VneXdYUVp3SDhG?= =?utf-8?B?eGpZeXIzZnRDTHRGMkRYbDRuRVVONTFtRUt4UDNBcWQrN2l4L1ViVlpvWXJl?= =?utf-8?B?bDNUaForTnhmZWJXZUQ1RkxmTHNYR2Q5R1paWGIvZC9sR0pPV29RTUlVYnli?= =?utf-8?B?dmtCcUladE5uRnJsZFlNQ25IcmV5VmRJRzMxSnpXQ2N3dmFtWVpLT1NlbXRX?= =?utf-8?B?L3RreGtmRkJ2akM5MnJzbTNUR29zMmV3QkVqeWttVnl6a0VNZitDdW1OcWg2?= =?utf-8?B?R3YwYm9JbU9tbEQ0RmQzU3RTMWpCN1dQMSs0MzdtdWVGUENHbzZUbWptcHFP?= =?utf-8?B?R0RTUHZZSzdnSHJwNVZWdXE0R2Q5T3E0VUhYQjgvQlBDbmc3WHV4ZHRGb0NZ?= =?utf-8?B?WURNZFVDRzlZQjRZeW82OVkrUzZldXRKTU5MdFYrU0M1QmU1S05lVmNZZ0pB?= =?utf-8?Q?o73ZOD46SmA9NUlo/RCY?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30f1448c-bb87-42b3-c07c-08dbb49196ba X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 19:42:39.7667 (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: PR3P250MB0291 Subject: Re: [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 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: Andreas Rheinhardt: > 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; Will apply this tomorrow unless there are objections. - Andreas _______________________________________________ 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".