From patchwork Thu Apr 23 03:07:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19182 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 22BC544BA43 for ; Thu, 23 Apr 2020 06:08:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 088FA68BE0A; Thu, 23 Apr 2020 06:08:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D412E68BDDF for ; Thu, 23 Apr 2020 06:08:09 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id k1so5044806wrx.4 for ; Wed, 22 Apr 2020 20:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9c8Mlww3ObQa8gHC9PHUm35lCHSnNqMxSJPAvxWGrks=; b=ZPok0dvzkjNOmWNQlIYSwIUaaZhQnTB2FxFEAoCmvOh0crLLSMT5gS8lFCZJHfTTjR P+bXiR6jjYfI3qD3HPcQn8+dLNSeYGqjKqiNxxDgWEJDM5qz4a5Gwe6aiyBqkKK582ka 0fbo9oV+nLu1BDWTQAjQTCXvuYdvgf3Q1wT0mQj9XtM4fBsdCj13n25TXFOgxcvFSr5a qsKsQMBxPrLQsfwBVQFR6AhevK92d7UV3y1Ibe75PEWu1r9qf6GLQag/EerwdXEXGqZH i++RvBVeisA4k/IAxcXXWfuUAsRBk3ENHxHzhH/KLMJ014Xc9uEjqKW4I1heb2dYafg/ ePXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9c8Mlww3ObQa8gHC9PHUm35lCHSnNqMxSJPAvxWGrks=; b=nKSVDQT8JTtZalPqTtXMxj54yiL4KcnluXoe/AXXjTDB9rh3jZ6M7SiZKBj+W0s94j 1n/kcJ2ZC0OAQeZaoVQ8F/jGrRa4p2LyNTHiuaNQPPm2gn/yZWKrnyESplabI6nBXAax b8YDn5HFaRurzI9rBGFsTqnSXyRDAQQ6wd2EK0O4JGyb31ptAkaVQ7diYsd8HNfMtsa2 1ywLKkN+7wK7xLGWmToPTQ2tJrYQU6z4txpzXa3AWaufiRkw7gh0x2FciluISZGFEXPH Xa8Ih/RqGLQiAPBWg1+FjOX2pag02mYIEjSAUvZ9xIPxLYbGDSVD0GcFbtYbvGTX+2YJ WXyw== X-Gm-Message-State: AGi0PuaC3tbOYMtfGM9YbHNzwnAwzlWIWkCh+JRcoeRBDTwXoGI3sudw cGG9KU5gw6RRfr6prtyR3N+ZykJE X-Google-Smtp-Source: APiQypJHL5AkH7gHyWjMbsY1CzoMcZo/8+ggI0mAcbpvhgrQ9h+/f8aNn7V+wTYHj0LRmJf2Tektlg== X-Received: by 2002:adf:ef8b:: with SMTP id d11mr2459707wro.340.1587611289035; Wed, 22 Apr 2020 20:08:09 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m1sm1497733wro.64.2020.04.22.20.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 20:08:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Apr 2020 05:07:33 +0200 Message-Id: <20200423030741.12158-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> References: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/11] avformat/matroskadec: Fix demuxing RealAudio 28.8 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" RealAudio 28.8 does not need or use sub_packet_size for its demuxing and this field is therefore commonly set to zero. But since 18ca491b the Real Audio specific demuxing is no longer applied if sub_packet_size is zero because the codepath for cook and ATRAC3 divide by it; this made these files undecodable. Furthermore, since 569d18aa (merged in 2c8d876d) sub_packet_size being zero is used as an indicator for invalid data, so that a file containing such a track was completely skipped. This commit fixes this by not checking sub_packet_size for RealAudio 28.8 at all. Signed-off-by: Andreas Rheinhardt --- Actually, the Matroska demuxer presumes that RealAudio 28.8 is always INT4-interleaved. This commit fixes demuxing for such tracks. But apparently it can also be INT0-interleaved (our RealMedia muxer writes packets with this method). Btw: Remuxing cook and ATRAC3 with our RealMedia muxer leads to broken files that not even our demuxer can read (sub_packet_size is not set correctly). libavformat/matroskadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 668323ba08..844f96cd52 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2608,8 +2608,7 @@ static int matroska_parse_tracks(AVFormatContext *s) track->audio.sub_packet_size = avio_rb16(&b); if (track->audio.coded_framesize <= 0 || track->audio.sub_packet_h <= 0 || - track->audio.frame_size <= 0 || - track->audio.sub_packet_size <= 0 && codec_id != AV_CODEC_ID_SIPR) + track->audio.frame_size <= 0) return AVERROR_INVALIDDATA; if (codec_id == AV_CODEC_ID_RA_288) { @@ -2622,7 +2621,8 @@ static int matroska_parse_tracks(AVFormatContext *s) return AVERROR_INVALIDDATA; track->audio.sub_packet_size = ff_sipr_subpk_size[flavor]; st->codecpar->bit_rate = sipr_bit_rate[flavor]; - } + } else if (track->audio.sub_packet_size <= 0) + return AVERROR_INVALIDDATA; st->codecpar->block_align = track->audio.sub_packet_size; extradata_offset = 78; }