From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C57194E7D4 for ; Fri, 11 Jul 2025 21:29:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1A13269023C; Sat, 12 Jul 2025 00:29:26 +0300 (EEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 2E19A69023D for ; Sat, 12 Jul 2025 00:29:19 +0300 (EEST) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-234bfe37cccso23159265ad.0 for ; Fri, 11 Jul 2025 14:29:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752269357; x=1752874157; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=2JpILqadYxt5IXsJOIbhizdJY3PDSnpij4ZOYpWHmCg=; b=PQRs62M0sUwKO6JO7IERUhMu+WNDo62kBOE2eUdUfeEkAtCetqK06+1biMupPIPFDR PaJS5/Z/ymtPDypNCBT43Tw2mM3h1tScdTyUri2BnnXFLwOs+JLXg0PhKV7sOlZteQLL IcdSM0oGsbPcLkWByyL4mqDD3t4U/wz05VhxixoXwZWya5sL5vbrj2/YtoMgrvixm35A kPOv0e/KZXMXtv8Q+PvU/pCiZCeUTbRpDKSVxkRJkBlo3/tRaW/Epsg+WO6JwF08yYvO +6Vmv90niDiBBgZZWv7r91YcyV2e1J52Ktiunl/np35nYv2fIaeb0fKdKST+IIFshRUw CqZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752269357; x=1752874157; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2JpILqadYxt5IXsJOIbhizdJY3PDSnpij4ZOYpWHmCg=; b=RqQdYCzo6Uxw0rm1YStg5APfWJtgYT9e/KcEztOf9ZDftwAAc+88HqwEyb9UGSpAcN SvNEMA14FxfXkhQOsmd9ehSTf9V7K9H4rok5iLHhKade4oyHnHUbPLdUSZjtbo2nkU6i nIjfONX0qVqeK1A7RevX6OPNJGjB1mFUn34RT/ADwMp7A0SZ57zMmQuqmZTO1K8W5syA KNUQRKkHQCa0kAdnhCgiJheNiaUXu83fSBqIsZy21SevFAL343crlfG6Tod1llQGMCVL +AqjG526amRrcLxJb3OpXQsg05mrrVOE1jt6qOnF8IwM97w3mRA6RSqKX+Gwc4ZnDCNt v1KA== X-Gm-Message-State: AOJu0Yy2LYUeCvYL2lkOGfr2iorSme1lJ8x13ptBex21RejTtyBHhCQ8 9SrH35xi814ekalNIc9mO2/x7GcZH8d89ZkeDjhPU08YPzvirDbfQ+Puy3Crnw== X-Gm-Gg: ASbGncvXg5iikNC7mKFDLjX5/u7rVLOOE9nnCJtrSyXUFCGoipZyFSkvnwXaSJ6YDv7 lOA302Th5VMEp8jQ2Ipx9EvsMkUzLa25pk4UHn9esf0tn6tgDtb27uboTUCouIJQatJsbmttfaj 2QTKdZU+3L0vpGt71w/IISK1u+3E+zwaw4NqtfMGuAMqEIUy7e19Fc6+R+k9Js4173OC+7VuZ1m P8YfsR3Ulgq9pMvfVK6IXUrHlix9+vBccsxdq4fmNEIKpopD4IFxS/i4PFGXbQdOwKYPe4bpcZY 5xigmCNHrBfgbhtJuGvF30OCDpA606iFy5LWXRYNyJ93i/98+Mhi4Ii3SPlssORE/3cxvOp0LyN JwOqZEytjOaJ2Oxcl5OLu5k0Lvwmc8Ec/IS+QDK84IEzNGODlxT3o X-Google-Smtp-Source: AGHT+IEQ4QkmdxTBYlSORpyHxhqMgQK9zjQiltEqQr8D/51QSJfVLZu3C+6mJUoHNIguDqWEmBPBsw== X-Received: by 2002:a17:903:2383:b0:234:d292:be84 with SMTP id d9443c01a7336-23dede2f024mr70222185ad.10.1752269357424; Fri, 11 Jul 2025 14:29:17 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23de42abea3sm58296715ad.60.2025.07.11.14.29.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jul 2025 14:29:17 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <13e40af46769c4358289d10e9dbd0a5cacb92640.1752269335.git.ffmpegagent@gmail.com> In-Reply-To: References: X-Original-From: Andreas Rheinhardt Date: Fri, 11 Jul 2025 21:28:53 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/4] avformat/tta: Avoid seek when reading header 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 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: From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/tta.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/libavformat/tta.c b/libavformat/tta.c index fdc18216c8..6e3c3a0007 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -51,36 +51,34 @@ static int tta_read_header(AVFormatContext *s) { TTAContext *c = s->priv_data; AVStream *st; - int i, channels, bps, samplerate; - int64_t framepos, start_offset; - uint32_t nb_samples, crc; + int64_t framepos; + uint8_t header[22]; ff_id3v1_read(s); - start_offset = avio_tell(s->pb); - if (start_offset < 0) - return start_offset; - ffio_init_checksum(s->pb, ff_crcEDB88320_update, UINT32_MAX); - if (avio_rl32(s->pb) != AV_RL32("TTA1")) + int ret = ffio_read_size(s->pb, header, sizeof(header)); + if (ret < 0) + return ret; + + if (AV_RL32(header) != MKTAG('T', 'T', 'A', '1')) return AVERROR_INVALIDDATA; - avio_skip(s->pb, 2); // FIXME: flags - channels = avio_rl16(s->pb); - bps = avio_rl16(s->pb); - samplerate = avio_rl32(s->pb); + int channels = AV_RL16(header + 6); + int bps = AV_RL16(header + 8); + int samplerate = AV_RL32(header + 10); if(samplerate <= 0 || samplerate > 1000000){ av_log(s, AV_LOG_ERROR, "nonsense samplerate\n"); return AVERROR_INVALIDDATA; } - nb_samples = avio_rl32(s->pb); + uint32_t nb_samples = AV_RL32(header + 14); if (!nb_samples) { av_log(s, AV_LOG_ERROR, "invalid number of samples\n"); return AVERROR_INVALIDDATA; } - crc = ffio_get_checksum(s->pb) ^ UINT32_MAX; - if (crc != avio_rl32(s->pb) && s->error_recognition & AV_EF_CRCCHECK) { + uint32_t crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), UINT32_MAX, header, 18) ^ UINT32_MAX; + if (crc != AV_RL32(header + 18) && s->error_recognition & AV_EF_CRCCHECK) { av_log(s, AV_LOG_ERROR, "Header CRC error\n"); return AVERROR_INVALIDDATA; } @@ -105,19 +103,18 @@ static int tta_read_header(AVFormatContext *s) st->start_time = 0; st->duration = nb_samples; + ret = ff_alloc_extradata(st->codecpar, sizeof(header)); + if (ret < 0) + return ret; + memcpy(st->codecpar->extradata, header, sizeof(header)); + framepos = avio_tell(s->pb); if (framepos < 0) return framepos; framepos += 4 * c->totalframes + 4; - if (ff_alloc_extradata(st->codecpar, avio_tell(s->pb) - start_offset)) - return AVERROR(ENOMEM); - - avio_seek(s->pb, start_offset, SEEK_SET); - avio_read(s->pb, st->codecpar->extradata, st->codecpar->extradata_size); - ffio_init_checksum(s->pb, ff_crcEDB88320_update, UINT32_MAX); - for (i = 0; i < c->totalframes; i++) { + for (int i = 0; i < c->totalframes; i++) { uint32_t size = avio_rl32(s->pb); int r; if (avio_feof(s->pb)) -- ffmpeg-codebot _______________________________________________ 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".