From patchwork Mon May 9 18:16:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3038182pzb; Mon, 9 May 2022 11:16:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyPjpI89fhPVPYvpg7vu4xSv0FOTZtr7Kc8W1DcqDZOO5+ZC878sASGQA9V/wwbxicbnmm X-Received: by 2002:a17:907:86ab:b0:6f5:93d:e106 with SMTP id qa43-20020a17090786ab00b006f5093de106mr14900811ejc.573.1652120209702; Mon, 09 May 2022 11:16:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652120209; cv=none; d=google.com; s=arc-20160816; b=Cb1yDaIOvbMZYX85QgjstklyhQ0+N8j8CP3u2Ciw+YPQFW5apLZkS++JMJZwBpvYkR wZsqG9ZFbuhnH7fg3rvk7GoMxD5JKbQ1dFVrLA6yt9gjIodHFmKgprvqGVzl9N8ds8HH SU62QU+rznET6PIg/DWsXrNB7cfnpKw/pYIf1iafh/iFZ/zKJMepDJyoLG52mQc0nQuf dqcJbissB70OgXPUacJm+BLWtpws3SynoyWqPDNajP3WgwsnFHtalHSCEPKuSfYaWy5S rKM9+cOPIJhL907y5cscjAterSyioU2Qox565ItLcRdlaPlGWzSBWSC9/RGO1qTaSSOS UDow== 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=P8jz310rnC9K3a36+hcFivciesWyxkUQPRMUdQSGGfc=; b=qP94O6Z2AmahPFqNZDBnbvPwrK2YG2Bqz0oNySZrE+aWf5MssqeSNEJSTEISF0Qy6M nPRTOBwCzFVqJUvPFyx425TAQghFY2Wghr6rBFd8IfH+IWp2w4R5tqkwZ9oNzycYxP4J rIx3I8ohZMPcjhVKQPllC+PJuNSiJI/0KKZJRuJhn7vTSB9RCqXrXJNXwW+EPNV4Hn29 GCC62Z+gqoZ7CJfgqUdm+EoxwnJkuZe1Kf+f0kFo/YEPJh0nxeAewyWzcM+Ye/l0iiIF Glghk8DAZUWPI5QvvJCvMJU3fBMuE3lbQgR9J4YwMgnhrCs6YDKcos8xGD/mZWDO6v2z Ty0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fC7tMHcd; 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 c9-20020a1709060fc900b006f392b2aac4si13686080ejk.190.2022.05.09.11.16.49; Mon, 09 May 2022 11:16:49 -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=fC7tMHcd; 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 AFC0468B3B4; Mon, 9 May 2022 21:16:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEF2D68AC70 for ; Mon, 9 May 2022 21:16:28 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id iq2-20020a17090afb4200b001d93cf33ae9so57952pjb.5 for ; Mon, 09 May 2022 11:16:28 -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=rQOIpPJxfE8qaJQL4xAEY6m57ywfueFpzui3plxpo7A=; b=fC7tMHcdIFLQvS20W7NHPZu/l3GhfYWsLb9QlnEEInPSrn9fM3m3K3HuSmyOsxzYEv zvnaRGnXt37eKMHYneUpLR5kLcqvuyMN5TM9jq/09bJKWz1HeaIiCZW/EBWwNT/GmDdw aDxt15aKhSC189pB2h9pX35tV/9sC+ZyDjYMP2WmsuPZbCbXRoUdjQ7anOgldiAvsv5E XKALe3LjOLiDczmXhtnd9CQT98NILnJwCVQlLCn0MhPFIh1NWk/WyrMCrx9rxgc9w9P8 aqaTmqoJEJwe7KEpnRad93rumYpAZFwwd3LPGZs9jpGX5cFA4oIZCDhpZVAbcfzuMv0A a/mA== 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=rQOIpPJxfE8qaJQL4xAEY6m57ywfueFpzui3plxpo7A=; b=tmCg3Y1pFFcOdvgNX/9OIxwPauOj1eJR9w0zfytq7gFi3vtLciSFB0zGK9UK1AUz79 pslGWK1UQ8eqDd6BMczp+ShpdxXpDO6vnFVG9Ex0uKGcHCPSRrKWB6Lll0V5EnyvMFyO 2Vt38w3p50NDrfbnEkfdoBTktsMVuPnsJe/wCbEH/q3y7krbpzsLAeXapoqjej59nxVt E6oQtDaPkhzWqS4q5WNZU2pS84Ydo8yprumGRAc4bXPPv5IXN73vZd2Z+gjPo5Itx1Mq x6e1C2qjI6RLihIH8Spn/wj+SPZr85kHwQ9SjZlI9bcK/xuFN2uiZYruCrrQ7nZPFPhR YGTw== X-Gm-Message-State: AOAM532n+tz6K05iYE+HjIRKJ9aEs2BnWXJlvU0jG4qkmWaeFYElg6Jj sYovqoKtaTl9W9kP60maBX3Qw0eQHRiRpQ== X-Received: by 2002:a17:902:bf06:b0:156:af5b:e6c with SMTP id bi6-20020a170902bf0600b00156af5b0e6cmr17305098plb.147.1652120187015; Mon, 09 May 2022 11:16:27 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 185-20020a6219c2000000b0050dc762815esm8914565pfz.56.2022.05.09.11.16.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 11:16:26 -0700 (PDT) From: rcombs X-Google-Original-From: rcombs Message-Id: <12a32e0012f6cdec05df25ccd76dcf8989971670.1652120184.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 09 May 2022 18:16:19 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/6] lavc/videotoolboxdec: warn on nonzero status in the callback 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: yd8Umx6fRS5I From: rcombs Signed-off-by: rcombs --- libavcodec/videotoolbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 9083f6ff29..7c4c4c6e1b 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -691,7 +691,7 @@ static void videotoolbox_decoder_callback(void *opaque, } if (!image_buffer) { - av_log(avctx, AV_LOG_DEBUG, "vt decoder cb: output image buffer is null\n"); + av_log(avctx, status ? AV_LOG_WARNING : AV_LOG_DEBUG, "vt decoder cb: output image buffer is null: %i\n", status); return; } 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]; } From patchwork Mon May 9 18:16:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35704 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3038300pzb; Mon, 9 May 2022 11:17:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxzpRPFPWNJt2YOJK5Nnsg/fghNosK3c2cE3Mm9cC+zWIXe7O0veza9n3Mqf6qgILv1qXz X-Received: by 2002:a05:6402:40cf:b0:427:cead:dca with SMTP id z15-20020a05640240cf00b00427cead0dcamr18982199edb.380.1652120227683; Mon, 09 May 2022 11:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652120227; cv=none; d=google.com; s=arc-20160816; b=Zo+hPNb3x7KpQNi3+aN+NhSo/s3+9rsqG3yoJ1qOPN2Dao3ixRQtkeY8p6dH6zirr5 xTur905Vkz9OiCa/rAbXmX7WznoiRz2vmJYNln2g02q9nKAIBhvUVekxtX5OVQi89p/n zOTsnlwMGF4aIKlLNg+QXMvY7tzD6Jdzip9kSzyxGSZ/k3Qo8vxruq05WP4AF4HCPgXl LmT9U3ZcAgo7Ohip/wrMLHLgK0vjQRnY9sywXXm6ghAtgZm4xzKrnyp5kkcgGiWhGnKE zmv0m1jYSyxrJWh+hSfjDqiDYxdwgrmPWKqnvw1VPHheDADzCMYz69lVKGpy0YNAtW7L l3qA== 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=YA9/Wc3Tqz8UFfuH3KVdoY+ShXIBLMbvkEr5bE0AHj8=; b=BarTERelnTEb8qGk8ZwNqyA9zL7E2l6BPvDQw89TZQLQEGPu+qj1lJqrijLdoirXpL 5RWWAG6U9iVeBSTFd9xeLItU5xVNEeiMn4pK9Odwvff+lcnqmepma20weNIRt+lTf9EU KbnRxt/1LZ1gTQmqF0O3tDJ5largs9AVG9klPWt8jGgtAIj46AGj2paQsCyTn1at7P17 zqikELDw4+iMkBJZ85oWyxjJyOF/fqX5RjsyYBSEJJ+w9Z6aXd69ZieVibmj7Poktrh2 +f7Odnp39peH1Ba/N8Z9/1qVIbVjAxLcijcm/Ti5tfaZANmndEHuwOL6/KOmYf+6hQbV K+hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VeP3yA4y; 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 n18-20020a509352000000b0041d2e4dab4esi12840080eda.364.2022.05.09.11.17.07; Mon, 09 May 2022 11:17:07 -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=VeP3yA4y; 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 BB0B668B3D6; Mon, 9 May 2022 21:16:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA5EB68B3B5 for ; Mon, 9 May 2022 21:16:30 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id w17-20020a17090a529100b001db302efed6so80923pjh.4 for ; Mon, 09 May 2022 11:16:30 -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=GiZorwrGZUuPYMY6/dPT4PrYEpzjb5GHHkMZFkSlAus=; b=VeP3yA4yPCcARf/qJsImtO/vNiMi+m3yenmTrzhdn3JcD8rafUcenlc3aBCu+qQdSI W4c70WrW2k8RhD9glL1VuFQRZcuJCRvORUeVJGs9wK79PP+X/+iGuWqzXFqywBv817qF u0csRchfBMeq1CQpjYWZD3rt5F+83ryIfR3UXpSeUGLf/dGi4kDeuCe9cfqDTAhVFWp4 OLzRGRreI6dSvZDLney4+GjdN7gpzuWKZJThiKMxYqV/WhwfAdPv5CGZf0LaC3yjIxHD u1/9PuMbZY1WwGhxmv9HziJG0be1mzqLshMtFJQ5TPTB48PSmmU0rSq1OLBSOGIQ8ZC9 oaYA== 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=GiZorwrGZUuPYMY6/dPT4PrYEpzjb5GHHkMZFkSlAus=; b=78gt+ZpbgG+hkMnG/S0dQ6rB2bxa15KlzBsTxc/0svKjdjGMA4lazGgWB/aEoV3BuI NfjW0fOTKxT7xBoIzh1qPuB+2b50PIerca1qIopfD+8MUyO6+mcznt7oBzPTEBoS13Xa +CQJ2/k6TdSnZ9atTTERJyBtCxISmpsimnFU8oEvOllrolJloGt3bzsKx1GMGsWaJwlp 4kI+I0YGfxue9GRTEjXUBe1b5VVNvzwmm4HVkhIRAVWTd0RQl8xhl1ahT2EW12ot7Dnu MRPtZEJcyaR80ZJOQhrglavtaiuUvtPTApbN2VYpEZ1V+4Dx7Yj8hI6aSrJsQ32J+tWC aGZA== X-Gm-Message-State: AOAM532oHjp0pS41rl9fPH6ZkZGi+Wq7lYcYp75L9m7P4XQdgU7UpKMz P4Q00O3gcs88hnjzwixOLN+Gfow/qo9ZFw== X-Received: by 2002:a17:90b:1b0d:b0:1dc:672e:c8c2 with SMTP id nu13-20020a17090b1b0d00b001dc672ec8c2mr19325362pjb.96.1652120189199; Mon, 09 May 2022 11:16:29 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 13-20020a170902e9cd00b0015e8d4eb22fsm177510plk.121.2022.05.09.11.16.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 11:16:28 -0700 (PDT) From: rcombs X-Google-Original-From: rcombs Message-Id: In-Reply-To: References: Date: Mon, 09 May 2022 18:16:21 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/6] lavc/videotoolboxdec: fix generating HEVC general_profile_compatibility_flags 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: xwQjY1gMEpg4 From: rcombs We store this as an array of bools, not a bitfield. Signed-off-by: rcombs --- libavcodec/videotoolbox.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index a1933f03f2..c95c53fcf0 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -273,7 +273,16 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) ptlc.profile_idc); /* unsigned int(32) general_profile_compatibility_flags; */ - memcpy(p + 2, ptlc.profile_compatibility_flag, 4); + for (i = 0; i < 4; i++) { + AV_W8(p + 2 + i, ptlc.profile_compatibility_flag[i * 8] << 7 | + ptlc.profile_compatibility_flag[i * 8 + 1] << 6 | + ptlc.profile_compatibility_flag[i * 8 + 2] << 5 | + ptlc.profile_compatibility_flag[i * 8 + 3] << 4 | + ptlc.profile_compatibility_flag[i * 8 + 4] << 3 | + ptlc.profile_compatibility_flag[i * 8 + 5] << 2 | + ptlc.profile_compatibility_flag[i * 8 + 6] << 1 | + ptlc.profile_compatibility_flag[i * 8 + 7]); + } /* unsigned int(48) general_constraint_indicator_flags; */ AV_W8(p + 6, ptlc.progressive_source_flag << 7 | From patchwork Mon May 9 18:16:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3038355pzb; Mon, 9 May 2022 11:17:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsDO+L/h1xA4CNcEy0xKKiVMfxmxhCeqyM29hbJPhEzgIkNTdg06a0j8xvZ285rC9VEz7a X-Received: by 2002:a17:906:b48:b0:6f5:132c:1a17 with SMTP id v8-20020a1709060b4800b006f5132c1a17mr15862020ejg.748.1652120237106; Mon, 09 May 2022 11:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652120237; cv=none; d=google.com; s=arc-20160816; b=Qd4yFDIfgPybOBYW91hS1BixwP3y+ZZIwupXYBD9RgqanxvNkVgEeoh1vtH/E6X8mV qUVa+sBp24jf+X+3W1ViAwclst8uq0e7QnUxXRaLAr1ziZ7IpGKOw2iX9qG4coK3G/zP El0/ooKa1caMBb2QctduG3hzyLP2x5s3giF/1xRFmoVaTZfZIHsMW3t56uM3axEqREl5 bVn6lUcrSBV30JEPWRpWNwY6k8v/MZuMRP6FuDBgpqpIqldH2rXF4HjzON9TyxLeXLwf 0NHQHt6prE9OlgBHZhtt1nw3PCw+mHV80ZHmmPV0Y4L7po++cpAYP8XTTaMQnosAgzjq 0BTw== 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=6pqNLJbg+0O5bGCI5jX7e2xy5WtHGmQ7PgErchoo3Cg=; b=AyC8DZZzVxoxsGzdSGtVONM6USldqA1w5BKadwJGysSaXWJ2yAzJtRMfui89dljwqf 476XKZOE0LhoNwngf1ug8YUOvTYMP30jI4fwz5WaOmeigAapV1RpnfFWrGnKULjTe/Ut SyVC80RGH8hCBUvFgTaAKyr+XjQlbxPYss7dWWDTm0sAxM7EdgGGlOWfmNLn83p08fjx 45I9aKtY350yqq4DIH1y/4X30qpOKrdTs0JnSvZZltUOtfA3sbZ7cXg4z0JuQTPNNz05 XTNpVKlZ8vqKJnjViFTqQqR3JMIMvCFJ2RZrgcyTDTRxPA8SZILoDNuGr4OAQk3yLlWX sppA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=La1eFBS3; 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 k11-20020aa7c04b000000b0041d79f5da31si11671383edo.534.2022.05.09.11.17.16; Mon, 09 May 2022 11:17:17 -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=La1eFBS3; 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 B4EF068B3C1; Mon, 9 May 2022 21:16:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E5FE68B3D2 for ; Mon, 9 May 2022 21:16:32 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id v11so12942938pff.6 for ; Mon, 09 May 2022 11:16:31 -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=lbKIeMy5bb1+z3xkEBRp4i2DuHSYKhfYGhSZrz6O/Wk=; b=La1eFBS3L7bCMLxT7tEkaqctnSWzpYSW9It0takt0mT2LR+7adBt/5WeJKwkghWLIY 3N/KIeL1xg459F236MgZdb+vZPmpNpqxHVyKq0NhMDB/G6SeCAA62jABYPojZDTbaEdq 9N4PU18fx9L1QHL5Sy63cmivCp3oYfAM1q4oU9YyYazxjyuNd93vKJNHnFxETj+08bqI LFhgLkKU9eOgFmynEfE+ob343KsHz+rAh5R5jip1cZdRifuu3FqY0lo8Sh5ZDzdGxb1R 91lMy2OsEvI+MiSAmSHKGP1p1xNi7I/hvwZ9dT5g/Wq9cEMkXAaA9S3aLHbHBysfKdjp GL8w== 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=lbKIeMy5bb1+z3xkEBRp4i2DuHSYKhfYGhSZrz6O/Wk=; b=Er2xDNkKtJ4tonwfxBA6PMgh0dXJDFYbjc5soxkt2REbpqI84gUqwHCgAXGTx5hmhE 5lDJUFzkr5zN8maKg3PPZle3HulX0FCNh6fAF0eRaAFdBfiS1WeAzHpaOyN/A3tqaiHU YYyzzPz3sHGuu8zzZTwE8V8iSHlk22O0jJKv85cclXSfQ/Cnyp7SAuhgEeRYbJYtTX98 ZPsM1mu7l0k2Y4lZGE7nOi+SoUC8vMEE98nosUN294pLTrI+4AXw8iOe2n78oLhtknKM oCFTZv0Na02gRYqKmjYs58me15szZypDYqUtyXdvQujXm1lFfCytYRpAYWc96WakagwE RZ1A== X-Gm-Message-State: AOAM531u25EEp/U7hMBL9N0pABUxlXc8WnStwWmcVgVMunefI02ESwqu SO0ASWo7YVWWR/5gGfuoWJKfp0/5eRMtjA== X-Received: by 2002:a63:69c7:0:b0:3c2:2b51:a4b6 with SMTP id e190-20020a6369c7000000b003c22b51a4b6mr14127758pgc.153.1652120190312; Mon, 09 May 2022 11:16:30 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id x13-20020a1709027c0d00b0015e8d4eb284sm152640pll.206.2022.05.09.11.16.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 11:16:29 -0700 (PDT) From: rcombs X-Google-Original-From: rcombs Message-Id: In-Reply-To: References: Date: Mon, 09 May 2022 18:16:22 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 4/6] lavc/videotoolboxdec: fix writing too many 1 bits for the reserved fields 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: nnmVCZP+TUBv From: rcombs Signed-off-by: rcombs --- libavcodec/videotoolbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index c95c53fcf0..921fed9619 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -328,13 +328,13 @@ CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx) * bit(5) reserved = ‘11111’b; * unsigned int(3) bitDepthLumaMinus8; */ - AV_W8(p + 17, (sps->bit_depth - 8) | 0xfc); + AV_W8(p + 17, (sps->bit_depth - 8) | 0xf8); /* * bit(5) reserved = ‘11111’b; * unsigned int(3) bitDepthChromaMinus8; */ - AV_W8(p + 18, (sps->bit_depth_chroma - 8) | 0xfc); + AV_W8(p + 18, (sps->bit_depth_chroma - 8) | 0xf8); /* bit(16) avgFrameRate; */ AV_WB16(p + 19, 0); 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; \ } \ } From patchwork Mon May 9 18:16:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35707 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3038463pzb; Mon, 9 May 2022 11:17:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7IGhpU9dsRUcUx3CgtOQKw19dpavE/PjIYyJ+RxH+XpkaXHHXcbJ819pJGyPp34BQnzer X-Received: by 2002:a17:907:3faa:b0:6f4:da62:6729 with SMTP id hr42-20020a1709073faa00b006f4da626729mr15250327ejc.747.1652120255613; Mon, 09 May 2022 11:17:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652120255; cv=none; d=google.com; s=arc-20160816; b=Yk1W/lkivMyhY52gGHDlfXGToovnEW+QP2VKj4eaYPjC54UDCXs1YEqB/HCZHLl9xf OefaxZwoVk1Xo9Meek3atFP6AhEvpjgQ1VYPp21UsZpLhm4jRiaL9vunHXyByfzzzluY IAcJ5fILCU4I6u9uTYmFjaHYmonW15Yq0nWkvETV5+ifUn6/XGDiFCrjRhs9CcUlkbdT 9lLJhiD2gme7ABGA291vEmquttTmR0Ug0iwjV02Psv8gxDYoScwohD6fEuqfOlwzj0Dv yYCNdh1xSDtqa/earwOz+kpt4xb/KDiMYWxSYXVp9MMm5qlDilB/yzbjZXM6jQkF75n6 7CKQ== 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=hYkLliijgTNfGZkOoUyNAKxZNabNuzJ6sPmEtMemwB0=; b=PeGhpTtiZtzG9/BDyJN+hDYyTtIY+y2swfnS//BRZ8XwXFbD5JsG1S8q+t1ncDDGFk J4ksqpyFHwMcLWvNVahJkO6IaHEYlAWL3s1npwgWe5qfqI+JVZxn1EvcH+WsuZpxKuf7 pTx7X70NlqE8XR9z9tRur/ku/drgyTfMWK/x+etZIif2lXGJq9xzo2nnIS8a82o73pGI FyhlH6HJhvRmhtF1EtrXm1t+Rh9ZdNATFjmtCpqNTcMttEaRWR83J9H6r0W7T8HGLoFA cifXCts0EF+HxluZGsm4wKv5mhK/GfVBzSIew6qFCGwb4p6iSjugHdJq/L8oM5UfVsn5 LbMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nQPDw0VE; 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 cb26-20020a170906a45a00b006e7ee599274si15822233ejb.235.2022.05.09.11.17.35; Mon, 09 May 2022 11:17:35 -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=nQPDw0VE; 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 B412C68B3F7; Mon, 9 May 2022 21:16:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A47B168B3C0 for ; Mon, 9 May 2022 21:16:33 +0300 (EEST) Received: by mail-pj1-f44.google.com with SMTP id c1-20020a17090a558100b001dca2694f23so83337pji.3 for ; Mon, 09 May 2022 11:16:33 -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=DMN3NoxUCpq5srr2DgFFUcKEGDvP131KE+o6w7c+E3o=; b=nQPDw0VErrN1QaESDfOZG/OCvddHmD+KGkEaqDBVfJ7nOT2SPPVBtz8esp1BgQ0O5P tmdrWbfBE413/0WT4r26BzhFbpK/xvrm+JQ0yQbNFuA0f4VwITpsAPv3QciQhH8o+AN0 f1x8Z6vGuD/hsMS141wkdZ/TyXLZmuHrbkFtAkHkfi1h0R1OalpuMF8IZxDyHr2G+xCW 1183sy/3bb9hr5C2WnidSziiXlDze1MagjW6+ZNQTYWSGCgWLGxyNTKbtNNy22G8Kz+R 8Yxbv295Qnua4sZOYaGeeSfk4lumdinUpiX0iD4fzv/VIMsHJ5bsk07yIUWq+ZfcGjVl GW1w== 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=DMN3NoxUCpq5srr2DgFFUcKEGDvP131KE+o6w7c+E3o=; b=KtXxJwPnZWyb9fYUKs7xEPSwGKNwdlb6VlQ/q4AqRuW5DaTIqHFNxdyjI0a4w2LC0I I7JMsIXDZeq/5ebdcpXVAps/iKIxKlEho6hz/DnWvH4UscY6NOA4RUndqxRvfxWk9cO/ zomeqsTJm4kavSoI+Spf6FT9Zk6BT6rV/A0o9j4yEmgAbej6nSOjRq8v7CCGOVjnWmLZ VCVqqcLUfuoBcGn68r4ek1RsyzonEMiztWBWNpLPvPRC7XqrTqPPryf8JAmB+1eQATtK yLhbdZgrCEpc5msH41KE2viUvLVTsoGk1rRi0vUR7UmYVOp8Ajm81BFTsS3MpFxwvbwM FuDg== X-Gm-Message-State: AOAM530kUpMYBYw8wgBtyoc9CnNH6DZhmoh6y+/htusdj3bRCaZyNi+f CFw5k8zq5f98zCHOuWL7GiedD5gtpcsZEw== X-Received: by 2002:a17:90b:4d90:b0:1dc:c03e:3a39 with SMTP id oj16-20020a17090b4d9000b001dcc03e3a39mr23974769pjb.116.1652120192138; Mon, 09 May 2022 11:16:32 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id h27-20020a056a00001b00b0050dc76281d7sm9245132pfk.177.2022.05.09.11.16.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 11:16:31 -0700 (PDT) From: rcombs X-Google-Original-From: rcombs Message-Id: In-Reply-To: References: Date: Mon, 09 May 2022 18:16:24 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 6/6] lavc/h264_ps: always include the stop bit in [s|p]ps->data 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: le2tf6zfEckc From: rcombs The VideoToolbox hwaccel needs the entire NAL (including the stop bit), but ff_h2645_packet_split may remove it. Detect this case by looking for bit counts divisible by 8 and insert a stop-bit-only 0x80 byte. Signed-off-by: rcombs --- libavcodec/h264_ps.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 051f06692c..e16da68dec 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -351,6 +351,10 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, } memcpy(sps->data, gb->buffer, sps->data_size); + // Re-add the removed stop bit (may be used by hwaccels). + if (!(gb->size_in_bits & 7) && sps->data_size < sizeof(sps->data)) + sps->data[sps->data_size++] = 0x80; + profile_idc = get_bits(gb, 8); constraint_set_flags |= get_bits1(gb) << 0; // constraint_set0_flag constraint_set_flags |= get_bits1(gb) << 1; // constraint_set1_flag @@ -775,6 +779,10 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct } memcpy(pps->data, gb->buffer, pps->data_size); + // Re-add the removed stop bit (may be used by hwaccels). + if (!(bit_length & 7) && pps->data_size < sizeof(pps->data)) + pps->data[pps->data_size++] = 0x80; + pps->sps_id = get_ue_golomb_31(gb); if ((unsigned)pps->sps_id >= MAX_SPS_COUNT || !ps->sps_list[pps->sps_id]) {