From patchwork Fri Dec 6 23:16:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16652 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 581C744AD30 for ; Sat, 7 Dec 2019 01:18:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E65768B6CE; Sat, 7 Dec 2019 01:18:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76DA768B6CC for ; Sat, 7 Dec 2019 01:18:06 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p17so8932945wmi.3 for ; Fri, 06 Dec 2019 15:18:06 -0800 (PST) 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=9fDShORCqypq3Km9sVwh2xTnprAgLVnNeNtPaIY8ZXM=; b=mAnCMkgDYdnw4M29CAfbN2dbGQkNorSZ+RV7oYxsWJefUk62PCvLcX5PQvfOZR3IBJ YPtFtSVEgdgsclDu2zcoVMCJD+vH9Y7V+QprWDemOdDaM7M2dJZFEfVA48Pj5c0QaYBN Gn1X8Z9i/XhJrHB/qklu0qboSN+f5hamT+qUTSfZLYZNcxocNRyMS4eHEaNqGcP0Y2SJ +vhOvE9IuFhzq4h2yu6AoBktCArlUMtudvgfQPbM2fnT/Tjx/nb0ljT3RMMwCp3Xi118 2UL++iCWcw+AV0Ux5zgVf20hvzFZ4HmBKBua5u5PORLQ1uV8n5orZZpvPFb8D31YRHEZ +lvg== 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=9fDShORCqypq3Km9sVwh2xTnprAgLVnNeNtPaIY8ZXM=; b=dDhOHG56eD8Ir4mLa5hMVHn8kitTJ48uVzwA/AQaeR4qAKIH3k7y2/hiIZiXcqpXHp NbypGbc4B9CGs2w6d67L8o/p5HZNkLKqFyhfJPhW+LYHSBCu7PnMp0RfY0zgDL5J6YYA 5UrplbNjepd/HeKNl2XgEalR08mjWVXIYDwcDmC8u/J3czor81saG9nZRyK9zpUz42Uc St+0R+nsBeYKyAt7ZiqpGBcAvbRPXu5QWwF9dgqLRTcMIFiTb45Fj0MnsMt/CbeEpCrV bPgL3riMaIdQ7jvV69ioRHN0a3EMxtNhGHQUkvPzDLDavAuwEhp0n5WW7qj919lHZniL bVoQ== X-Gm-Message-State: APjAAAUKnrKSnD2Dk4nyW/DDIVZpV17yqU6EbDmWFW1gj+ZumCm6f2PU pdRq8AR+Zx3pIZ5CFaMwGvXl8njw X-Google-Smtp-Source: APXvYqyV5rfnZGJeqYQMyyHVwv5wzJOeV/ICh4ZwLNXhOSIp+ylPTvuG3T0VXPIFoy+mGXYs9DAcZw== X-Received: by 2002:a7b:c152:: with SMTP id z18mr11725372wmi.109.1575674285869; Fri, 06 Dec 2019 15:18:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id j12sm18758461wrw.54.2019.12.06.15.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 15:18:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Dec 2019 00:16:18 +0100 Message-Id: <20191206231622.13672-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191206231622.13672-1-andreas.rheinhardt@gmail.com> References: <20191206231622.13672-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/matroskadec: Reject SIPR flavor > 3 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" rmdec does it, too. And it allows to simplify the check for whether one should use the Real Audio parsing mode. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 908ad097cb..080a839b6a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2587,6 +2587,7 @@ static int matroska_parse_tracks(AVFormatContext *s) track->audio.frame_size = avio_rb16(&b); track->audio.sub_packet_size = avio_rb16(&b); if (flavor < 0 || + flavor > 3 && codec_id == AV_CODEC_ID_SIPR || track->audio.coded_framesize <= 0 || track->audio.sub_packet_h <= 0 || track->audio.frame_size <= 0 || @@ -2600,7 +2601,7 @@ static int matroska_parse_tracks(AVFormatContext *s) st->codecpar->block_align = track->audio.coded_framesize; track->codec_priv.size = 0; } else { - if (codec_id == AV_CODEC_ID_SIPR && flavor < 4) { + if (codec_id == AV_CODEC_ID_SIPR) { static const int sipr_bit_rate[4] = { 6504, 8496, 5000, 16000 }; track->audio.sub_packet_size = ff_sipr_subpk_size[flavor]; st->codecpar->bit_rate = sipr_bit_rate[flavor]; @@ -3593,8 +3594,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf for (n = 0; n < laces; n++) { int64_t lace_duration = block_duration*(n+1) / laces - block_duration*n / laces; - if (track->audio.buf && - st->codecpar->block_align && track->audio.sub_packet_size) { + if (track->audio.buf) { res = matroska_parse_rm_audio(matroska, track, st, data, lace_size[n], timecode, pos);