From patchwork Thu Aug 23 21:37:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 10113 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2625807jap; Thu, 23 Aug 2018 14:45:44 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbKOXCrXqFjfH5Hc1ywBpw0fxMONU4hx8s4UgUDsZs3oUPdvxAgSaDOtbCZGco0Ow0UDi/W X-Received: by 2002:adf:dc06:: with SMTP id t6-v6mr3354318wri.84.1535060744209; Thu, 23 Aug 2018 14:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535060744; cv=none; d=google.com; s=arc-20160816; b=kXMfRbksVDS5Xp9ERYX2WFfqx3BRDRxplrZscEnQ7/jB7OJgbz605ewSm3tAKguNUv bk/YzmW/NLCvOVtRONUtPbsCSR2j/f3nhAzpsZrr6NRoJpo1mcvMkNjA37f2IglRz/rd YSt/H3aZbp+Pzf6XxrBsu7uPeXN7O5RZ1r3Vo2MBFBu8iqkMMLdgvzfQTUUXEbbMGsz+ OwOR8n0GANXdU61b4M2EkeN59p7ORpKvruQasPti8hzBq0bpuHvGTyggJ9JKYELIRe+l wbteK6ZHPyMVA41cQzTF00PUvxpsas2/3jjwmteDLWu4tddiW0tVG/2PSJoFFFaPYBfC Ndfw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=bD3WLSadNtoJLJUpD5KWoqpAqw82eHosc+k2HlhcW6I=; b=Ridyk+Xn2v/9PCFVcgQi/Wz4lCnmKget/gmwUUI75DctJ2rV+mI8d6tSMZEfpNwxhv 4Qr/N8HqV0RrO2om7XzThrKg9nvfou7AZLLx8pn0CbozFWIL9nEJEJk3cKf/iYOaKser LrketFQBA+IIi4uXPknu0sD7uy/+FEBy0svAL5x85qSz57Q2zwn3smqaZoS/xNJq5IhG 6iF29i7RZy3maVJAZEOCpaG5c7dL3db27CkixRsR3zBSKzKpTtxzX73dA/3bDkEGNiru yfsBMTxz0ixelrT0TCt7IJ8dcpJ4l5qnzzdC2+YggIhvi9MHlRpvXMdMrU216M5z40+O YLcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VGkO8SMM; 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 p16-v6si886293wrv.246.2018.08.23.14.45.43; Thu, 23 Aug 2018 14:45:44 -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=VGkO8SMM; 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 49097689E81; Fri, 24 Aug 2018 00:45:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C814C689CCB for ; Fri, 24 Aug 2018 00:45:39 +0300 (EEST) Received: by mail-it0-f67.google.com with SMTP id g18-v6so4347572itg.2 for ; Thu, 23 Aug 2018 14:45:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=yA3VE8Irx9fPaeBbgSjmnhHd6DGudxHldrmor5rUV+U=; b=VGkO8SMMzvpE0xuilTPbNT9YWTt1v61mJvyBOrcArPJ/f2Yom/ofy9KtRMk1xTszc4 JgMhmZINnhMNkaCdhkLbGMFMzvEDQRiL6qfwcHExTR9RX5R2tlc/HTkC6hdo8eQZUh3E XwLEwY3+VmVR5U84kY6aOt8kcxmnOzIv1aEzDH8uUcUjWQQHMqSeiMoUdyCFxHr2qXeT AW0jsrax6iOzXcJZ/t3p98/onyW1jSjjdDAFtiErDiOJd61cNiZTmsOEJQxNJisj8/9Z UYmsC4a+4qTy+JLE+AW6qrT9NSekpaBV+jgIkfXrZYGbLjGc+wHhjaESv0symsuaCVWm Z6Uw== 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; bh=yA3VE8Irx9fPaeBbgSjmnhHd6DGudxHldrmor5rUV+U=; b=hDwjJiTwwcWRcUW7lYUD8WX9QmCQXdSq/TViuZ3Z+b1BnQj9PvyaMrfy6fFovA1d+g LOG2hzVR/s5M4qQmyTwemQAEUcmq+P+L/IaA72kdIv5qWyMLiKtPFqVlYpT2Y88j3jf4 uhuLjh3+A2tl+Ke8YeZxRIPPxAH0iWZr5t1Tl0pf58iKDMOJEhCd1lwP5q/Lhm+jpMia F6/Ksx9X6hrwtVcdjTBWcAozsS4Hx7Q0H5aeg8BO+cz4CmCpINupc4BCJfzSNGfX4Bmv nmbhgcXQ1UivrqHhY/xXMbfhvRdfkfo8yy5umGDxAnZy/RTUkI0eqsYIniznxv+e1wT0 VVOw== X-Gm-Message-State: APzg51Bo7236dODgeNaxD3ZFh6zeZMVKiA/dZFSp8d0tDbGMUweQhh32 mJVKFxCQESuYaOWyeY1WePDN84xE X-Received: by 2002:a24:d786:: with SMTP id y128-v6mr8338373itg.140.1535060293718; Thu, 23 Aug 2018 14:38:13 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id d11-v6sm1946197ioh.22.2018.08.23.14.38.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Aug 2018 14:38:12 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 16:37:52 -0500 Message-Id: <20180823213753.36856-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/hevc_mp4toannexb_bsf: don't fail on extradata with too few arrays 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" I've been given a sample that does this. Not sure exactly why, but the decoder ignores it and plays normally. --- libavcodec/hevc_mp4toannexb_bsf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c index 09bce5b34c..fb4ea34a93 100644 --- a/libavcodec/hevc_mp4toannexb_bsf.c +++ b/libavcodec/hevc_mp4toannexb_bsf.c @@ -52,6 +52,11 @@ static int hevc_extradata_to_annexb(AVBSFContext *ctx) num_arrays = bytestream2_get_byte(&gb); for (i = 0; i < num_arrays; i++) { + if (bytestream2_get_bytes_left(&gb) < 3) { + av_log(ctx, AV_LOG_WARNING, "Extradata contained fewer arrays than indicated\n"); + break; + } + int type = bytestream2_get_byte(&gb) & 0x3f; int cnt = bytestream2_get_be16(&gb);