From patchwork Mon May 9 18:16:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3038238pzb; Mon, 9 May 2022 11:16:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN+8U4gKeo5uzMp7OGem0xVCutAiUug1k4A7+3DDsVHUnR0/uh5ZeWfODpJxa/Byo14+MK X-Received: by 2002:a17:907:7811:b0:6ef:a896:b407 with SMTP id la17-20020a170907781100b006efa896b407mr14898531ejc.645.1652120218923; Mon, 09 May 2022 11:16:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652120218; cv=none; d=google.com; s=arc-20160816; b=BW6k0QwlEQXBawXLRTeD3voeg/oNF2wqhfHxrJi0KI1tUDsRLOanxTD8GH9MJbamXa NyN/UU8Iuz0+GTGfLbWCck4vtzDNhb6dJA8yddtzJ+6Mhok0tV8YhX0PerxwUjCma1wv 04BKYepOjQBi6zinQjP2EaPfmfKzcEXysIVwH85OOl3chQArpH+7d8Blwrev8hYNnzTv fEp+y5a2oVfv4nGsJnGt7DfUHoRjNkEXgL1eK+xLqiiwYS2Y7W6JdnwMzYiiTnmQmJA/ llS5+YQDbO7xGLeQYmc+vCiVEw2DMA031H7MYx49QeER3EUe1bd3lBVzjc5bUFkHTiRQ 3dQA== 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=EglaD4YQPIcDJUHLshdK0gz5oGJYcfDK1IHMkNktFwg=; b=pw0unBXSimTpZ0VQQob9/dnxMLBDKR3vse0Zxs6TU7RZPt4urUi1tTEgzNBX1pVamI XMli3TTTvmN9y5PVkUBzZgbWRIxz4nq0qnxaSEGhZSeGnHNuOpEn1VHtvmFoawwkUd/f U2X9DZt/w4cmnGtuBuGLbK9ZCvGiz0dA24oaYGSZ+CoADFs/Yl1U9x1HeE2RucKY9tnm v2qdlaIAmXXY40dFiLoSbZPuh3v9F2SO7GcaY45qNUyeMyNZ9ClJ5o3NU2cFA6Xd3OvW DkMaEZHh3Uc3HRdDyv9OjUQZ2/PtWSjYzwyqGHEiUpPBicj2TzZal1XDksjRTCtEWAsJ W3kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=B6BKTyKX; 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 q4-20020a170906b28400b006e886d5db42si12589258ejz.420.2022.05.09.11.16.57; Mon, 09 May 2022 11:16:58 -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=B6BKTyKX; 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 BC31168B3C5; Mon, 9 May 2022 21:16:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA39968B39C for ; Mon, 9 May 2022 21:16:29 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id n8so14654813plh.1 for ; Mon, 09 May 2022 11:16:29 -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=6lqq7fe3lDjultFO8XpKpTF2zpg0TEbhWo1rm70loWo=; b=B6BKTyKX6e9oisX5IRuFBegnUuisWof0pUsp1XPajFuuN3vgtbroIgaSEFW5yYu4uL u5t7Zyh+GEEn/53v90NbOgLqOUjgYpGO/qKmIbOFhtBS7hvsXcSW3XmKoFLfTxcG2xqe iwPCCIErI4526bcDStln+BitKqdieUzf7LefZeJTkEUoxKHVbNAHQNVdBMYJy46P9XVc VlQM7bUc/djOugLI+ykEiRCLoUKx0DBDqtC6aOv6YyHQYUVijS9fVUWEyzZmVUPknpGt BfLVTmow75CK1ibRGSY8/8IOnZ55+PJ5b1QfSPQdu4sR5HIyCDbb6yrITlKCO64O06mv V+0g== 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=6lqq7fe3lDjultFO8XpKpTF2zpg0TEbhWo1rm70loWo=; b=1TjEGNWrfFwx9t7wBD6TedoqoSkgwsgKM0sNhv6S+J67geSUOJI/7oN7Wo8kaNMcfh xPEfBNJtdX2MeDA3od6YZxtdQdBWlUqu7SaGmxqXhNJAJPsYONmChpNCn5p3Flbdysg/ ALveQU8k+E8H6dZCudrJxMKmVpc/gQaBp1YvO5Ypu4JdBuquTOyROCkVXwKMX54DahPp 6WMQUGrOYZr99wvdCqxhPMwaWxtPLSFW7nY5QX9kXcbZJOH98oowDElMZWRLClLlWKA4 KaAhxXpYmU0EPrcCbEH1fnuUdIdk8NnzEC8hHzhzEQXoqHZ7nKBpe9RQO2gMhMBSkxTX ovnA== X-Gm-Message-State: AOAM533FAK7AUjkQK8FYk1YTs6EuJT6dmqkfvy7MjZqcIGe6fGrCnGhj 59wkgtxKEgq+BalQ/kbxPL1xZ/r4b9Uyuw== X-Received: by 2002:a17:90b:3141:b0:1dc:5a59:6229 with SMTP id ip1-20020a17090b314100b001dc5a596229mr26857936pjb.57.1652120188209; Mon, 09 May 2022 11:16:28 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id h189-20020a636cc6000000b003c18ab7389asm8256536pgc.36.2022.05.09.11.16.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 11:16:27 -0700 (PDT) From: rcombs X-Google-Original-From: rcombs Message-Id: <20892390d0a34a97fd61a05bb4797ac648fd586c.1652120184.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 09 May 2022 18:16:20 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/6] lavc/videotoolboxdec: fix escaping sequential zero sequences 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: PxsA3Zbe2VQW From: rcombs This ensure that e.g. 0000000000 becomes 00000300 000300, rather than 00000300 0000. Signed-off-by: rcombs --- libavcodec/videotoolbox.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 7c4c4c6e1b..a1933f03f2 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -166,14 +166,13 @@ static int escape_ps(uint8_t* dst, const uint8_t* src, int src_size) src[i + 2] <= 0x03) { if (dst) { *p++ = src[i++]; - *p++ = src[i++]; + *p++ = src[i]; *p++ = 0x03; } else { - i += 2; + i++; } size++; - } - if (dst) + } else if (dst) *p++ = src[i]; }