From patchwork Thu Sep 6 15:35:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 10257 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp618824jap; Thu, 6 Sep 2018 08:44:16 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdao5WbGsHSz9NdCyJWvojjis0uN7kMf+aRo68YjMqTJGI5TrbmI8SCnv4fa8POxDw3uycaY X-Received: by 2002:adf:a30a:: with SMTP id c10-v6mr3102280wrb.31.1536248656884; Thu, 06 Sep 2018 08:44:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536248656; cv=none; d=google.com; s=arc-20160816; b=dzTZeZUi/48Rdck+07jYwuncRZDY4PufZv5CzfbRAZDrAG+ijx+m7ZEzsNnwwIELuG Mocxo9Oth5XdjiY8oJw4z6z6aIiYh5f9myMdveFK9KVXGBXpitcDLLC0ClkI4qb2/g4e cTnjEBPtg6vwJRM17HDYwge5avtysPtRC7yMZGDOXlJUjW8K4BSyyQaYkGjFjxEk/PJJ wNdzK4FtyvKiTQ0yoQyHx1sZogwCi3Fm5r4YY7/+ug6txuvONxPfPUCxPhnN2teWWzPb 9TPEIlGotaPChmym/nwh6+IQDRXDP6tHc9EfWisOO8AuQa0XjYEsIxIIELnpXEuNiGOg 7iew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=JRAtuPtu0/qcvAnWr1OJRkFeIEcSZ6tg0T3IYqF9Z0E=; b=T2snTN26Iog+O+Z1bW1kvCnLwh3Exnr0gscJgkVar0M9viKhHg7YxQzAOpTQGlMPaU 6xl0jLeYGfD4Q6XFDzNA8CuktjoY1u2DrBwt7OE+wJ+/E0Ml0Jdp5PyACJYugG2/Qywo NYneOY9emxaapUOwR+tNO1ReT8KjRxd7eYxxLOUQ4gqKf/m7j9KsbDAWjDUU3DEeQJ8G 7GA2a+Fm0gYhkouyQDIH08DdaRRNUxL/kuNVREqUX/eFaGapsQdw84XPt1dtxBUIgAw3 y9A9DGRCnGMnIGxdBZZAiZi/IsHFuGccSU+zR83eHjD2StBzGxOOQzm6bYsv6zrSy7rW ESFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B12GRFi7; 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 i7-v6si4576244wmd.3.2018.09.06.08.44.16; Thu, 06 Sep 2018 08:44:16 -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=B12GRFi7; 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 E206268A034; Thu, 6 Sep 2018 18:44:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFD00689FB8 for ; Thu, 6 Sep 2018 18:44:01 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id o18-v6so11827802wmc.0 for ; Thu, 06 Sep 2018 08:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=bVxVLk6KFD0RrLSHzg4eL/ZjIokwJVxolGPaP1kXZlY=; b=B12GRFi79MC73+NkpcO11QDVRj9JQMx1W1nF0sjJ2gOnGBbRMENbx7nRQeZDrSlif2 2w8urnk7ydsBv0Thjz5pc3NT6TmCKNRPnIhPsSSeVEKYrNzRatHuYmmk/QjiyvgAvH66 X+llZGS9Od7fjtlufxTc3o3Le4gb34fZQlLcaVz0t/RQ/gSEMnWbAnuQTW013eQikTRc s1JeIkuYeIrQFvDMfKnANACFmIeiyl+82leQFUOPJPRh/wPilUypT29I8MTmb6dAUNN9 kHF7v+lXks0D0VL2DFKMDBeCUD8nAyWKLZdAikFWy0vtGhv0FK+tSFxehMGlChXFiF9s BcJA== 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:in-reply-to :references; bh=bVxVLk6KFD0RrLSHzg4eL/ZjIokwJVxolGPaP1kXZlY=; b=GU9xJBaFb8FJoo40BeDCpqDfTBq6lSiH3ttPNNprpEYaTBGkCpCkQMvXPmfTAgasV0 7rRo4W8ASYBQR6OFX6lP+lOAtDfDovam9zktoie7RbUMyo5kwgq9lq+htB8HPDCehx7U 3exaNG9NRIhXY+nh2QRuCcQ0h4f+UTsKXSvTCm/LkngQQ/2OjENvMNzWQq7exTwvhe6n sn9SaeXBDBsfwMiFQF4kHA9GnX2cF0ywPPVfWJH+oMPuP/LBFKu6rZeDblYC7C4u3xQv dlmmNxSsTh/F9JBrnC9Lzfnn3YGb4E5xGNjYZjAyrJakThSIL4gKXg93kjGvxYJnZJK8 5YiA== X-Gm-Message-State: APzg51C66jh85g/rXPHQrhEh/wqCehWwwC4q2tLY4URwRUbUMM6z4L8D USFSW/1vn9in++gKl+wq/aST3ncX X-Received: by 2002:a1c:1d0:: with SMTP id 199-v6mr2651373wmb.2.1536248158499; Thu, 06 Sep 2018 08:35:58 -0700 (PDT) Received: from localhost.localdomain ([81.2.162.105]) by smtp.gmail.com with ESMTPSA id x125-v6sm5575710wmg.27.2018.09.06.08.35.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Sep 2018 08:35:57 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Sep 2018 16:35:43 +0100 Message-Id: <20180906153544.138864-2-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180906153544.138864-1-derek.buitenhuis@gmail.com> References: <20180906153544.138864-1-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/2] Use QT format for audio sample descriptors depending on stsd version. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Justin Ruggles ISOBMFF does not allow AudioSampleEntryV1 in stsd version 0, so assume the descriptor format is QTFF SoundDescriptionV1. ISOBMFF does not define a version 2. This fixes audio decoding for some MP4 files generated with Apple tools. The additional fields present in SoundDescriptionV1/V2 need to be read in order to correctly read additional boxes that contain information required for decoding the stream. Signed-off-by: Derek Buitenhuis --- libavformat/isom.h | 1 + libavformat/mov.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 51abea52de..89659db8ee 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -217,6 +217,7 @@ typedef struct MOVStreamContext { int *extradata_size; int last_stsd_index; int stsd_count; + int stsd_version; int32_t *display_matrix; AVStereo3D *stereo3d; diff --git a/libavformat/mov.c b/libavformat/mov.c index d922e0f173..ea99616dc8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2120,8 +2120,8 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb, // Read QT version 1 fields. In version 0 these do not exist. av_log(c->fc, AV_LOG_TRACE, "version =%d, isom =%d\n", version, c->isom); if (!c->isom || - (compatible_brands && strstr(compatible_brands->value, "qt "))) { - + (compatible_brands && strstr(compatible_brands->value, "qt ")) || + (sc->stsd_version == 0 && version > 0)) { if (version == 1) { sc->samples_per_frame = avio_rb32(pb); avio_rb32(pb); /* bytes per packet */ @@ -2554,7 +2554,7 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) st = c->fc->streams[c->fc->nb_streams - 1]; sc = st->priv_data; - avio_r8(pb); /* version */ + sc->stsd_version = avio_r8(pb); avio_rb24(pb); /* flags */ entries = avio_rb32(pb);