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 44D4D48F52 for ; Fri, 1 Mar 2024 11:48:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B19468D23E; Fri, 1 Mar 2024 13:48:05 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FB6068D124 for ; Fri, 1 Mar 2024 13:47:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nk+8hRsDfYnRMWZTB1jpg2VnriKjcdyX0eIP5OaLDSte/LAGnPcjC4vU7QinBVIV17lmi9FIdfqKpprd545Sb+CAIpS0kVgCr1+uGaD1DUqRUskOHegJ0vcJ07AzI/gGiAXqInW8YHrOH7XQ255IFZhcBVT6HYfK9H5MEzJACotfyl70ybOqstJyiJBSBpRuRpobG825qk73o2D19jI9KQhTHKK5jcpbUwKgTnWegowhXlog+YdZZyJ4q2QRkU49k4KGggT0QFbA6wd2a9ORWhlkpdTb9UlWgGj6IWzqXi/liWREjEOjyVK/leETgAatw34kfznIo/JOauF4DbkLcw== 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=buZvKzv8khNeduwhTO+bM0f9PH/D7LOXAFBTrDH8Ibg=; b=YV3pCgNYd694UcVD9LCGcls61qhJWOxMwAOHk3Y8m596x7G/XBa2MnmqLa46FFqaLwFJUPFEgr3iV83c6o4cRNpRAP1MOftLMblai4AnYD9Z7eGizYTOYEzLDdez3zzydpb6TQuGZbgQOqM9jLePh861xFdo78l2zw2sPRqLYkgiqFa8UOfx849vD8xr9JCepGEMiPfEyWttqomeFydu7SJ8kMmEYzKn3Ws+3OFOqCZhhSElVHC4rdDK5wPqTadpDUNlZBRCAmcA3Zb4CgsexPn5ooZPcmHkberJxkVbOBN43eNqXst2maTUl5VMlNllU3SjvuUfR/ZS/Nmo3HUtvA== 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=buZvKzv8khNeduwhTO+bM0f9PH/D7LOXAFBTrDH8Ibg=; b=fp9XjG/recjz8pIo3JE85QzE/xRDkronOD1OWDYrS0jcDDKGE1LjT1szsoDrwt1uBSVNm9tfMyi9Nf31xgEcCYEOHVArredbtxLsYx8igYkzn5SGS3D3K1+HklOC3mdW2j9NbnzdJZeX6IyXCFePv9vKNfuW66HuqaLuperT+ZuopREywbSXqLN8q/AeywYV6NnNq+qMF3TkJYbc4c53fTt1ncL6JP/zIyaEKps0OWMwHj5ADv4Ttg8ut/Tie+vUx7HuMz5ji7fyVnrIOc7ur2rDoD0vh5sQw6aoHxFD0ChJPTJyBrRMdxFoyG482om9p0HYhKLtxmJ2L4QkvMPDrw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PA1P250MB1067.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:461::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.41; Fri, 1 Mar 2024 11:32:29 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Fri, 1 Mar 2024 11:32:29 +0000 Message-ID: Date: Fri, 1 Mar 2024 12:34:27 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [uJiXc4MDzXm/FsWNkZXKrTaHOQwXWA58/hoqJf7oJQg=] X-ClientProxiedBy: ZR0P278CA0088.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <4ba4e14e-cf14-4054-94ab-dcd757c2c496@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PA1P250MB1067:EE_ X-MS-Office365-Filtering-Correlation-Id: 15251de6-c355-4e71-a41b-08dc39e346fe X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KQC98UkmOK6fp7asvymJOvaYfMtsj7zBqhLrSEYjVQiBP04/EQjtINXpgv23kx3+oMNe4EQKJ2PaEwNAnnSZRtJkZbbSEhq5IL8uuqYiygKxQsveywyfICVdZ6K1FiQEBdhWX+PZfgPPND+7RoJKjVLtKbFHbH1l0/+zMt+spGNsXXue+eNlf+iXn3TT/FQ3P95fVsM17c0VdH9OxgKE5YWkihJxOj4djx1d+mgSowJO69OXKwh0CPuN9EPjGMKsNx54XDPUf++83B+cacdWQ3gQEnaSyGSO6GG2CtIFwTLaXlAPzLyNtWHFJ86rg8v+qH0TNAJn9Xac3ip+cPKmHPSzDZNx9UjcQevkvOf6am6tTq6Dad1ODXSK24muJ6ElQBXlLbZ5qSO6RnQdpCpd49yISX2Kl2zhUBjrMj8LtCq0x+3P/nokFhGiWWauvakrdQCgatXcXD4tNfRhBw2FfNFQjCecTib1Unl0c4xxv7ioJjoFdeULElwkc3PTp2f0jrxl3YhtHyhVO4S59VwIiTycekZ0o+vN3RNRjLyjEFQsh1fJ95IH19ZrE30RJAdv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q2I4WVliY1RjYXZXQWx2SjdXT1Y5NzdLeHhBYWozeG1JRStzV0lVQVpLZUdO?= =?utf-8?B?eUNMS0xzTExPQlJ1MnkrNkNNR2hPeUlDWHF3alFVbUgzSTA2RjBFRXpyWCsv?= =?utf-8?B?VThURjg3SGFuYXlIeEpudC9rV1BKeUIzN2xaVTdqc0FCTFZHT0UxZjVYckV1?= =?utf-8?B?UmViTzBnM2tXS0xFcDAweEpET2xabnlrTW9tSUxKUVB6Tm42ZUNxdUpBSUdi?= =?utf-8?B?bnh3SFVCUHNmN2xJRGE1b0d4KzZGeENFaFp0K3B6MlhDYnpYb1djc0tQS0Vq?= =?utf-8?B?ejJHRHUrZnhlTUNuOVpCRTBHVXN6UUsrdDFEUEFleTBkV2dHdHVLeHQ1QkJq?= =?utf-8?B?dEp1WmVwMnZHR2x6Rm5jQXNOTjhPMTRGaEh0Qjh2UkdrTjYvdDV0WWxhNTBk?= =?utf-8?B?ZCs4SFhKRC9iT0dDczZST1dnTDlnRFVHQ1R6UEFvQytjeVdnY2tXdFNkZlpF?= =?utf-8?B?WXBFOXZHOG9XWmVERGdCTHV2aWpwbEp6bXdYTlRqM1VxTzdUdUROQm1zNDVS?= =?utf-8?B?YUtyL3R4UjliejdkckpXeENOeWc0Y1Y2Tkd2TC9lc3cvVDFpQjBhUHRBdmNB?= =?utf-8?B?N3QxekxzWUtxaFJ0c1ZMcjMySWN6WDZWVkUwODE1NUdXbGNGb0FGYW9uSTVM?= =?utf-8?B?NURjRVRmVXBqTWVSamJNWDFXdU1WdWNYOUUvNzh1R3J0SDJOR0JxdDZ5WVMr?= =?utf-8?B?akV2eFdmTWNTdXNZdEdYY2VxWFJvSWlMWUVGTFc3ODJxUVEvcVgvMnZoSTk5?= =?utf-8?B?UEFSbmEzQURTaWlPZ3huc1VGdXY2MExJeXdKVUJMdm80aENWcUIwcjlXMkRk?= =?utf-8?B?QWh3cXF4cVprWEFlYXVkY0lzQnN3RUF3NWxFekMvOS9JWmR1cXhBODZ6VEM1?= =?utf-8?B?V25mbm04bkJqQW1HeG40UmpqajJTc0tHVnRndkpVblVBWUZVaEQwTzRwZWlT?= =?utf-8?B?bE1iSFN4aCs0MjNMT1h0MStJOTBsYzZLeDU2cXNmcVNCWVVNem1DT2JVZUFW?= =?utf-8?B?Y2JZb0NaY0pjbHFieHFiNFVYYW9wVzk1cjU5OEFidGRGbXQ5cHEwSElYNUEr?= =?utf-8?B?V1d2cFVlL0k1YWJ4R3VzVW9VQThDdUVZd0tBTXBnOWVuUHYrdUNqT3pxL01H?= =?utf-8?B?TTR0OURZK0xXUFVMd1dVSXBpRytLRWZ4elJsV0g4SlNBMXp1bk1BeTYzWXNi?= =?utf-8?B?Q3V4NkNlbHRoRXNOZTRWSzdMMTlmeEZCZVBPTExjcWlpNThhUldiRTlFdnBL?= =?utf-8?B?RTZNU2NNVUx0NmZONnNlTkVjUDMxdk10VUw3THpHbkJZU2tuYlJ4R292R3lq?= =?utf-8?B?YzA4TG1iY3NyQThvcENxQmxuQmwzZCtBZ1VwZzA4dUJxbm8rQWNVd0tTMnYw?= =?utf-8?B?YnpFbk5CaXA1RHNmKzFaWExCV1gzdDdMY2c2WlMxRkh2TWtJZUJwdnlWOFRN?= =?utf-8?B?US93c0RvUThqa1RvMUQvaWFjNkFBbURnKzV3d3cvWWh5SWRGZE9zKzBqUmFk?= =?utf-8?B?Q3RDeVFkR25takU4UDg5UkFyZzVXTVcreTFETTJraFFNUDUvSHphdWkyOURX?= =?utf-8?B?NlhxOXlJQ2pnQ3pwTEptWUszb1hzNDkwWHpKZWN0eE5mQ1VHaDdJVU9hSWg0?= =?utf-8?B?bDNiNDNSZFNuU1BkVVFQUlZscmFsTU1ZUTNvR2JJTTRka2JudklOODNSTTF6?= =?utf-8?B?bTNET1NVUWtKajg3OUtEYkQvTHpUSjVvbjIwaUU3UEtDY1p1RFpJaFRRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15251de6-c355-4e71-a41b-08dc39e346fe X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2024 11:32:29.2806 (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: PA1P250MB1067 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/bsf/mp3_header_decompress: Remove BSF 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: > This BSF is supposed to be used in conjunction with mp3_header_compress, > which has been removed more than ten years ago in commit > c6080d89009056530119ab794ad02e4d515c7754. It mangled the headers > by removing the CRC field as well as fields that are supposed > to stay constant for the entirety of a stream (which are put into > extradata). This made these files unplayable; they need to be > decompressed with the BSF first (which does not happen automatically). > Even in this case the CRC does not get restored. > > I am not aware that such compressed files exist at all; therefore > this commit removes the BSF completely. > > Signed-off-by: Andreas Rheinhardt > --- > doc/bitstream_filters.texi | 4 - > libavcodec/Makefile | 1 - > libavcodec/bitstream_filters.c | 1 - > libavcodec/bsf/Makefile | 1 - > libavcodec/bsf/mp3_header_decompress.c | 130 ------------------------- > 5 files changed, 137 deletions(-) > delete mode 100644 libavcodec/bsf/mp3_header_decompress.c > > diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi > index d5bac105ff..e06de1a73a 100644 > --- a/doc/bitstream_filters.texi > +++ b/doc/bitstream_filters.texi > @@ -528,10 +528,6 @@ metadata header from each subtitle packet. > > See also the @ref{text2movsub} filter. > > -@section mp3decomp > - > -Decompress non-standard compressed MP3 audio headers. > - > @section mpeg2_metadata > > Modify metadata embedded in an MPEG-2 stream. > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 09ae5270b3..f28a6568de 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1240,7 +1240,6 @@ OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF) += av1_parse.o h2645_parse.o > OBJS-$(CONFIG_H264_METADATA_BSF) += h264_levels.o h2645data.o > OBJS-$(CONFIG_HAPQA_EXTRACT_BSF) += hap.o > OBJS-$(CONFIG_HEVC_METADATA_BSF) += h265_profile_level.o h2645data.o > -OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mpegaudiotabs.o > OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += av1_parse.o > OBJS-$(CONFIG_TRUEHD_CORE_BSF) += mlp_parse.o mlp.o > > diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c > index 1bae113d92..12860c332b 100644 > --- a/libavcodec/bitstream_filters.c > +++ b/libavcodec/bitstream_filters.c > @@ -46,7 +46,6 @@ extern const FFBitStreamFilter ff_imx_dump_header_bsf; > extern const FFBitStreamFilter ff_media100_to_mjpegb_bsf; > extern const FFBitStreamFilter ff_mjpeg2jpeg_bsf; > extern const FFBitStreamFilter ff_mjpega_dump_header_bsf; > -extern const FFBitStreamFilter ff_mp3_header_decompress_bsf; > extern const FFBitStreamFilter ff_mpeg2_metadata_bsf; > extern const FFBitStreamFilter ff_mpeg4_unpack_bframes_bsf; > extern const FFBitStreamFilter ff_mov2textsub_bsf; > diff --git a/libavcodec/bsf/Makefile b/libavcodec/bsf/Makefile > index 62609eb24e..fb70ad0c21 100644 > --- a/libavcodec/bsf/Makefile > +++ b/libavcodec/bsf/Makefile > @@ -25,7 +25,6 @@ OBJS-$(CONFIG_MEDIA100_TO_MJPEGB_BSF) += bsf/media100_to_mjpegb.o > OBJS-$(CONFIG_MJPEG2JPEG_BSF) += bsf/mjpeg2jpeg.o > OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += bsf/mjpega_dump_header.o > OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += bsf/movsub.o > -OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += bsf/mp3_header_decompress.o > OBJS-$(CONFIG_MPEG2_METADATA_BSF) += bsf/mpeg2_metadata.o > OBJS-$(CONFIG_MPEG4_UNPACK_BFRAMES_BSF) += bsf/mpeg4_unpack_bframes.o > OBJS-$(CONFIG_NOISE_BSF) += bsf/noise.o > diff --git a/libavcodec/bsf/mp3_header_decompress.c b/libavcodec/bsf/mp3_header_decompress.c > deleted file mode 100644 > index a177029fe0..0000000000 > --- a/libavcodec/bsf/mp3_header_decompress.c > +++ /dev/null > @@ -1,130 +0,0 @@ > -/* > - * copyright (c) 2006 Michael Niedermayer > - * > - * This file is part of FFmpeg. > - * > - * FFmpeg is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2.1 of the License, or (at your option) any later version. > - * > - * FFmpeg is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with FFmpeg; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > - */ > - > -#include "libavutil/common.h" > -#include "libavutil/intreadwrite.h" > -#include "bsf.h" > -#include "bsf_internal.h" > -#include "defs.h" > -#include "mpegaudiodecheader.h" > -#include "mpegaudiodata.h" > - > - > -static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) > -{ > - AVPacket *in; > - uint32_t header; > - int sample_rate= ctx->par_in->sample_rate; > - int sample_rate_index=0; > - int lsf, mpeg25, bitrate_index, frame_size, ret; > - uint8_t *buf; > - int buf_size; > - > - ret = ff_bsf_get_packet(ctx, &in); > - if (ret < 0) > - return ret; > - > - buf = in->data; > - buf_size = in->size; > - > - header = AV_RB32(buf); > - if(ff_mpa_check_header(header) >= 0){ > - av_packet_move_ref(out, in); > - av_packet_free(&in); > - > - return 0; > - } > - > - if(ctx->par_in->extradata_size != 15 || strcmp(ctx->par_in->extradata, "FFCMP3 0.0")){ > - av_log(ctx, AV_LOG_ERROR, "Extradata invalid %d\n", ctx->par_in->extradata_size); > - ret = AVERROR(EINVAL); > - goto fail; > - } > - > - header= AV_RB32(ctx->par_in->extradata+11) & MP3_MASK; > - > - lsf = sample_rate < (24000+32000)/2; > - mpeg25 = sample_rate < (12000+16000)/2; > - sample_rate_index= (header>>10)&3; > - if (sample_rate_index == 3) { > - ret = AVERROR_INVALIDDATA; > - goto fail; > - } > - > - sample_rate = ff_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25); //in case sample rate is a little off > - > - for(bitrate_index=2; bitrate_index<30; bitrate_index++){ > - frame_size = ff_mpa_bitrate_tab[lsf][2][bitrate_index>>1]; > - frame_size = (frame_size * 144000) / (sample_rate << lsf) + (bitrate_index&1); > - if(frame_size == buf_size + 4) > - break; > - if(frame_size == buf_size + 6) > - break; > - } > - if(bitrate_index == 30){ > - av_log(ctx, AV_LOG_ERROR, "Could not find bitrate_index.\n"); > - ret = AVERROR(EINVAL); > - goto fail; > - } > - > - header |= (bitrate_index&1)<<9; > - header |= (bitrate_index>>1)<<12; > - header |= (frame_size == buf_size + 4)<<16; //FIXME actually set a correct crc instead of 0 > - > - ret = av_new_packet(out, frame_size); > - if (ret < 0) > - goto fail; > - ret = av_packet_copy_props(out, in); > - if (ret < 0) { > - av_packet_unref(out); > - goto fail; > - } > - memcpy(out->data + frame_size - buf_size, buf, buf_size + AV_INPUT_BUFFER_PADDING_SIZE); > - > - if (ctx->par_in->ch_layout.nb_channels == 2){ > - uint8_t *p= out->data + frame_size - buf_size; > - if(lsf){ > - FFSWAP(int, p[1], p[2]); > - header |= (p[1] & 0xC0)>>2; > - p[1] &= 0x3F; > - }else{ > - header |= p[1] & 0x30; > - p[1] &= 0xCF; > - } > - } > - > - AV_WB32(out->data, header); > - > - ret = 0; > - > -fail: > - av_packet_free(&in); > - return ret; > -} > - > -static const enum AVCodecID codec_ids[] = { > - AV_CODEC_ID_MP3, AV_CODEC_ID_NONE, > -}; > - > -const FFBitStreamFilter ff_mp3_header_decompress_bsf = { > - .p.name = "mp3decomp", > - .p.codec_ids = codec_ids, > - .filter = mp3_header_decompress, > -}; Will apply 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".