From patchwork Wed Sep 21 12:21:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2580436pzh; Wed, 21 Sep 2022 05:22:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM57e1xOSEHuu02FakpqogpzzdUMr4xKDXaMhMjttEKqaJSZRru/4BVkqm7VrWFFj1uZq5tk X-Received: by 2002:a05:6402:5cb:b0:452:e416:2bc4 with SMTP id n11-20020a05640205cb00b00452e4162bc4mr24820673edx.114.1663762948867; Wed, 21 Sep 2022 05:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663762948; cv=none; d=google.com; s=arc-20160816; b=JcLd/qoYdDpvftegNpSXL+98riCevPx7n8fzFcN3uDyco7GnX3BAXPEiAX4ND0Q10L j0Halv8d8fu/X/hwa47S86/AQQ9lQ44xfsZxQ4hvuP6lTMOdwS3T6YSHNQvibdsDrbQx UZiFs5sLRQmvw8sT2LZfrkB5LCctUrYjNA7lnUvXPqcT0ocf2JPtgOXmPu/hPmvSvlTr dBP3IHx9euEzy2V80Xsb2Iqegn4MgmUtPPNhaoANNI5svZmGJmeFupPZtX6hLfPEMgs1 GPZPOl1oGzj5JyQMrALHku0NwBBftchmkzEQcwFYTa333XbdIJ8h09+fZgMx1lb147fr 1FNQ== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=CKszzzmwEVB89qeXeczwdbQhBAeVh/0WoGM2aY8c02Q=; b=0MDRALWAy5C/CbKbs9lGuFwqBuvAll23vMTetTxHRRcbJCdg+4TSAIecWMbuGQ/Udr RmuejkqHpYq3TtDGvozEfIHvDV1+KdPmv+JEqr3lPWOX6tyxGl68zT9An8sN6V3H20px +4P4y/6hLeZPgLgczQ4eRjReFhGwxpYLfMaLhnRWqAeNc/iVRO4NZOC9QNB0tbvX09hM NWfGbf1CpeBiBNMhqQnOI1REwp+l+Zz7YtcqYR7DVNRMTRRp/BDDDs51HYfjPwER2ch6 WHH21Z8pXkkmFFwChBIzZ5uGe9euMd5aHTJ/Kji+OksZ6m36qZk6ab5zQn2qQhLtZKIm 6ypA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NR5b7EWa; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v28-20020a50d09c000000b0045184634fe2si2239700edd.125.2022.09.21.05.22.28; Wed, 21 Sep 2022 05:22:28 -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=@gmail.com header.s=20210112 header.b=NR5b7EWa; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1C7668BB70; Wed, 21 Sep 2022 15:22:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A631C68B35D for ; Wed, 21 Sep 2022 15:22:18 +0300 (EEST) Received: by mail-oi1-f172.google.com with SMTP id n124so7773396oih.7 for ; Wed, 21 Sep 2022 05:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=XgNhke1IiDvKsRGGUsSlsJzzfnHFFQWuS2VSlhY+mSI=; b=NR5b7EWauBfxvPx+2PmRJaANhZJioOAZe3K7nf2yrmXkuC2+1dfcaWBt8tyresVNI5 jbAt146t/EAVDlbJdWGfrixgnh01TBRDK6NQapmr73FPYGM2iWdqUAmoaAqmSxo+dKA0 LtMvFxX+zf/GFsoN82tO8wmNnk4iV4hFIgD+UuiGaVTdnnygZleRgscn9YB1P8GMq6lP vI6P4FccnhmJXX1vLk8XpAMN9HNxY86VuQa3cLH9ts0kuNG7XXNZ4wnR1AzUqrPUeZAS O24deCHIOpW1DgAGD8saDfMAIRLB8M8aUEmyNrI17Zc0D8YsLR0xXKnN54LJQ5pxVvZr lgAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=XgNhke1IiDvKsRGGUsSlsJzzfnHFFQWuS2VSlhY+mSI=; b=fbQ/vb7uaP1WUTGpdRpWr78hVXlHpcHT8F+deXY5QdI2J4OOUVMek6AVj3vEaymNCd LlqjFNVuvao67TyFQkBLWYcX0Ie0QtFGu0wrximjdxxX17qcJx//pAKXec9+8r2M4Wpd K0s5VOpWGO91CBUmNqKm+bMFa3/vwrf6z0N0lwwJ9AK0vXqiM4yYpW3T975NPqAXCi2U ipnk7H33LHKPEy8Bk/UzXr+IBjMSTXxcDfVvvOk5/prOB2yKhdpOcABPskwYOlPuFb0d knZcZEKsobJOjyvKHFIuocgWkOs5eAPYmoAbY4RRufzNltgK5eRmJx4uFaupcfdJ0a9l XLNw== X-Gm-Message-State: ACrzQf0ITs/Uza45p6cokNJDZB8zxknT0Y0mgTLpzOH4F/VQqOoGC6WI In/+JzJ4a9GCiFj3U87rPEo8LYT86gc= X-Received: by 2002:a05:6808:28b:b0:350:f4b1:f9e3 with SMTP id z11-20020a056808028b00b00350f4b1f9e3mr66789oic.5.1663762936725; Wed, 21 Sep 2022 05:22:16 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id c35-20020a9d27a6000000b0065892f42157sm1185610otb.75.2022.09.21.05.22.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 05:22:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Sep 2022 09:21:59 -0300 Message-Id: <20220921122159.1238-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/cafenc: derive Opus frame size from the relevant stream parameters 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: A+8+dZWR6XNy Use the stream duration as last resort, as an off-by-one result of the "st->duration / (caf->packets - 1)" calculation can break playback on some devices. Fixes ticket #9930. Signed-off-by: James Almer --- libavformat/cafenc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index fedb430b17..c203747b15 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -53,7 +53,11 @@ static uint32_t codec_flags(enum AVCodecID codec_id) { } } -static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int block_align) { +static uint32_t samples_per_packet(AVCodecParameters *par) { + enum AVCodecID codec_id = par->codec_id; + int channels = par->ch_layout.nb_channels, block_align = par->block_align; + int frame_size = par->frame_size, sample_rate = par->sample_rate; + switch (codec_id) { case AV_CODEC_ID_PCM_S8: case AV_CODEC_ID_PCM_S16LE: @@ -83,6 +87,8 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int bl return 320; case AV_CODEC_ID_MP1: return 384; + case AV_CODEC_ID_OPUS: + return frame_size * 48000 / sample_rate; case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP3: return 1152; @@ -139,7 +145,7 @@ static int caf_write_header(AVFormatContext *s) } if (par->codec_id != AV_CODEC_ID_MP3 || frame_size != 576) - frame_size = samples_per_packet(par->codec_id, par->ch_layout.nb_channels, par->block_align); + frame_size = samples_per_packet(par); ffio_wfourcc(pb, "caff"); //< mFileType avio_wb16(pb, 1); //< mFileVersion @@ -248,7 +254,7 @@ static int caf_write_trailer(AVFormatContext *s) avio_seek(pb, caf->data, SEEK_SET); avio_wb64(pb, file_size - caf->data - 8); if (!par->block_align) { - int packet_size = samples_per_packet(par->codec_id, par->ch_layout.nb_channels, par->block_align); + int packet_size = samples_per_packet(par); if (!packet_size) { packet_size = st->duration / (caf->packets - 1); avio_seek(pb, FRAME_SIZE_OFFSET, SEEK_SET);