From patchwork Fri Nov 26 21:52:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John-Paul Stewart X-Patchwork-Id: 31755 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp2831239iob; Fri, 26 Nov 2021 13:52:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxT7GVS//lV1BKXEPQSEuTZ2DCyhRIyr3Sz/aKdUh3UIOT8tuA396UVnw4WEONPQO/lOlKA X-Received: by 2002:a17:906:a392:: with SMTP id k18mr41971961ejz.99.1637963559664; Fri, 26 Nov 2021 13:52:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637963559; cv=none; d=google.com; s=arc-20160816; b=f8Iy/KPh8cpDdxCx+8Rr09Rq05KdGlouaBZmQciti4/GmRi4CFPunEOIukuT1TgWH2 VlAiEAQDwqp3ArCanhlr3wJU76IlebSfXMe4cRTn+HMeOzJe09szHtIGTI3CXHPDgabv X28fe5zOhRWB3xvxQ7lUH0haOHAQjXX7+ufcK2buCiIjlQnd1AhLoKO1HsmFHsfH88WD DX5ZuzJq9bN/6xyZ5aZGJkkslU9KYD6GfC1DdY4S7NQ22U0669Ij2i+Hc4ADTksEnDfv RILnq/9hiuoW7wsdL3DUrZgoIRRtaksJSQ1L0H6GhVQ3iYwVWBhYl6WlI93ljdmeaMZE H1jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:to:from:dkim-signature:delivered-to; bh=WNCb2Z2fYaF7jqNue8ED6wVXtqLd0brO0N3E0uIpgJI=; b=niYPWCTkbmV6rVZEkBSbBs2WYYTxEseLnzmHFGEJ28SL4M6f/vWmExjqDFVKuBDxSg O+sO0osJOdS23StHAC6jZpc6khVaftPPxdwXZKhdO0Ljgfu4Q2xGxV1RAU444IlCwYJE +z7pxmlwbxHD1CqofpuwczWl9Z8Ve1EnSHsHUPfI7ZbKjRSK0OWa4+u3mJ6tILCjQfSb hS4eUGDAxgKYh7GlJX+Fa7A3NVk0DHKVI+kk7V/6aHq14/K/dY0J9bECvthKDmhf7nte py8yfqEjwXe4GzsGMOc6Qt1e7KhDVardSJlxqARQaT/+ezJCGsXyaBaGsi9SGlTanhH1 8OgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@personalprojects.net header.s=20210601 header.b=r2B602Sm; 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=QUARANTINE sp=REJECT dis=NONE) header.from=personalprojects.net Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dr22si17098287ejc.562.2021.11.26.13.52.39; Fri, 26 Nov 2021 13:52:39 -0800 (PST) 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=@personalprojects.net header.s=20210601 header.b=r2B602Sm; 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=QUARANTINE sp=REJECT dis=NONE) header.from=personalprojects.net Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7484468A75B; Fri, 26 Nov 2021 23:52:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.personalprojects.net (mail.personalprojects.net [51.79.67.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAACF680A87 for ; Fri, 26 Nov 2021 23:52:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=personalprojects.net; s=20210601; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Date:Message-ID:To:Subject:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=65c1Fn19OiG9vHvnyx42VJasv4gQQLmjvW3ejyJ96x8=; b=r2B602SmfhQ1SxuXSwJXYxhmN5 8Gc4yaZcg/FGwF6qzN/Wz07pGot+fA2073MupRO4KQ4Kzm0kjPRwr79bIxkSp8ClN4QVLgG1S7pV1 nk1I9JbcewMhLgiIn86yXzegPIX+EU+VONVjbuYvp2dlNlOWw/4y3qGdnIrk8q7l+PzY=; Received: from bras-base-simcon3012w-grc-05-64-231-188-105.dsl.bell.ca ([64.231.188.105] helo=[192.168.10.2]) by mail.personalprojects.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1mqj8g-0006lo-QF for ffmpeg-devel@ffmpeg.org; Fri, 26 Nov 2021 16:52:14 -0500 From: John-Paul Stewart To: ffmpeg-devel@ffmpeg.org Message-ID: <4824174c-eab2-91e9-0fd1-f83ea67a91c0@personalprojects.net> Date: Fri, 26 Nov 2021 16:52:14 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 Content-Language: en-CA Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mvdec: handle audio sample size 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QbuWIvAwDszk Adds support for reading audio sample size from the data instead of assuming all audio is 16 bits per sample. Signed-off-by: John-Paul Stewart --- libavformat/mvdec.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) } @@ -369,7 +381,7 @@ static int mv_read_header(AVFormatContext *avctx) avio_skip(pb, 8); av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); - timestamp += asize / (ast->codecpar->channels * 2LL); + timestamp += asize / (ast->codecpar->channels * bytes_per_sample); } } else if (!version && avio_rb16(pb) == 3) { avio_skip(pb, 4); diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 8492928820..8b54a9ab04 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -299,6 +299,8 @@ static int mv_read_header(AVFormatContext *avctx) if (version == 2) { uint64_t timestamp; int v; + uint32_t bytes_per_sample; + avio_skip(pb, 22); /* allocate audio track first to prevent unnecessary seeking @@ -341,11 +343,21 @@ static int mv_read_header(AVFormatContext *avctx) } avpriv_set_pts_info(ast, 33, 1, ast->codecpar->sample_rate); - avio_skip(pb, 4); + bytes_per_sample = avio_rb32(pb); v = avio_rb32(pb); if (v == AUDIO_FORMAT_SIGNED) { - ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE; + switch (bytes_per_sample) { + case 1: + ast->codecpar->codec_id = AV_CODEC_ID_PCM_S8; + break; + case 2: + ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE; + break; + default: + avpriv_request_sample(avctx, "Audio sample size %i bytes", bytes_per_sample); + break; + } } else { avpriv_request_sample(avctx, "Audio compression (format %i)", v);