From patchwork Mon May 9 18:16:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3038402pzb; Mon, 9 May 2022 11:17:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4OzSCROCeQj3Ng5XUdy1h5JI4VimrDfvzGwR+wmDBRkxtRDoI2uz4Sfom5AiN7gDjqV+6 X-Received: by 2002:a17:907:3e28:b0:6f4:3ba3:504e with SMTP id hp40-20020a1709073e2800b006f43ba3504emr15688619ejc.632.1652120246693; Mon, 09 May 2022 11:17:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652120246; cv=none; d=google.com; s=arc-20160816; b=xk4Ihx4cRWQcJxS7j1WIE39Zhjx2mHOE0HRwB94Mi5jDlaJRv8pFtjsijaXRYQ9XsR yGiU6jkcHxwu7VPPX95AYMGdodW6Q8VHXC7VbtTwRXp/LOBIpjRiJlRTn0/zC2LYYfnP FRqO3JlBHw5hbzUvzFHgza1W4I2FI0Rx/Jh7SPBr5kTdQHeTiQVOMsARgn6QZHhbZ2cX cmQij8HxASBlD+iB6Fy7tNP78LC+A3cNpwwFy5SKa2ulMtIbX/pwl3HdJsG3BtD/SoUk hp0/DOudqyHNp4rYa2Ajtgm7GVN69JEpID0953T7F7n52SKm67/94ckCUsS7BYNY2ho0 mvig== 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:to:mime-version:fcc:date:references:in-reply-to :message-id:from:dkim-signature:delivered-to; bh=gQAQhnbhQLW+VYTHdx/aXouPQK6B02KYRpxeD/xu5aw=; b=lohOb07T59bRiVeZ2N92cC+WmGCpndRKof1cejAztyz8LZCgS+V1TGcq8K/TVrwiog SEGi7Rfh23swzrtQU3/yVkuTRqCWwTx6Tc1wGeh7QuKLSpNkNZbCZp1g1nwHzhtQI5O9 6ZNlFIgTpPiDmY6FX5xAn2lUUkBJNLK2i7ZgmULuAzapbsXztn0qq7D+EF7Kbh1XsjMB HJGzsr5g4Ty6HLfc2k+wbq9pKNkpOBRiSGMDfTGXrI1sq+5JfQzF+XyVhRVsFDSqIEsh clTCSMPorGMfnEnm7Kue3M5Fvo589U+oMKSUW4bRru8PbsRf1LUpbzKI4s0asDhya/4I 6jgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=owKKkMCh; 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 o9-20020a170906600900b006e8c6b43fe4si13805487ejj.27.2022.05.09.11.17.26; Mon, 09 May 2022 11:17:26 -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=20210112 header.b=owKKkMCh; 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 C09BA68B3BB; Mon, 9 May 2022 21:16:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8DC168B3D7 for ; Mon, 9 May 2022 21:16:32 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id x23so12928026pff.9 for ; Mon, 09 May 2022 11:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=6Yc6o+bGhMeD5wtvXdkCUw57wUXSmFoUalUJM/aCVvI=; b=owKKkMChBM9p/GsnWK2i20mcxij9yawCboW0oAKLgxGDvlfRkUfrOHZfX7Gwx2e1/O Kr7LXCDXQ5rOwTB5MyWMjQ811510qU3yhjFwE2mDk/jOyftdwCM8oJsi24DdRppQBegu zL7Pg62itaJ/E7qkAk82Y/IytfcJJE3XFwAMup/dYlksEKS7z6o5Lj1GctgxnYBD3K1A ZnEmQCzS0KpmSX6tRCLvjGoG+I7SeGJnHeqqkubCxMzDO144vBSaJB6fjEWdz//tyic/ LNnr9Ge5kgUPFCQWg07RouY+11PGvfYSHpcbPX2YkDBeTXsxe1f/BHtwjwb88q2zy1k6 vUnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=6Yc6o+bGhMeD5wtvXdkCUw57wUXSmFoUalUJM/aCVvI=; b=OXLO43inV90raZkBDa4Q5PpO5I1f72hHy8hDoFAsLX3ZhtJFPaf+GDERtpkd7R1nBs HDWd/XPgOmgf54j1b5GsX+IfpADy6soqJdmWn1jpd5KWDqv3SnfZXd9HTFYUYIiVLG04 VdoLNq7gyIztjUDavlClrdEVhpEkznI5J6ratnRn2d18QF1pg0W0DEi4Ln2pTg38C0jT b+kl5nLJz/LJcjp3gA1N55CseiIzT/T2RmYFU3ZNSBED5fFHmAqVeQrfJh10H8NOONot UYUh9VAOTlaDLBZneeDldbBLIu18Xne+MAJoWP8YYtnzSSHdLLCsoAwuqvW4G/rfLjhB 2ySA== X-Gm-Message-State: AOAM530mZUZaPnGCgkXtuynSgeLkUswucdLyZWJcrC7uyli3mRKSulg/ 4agqu5vRPF6lXeoi7bXdz78VHfWC0a5kFQ== X-Received: by 2002:a63:175b:0:b0:3d8:22c6:fc7b with SMTP id 27-20020a63175b000000b003d822c6fc7bmr51013pgx.502.1652120191211; Mon, 09 May 2022 11:16:31 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d24-20020a170902aa9800b0015e8d4eb2a8sm149784plr.242.2022.05.09.11.16.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 11:16:30 -0700 (PDT) From: rcombs X-Google-Original-From: rcombs Message-Id: <36ea2d6faa1b57b888bf39fc8138130e8e40ef3b.1652120184.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 09 May 2022 18:16:23 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 5/6] lavc/videotoolboxdec: insert emu-prevention bytes for HEVC as well 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: pm3RZvZ0Md+4 From: rcombs Fixes decoding of files with sync-fooling sequences in their PSs. Signed-off-by: rcombs --- libavcodec/videotoolbox.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 921fed9619..ce83c2594a 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -246,7 +246,7 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) for (i = 0; i < HEVC_MAX_##T##PS_COUNT; i++) { \ if (h->ps.t##ps_list[i]) { \ const HEVC##T##PS *lps = (const HEVC##T##PS *)h->ps.t##ps_list[i]->data; \ - vt_extradata_size += 2 + lps->data_size; \ + vt_extradata_size += 2 + escape_ps(NULL, lps->data, lps->data_size); \ num_##t##ps++; \ } \ } @@ -369,11 +369,11 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) for (i = 0; i < HEVC_MAX_##T##PS_COUNT; i++) { \ if (h->ps.t##ps_list[i]) { \ const HEVC##T##PS *lps = (const HEVC##T##PS *)h->ps.t##ps_list[i]->data; \ + int size = escape_ps(p + 2, lps->data, lps->data_size); \ /* unsigned int(16) nalUnitLength; */ \ - AV_WB16(p, lps->data_size); \ + AV_WB16(p, size); \ /* bit(8*nalUnitLength) nalUnit; */ \ - memcpy(p + 2, lps->data, lps->data_size); \ - p += 2 + lps->data_size; \ + p += 2 + size; \ } \ }