From patchwork Sat Aug 14 17:22:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 29513 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp603708iov; Sat, 14 Aug 2021 10:23:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyn0EvhCbYoaQpSO+llipMO2leiM1sCYm6tzeV4DTnKqSVOJMgHYLUIRDoz8WHtY1JVyPh7 X-Received: by 2002:a05:6402:1908:: with SMTP id e8mr8557385edz.283.1628961781609; Sat, 14 Aug 2021 10:23:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628961781; cv=none; d=google.com; s=arc-20160816; b=Wx3Bo4WLUD/GL+l5c6PScbqjIJbHIhUhl9mhMwi9u54O3HYyvkb3jbx7rHHXIwiwCV EoSK2eS7cnL53s23NwL8LaSLxRYJ4/c+N51Pp9zrvdXO+ozbY+NNwC6JFd/q78EgTymj CyeQHGwzeenEqnEBEvnGRCFgUX8ibtXskEtm1/DHuLCnTIPq5n4mF2r4Kzk/3b/rVpQi RmrNF8tFOGS6jpqVUlDOVffCyXSHJg8EUczvRQpCRhkNBOeEHlKIkZf1t5YXQSYnBeSD z4H5SXmhNTKPtNZC/A7GShHAXHcc6tl0yxIYAsnDWCCdvtvaCefvXOBxt0HBkZeCvqP7 3DIQ== 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=36MtWUAvCerx7xkIJsDNSg1AndczmSCyWEovzKf59Qo=; b=Chry0TmOwEuNGZBtLNlosU6sdgFT3QZ7TJAplNs4Ib8s7jS2vW6cFiVgDIERD4SH1N 9XvC1cjdUVibLzraBpf2n+J3uVvIgYh596RvwtmKCGpn8QUEf/g09PSz1I6am8yzEwsG 4vSDeILQnKu4UC2UI5o7kD4RAjeDBBHFpMLghdOMCoR+EIOIfuNY5TR6jnAvgicDLLyx hEuAcpMCN2GlrndeYTOVafgFhCdnoWJN6WtBNf5cQSB5huY2SogD7e50UiL95ZtKpA0b 0CRwq4pJzQ8QRvcYxMXj65p1iBMuhai1gxBPTN2D1K25YOLAddMDLCpkhSkp3SOoDhoo PphA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ugM+TDJW; 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 j18si5116886edp.376.2021.08.14.10.22.58; Sat, 14 Aug 2021 10:23:01 -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=20161025 header.b=ugM+TDJW; 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 9257068A5F7; Sat, 14 Aug 2021 20:22:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5797068A59A for ; Sat, 14 Aug 2021 20:22:50 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id w20so26095354lfu.7 for ; Sat, 14 Aug 2021 10:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ptm1z8fTdclbCnZ96DlOKJo3TrJCDTi3VfGhdZP6/lY=; b=ugM+TDJWC2suLtSVrZ3aQ3DkcmEdjqCKDu0+yPyYzcaZC+LDVPvPPK2jmctXF3DjzY kK3uUvBJJZvWVPLn7BYKDHYW8cbtLAyTWQCy7R/nobl3av4XVBJ/jmkgoOZDf50PlG++ ypOlHzE2a17bNGRu8ciQl6/s3JcwTWjLYT0z95Jx4Ma85K4y9DM15RB6ZiRrS21jref8 OhJU2tGkzyfv33a2uHzDJUpHVviu3xSuNBbmjmOmRNXwF72d7MnBDvcyIEkhJ7Oy07su ptE6fL5AsMbtGQ1SMAXWIO3NQVMI9e060IbM0O7Z3EjPxyJ0Kl4LhKTQjC35bBgXH+JY KA+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ptm1z8fTdclbCnZ96DlOKJo3TrJCDTi3VfGhdZP6/lY=; b=YoeKQWdyloon2xjuCAkYaJYy3FuxGJLM+Bz7NEEe0ltyX8c241RZ2rjK8ObEz9sTUF o6BAce/w1b+4zzxn2lYt/S31knnPUJi+1mKbGJxRHwoiH/SKtcVaq0BBTUGc8DL+HRm5 FKpexDRmhf2yP3xL8JZN2bb1PN0q/rFeYJrkqml13J07ytqXokb3ghcg8Q0KW78rQcJa X25WaN080DcSx7rR0k/85jP+5aJhFP7j3M4geOLKDLlYLLqnPytIY+xQ2u+Bfk8EKACU LPNJw6fsWUMNPQmx6/+/ziXCdYd2LKO7jE/ubhm+r/oR9FchoZ6a62ikXQMq9Eh9QL++ IaSA== X-Gm-Message-State: AOAM530oj8aNrJj8IiylSoK7CuSXtIqQglA9KsV0QXh92gVJVJgVUDGp YKAKIzIwCgJ5MPSMuuMympOF80NAiyM= X-Received: by 2002:a19:4890:: with SMTP id v138mr5542828lfa.626.1628961769676; Sat, 14 Aug 2021 10:22:49 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id k17sm554785lji.86.2021.08.14.10.22.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 10:22:49 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Aug 2021 20:22:44 +0300 Message-Id: <20210814172244.13760-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/isom_tags: prefer in24 for 24bit PCM in MOV 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: 5JMdCzcckOpj In 1c42fd93236e7869ef4d9fe3650dd3e951387321 the ipcm identifier was added in order to demux additional raw audio from Sony MP4 files. Unfortunately, it was not noticed that this same list is utilized for muxing as well, thus causing ipcm to get preferred compared to the identifier officially specified in QTFF documentation. This fixes the order of preference for 24bit PCM, where ipcm is still allowed, but in24 is the first match - thus being preferred. Fixes fate-acodec-pcm-s24be. --- libavformat/isom_tags.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index e2e589b658..d0400b18fc 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -312,10 +312,10 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { AV_CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, { AV_CODEC_ID_PCM_S16BE, MKTAG('l', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, - { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'p', 'c', 'm') }, - { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, + { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, { AV_CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') }, { AV_CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') },