From patchwork Mon Nov 22 21:58:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31600 Delivered-To: andriy.gelman@gmail.com Received: by 2002:ab0:6957:0:0:0:0:0 with SMTP id c23csp7337828uas; Mon, 22 Nov 2021 13:59:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoODweSqtHfc6H24950DXp45ua0x3/4y3Jy1noCCvHvwoDM/0XoaG32AvWR+BPpsh1X2Zl X-Received: by 2002:a17:906:1706:: with SMTP id c6mr658157eje.343.1637618363011; Mon, 22 Nov 2021 13:59:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637618363; cv=none; d=google.com; s=arc-20160816; b=dp3cTzH/HB0bf4GPhuKfVz7e5D86DUR1w8gMJFtDHDvaRsfsGq7r/6w/fdYAiCD4LY MBxVCF8DTrWxCHKpf3k+2GLbvfwmcn854xl8I0GF5pz4NZHt/Q6pBl2IjUHwwBvp/fw3 pxS3CTJyCwKYWyQ7XBdpdlQCky5tyY9OdpoESE9RI5rBTbxdh7+/iu6bUO1qfpjxOqVJ dHNB+lVYB89jrqiRktBrxWzms7cPnkJKJdxC3CkxiOv0SB+2Pb2kqKPW/iqBTA5yXF43 5s+1J/7rWTWGgJo9vU6UuKP2mA0RPnV5ds4Mc+D4/CkY1GpYYpxzKiuZIXpeGLNU0OdU J7Wg== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=9USmkLa3WgykokEfk6l0toq9dAyEZaqAvQ0ZmulxTHo=; b=m7LJYG5P4GBFMiJ06PKk/aA2qzKAZynGlRcWCWr1OQaX9orYC2+wk4NrPBGyge7syc b0hDZ8x4hPi3VR61nlFrBjmsbYMjzarCZYoxk2uZzGEpsA47HD9IrlXONk5v9JyJlNvx FgIwNY/dmccONY/EYMKfmAUVVbaHh893JY5zVota23G8oZn5Zr2InV1CDHaW2HZGRHp2 EPLPIP42YwBDI/Kpk54bmmOP3AWty7qi5UlHsUMRJKC5+Sf8cgu9jOcKXq2L1SpdbmFM HCjU2mfBPrvRlr3kmydmPdsh6w5/HX8nggC3U+1Wx2wbMGur4IN8Q3cQRj5vvk+4GOcc A9Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=RitMWAYa; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jg6si3427709ejc.521.2021.11.22.13.59.22; Mon, 22 Nov 2021 13:59:23 -0800 (PST) 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=@rcombs.me header.s=google header.b=RitMWAYa; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F48068AA75; Mon, 22 Nov 2021 23:58:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84E3168A897 for ; Mon, 22 Nov 2021 23:58:36 +0200 (EET) Received: by mail-il1-f173.google.com with SMTP id t8so9736359ilu.8 for ; Mon, 22 Nov 2021 13:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UEW4GZ9JW0/r6cyOGPmq4BBHjwoMynaY9s2/VJGvBxA=; b=RitMWAYaDbeJelFkq1sPb++GN+ItVKRpzSlhyxq2Z/K68FCkTPH7sD97Ecoiqqnahv ztCNehIJeiKedff+Mz/P7FVtB5i3XgsAJWbH+qR0w3tLDJHZVEaIZEA6b/TsFhfxelbf mZpiXx8kqMJdDxU2TquRu1LSo7aXArPgnKNMWi6oVIkH4+RQLvJ4BpEb41mNIyt+FNEC 230fqgx715X3plxk3tRBLRAO9vY+1/xHnIuNJY64w+FNB+rZgc3bo66PP/Ry0R0wFmAw tBasw76iHaDityd0Jp7fDodDLIzCfRIMelyXU24hWvowsKIX2OUYFybpaXFwJ6PXw0FQ N+mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UEW4GZ9JW0/r6cyOGPmq4BBHjwoMynaY9s2/VJGvBxA=; b=KpHrxDJ/2xgHV1GbCAjTGd69FgCJkYHOgRjaE6RoItGlbPkX7uxtqwtl93ayvDY8ru tWwRTDNrn38ZY6XgKdVxeKOYAyj/0LFrybG78SnNBDO3WZX9sbhf/d5QoL38sTpg4Pgr tuaPqMCCu0KJENFAX/MmWoLoyS4rpRpRo4PGjfAwfchRC+86jDMFKUwouym5Jlj3GUMQ SHYDIkwbq4NzmpIJZXfWtnBgan4vsgeMtTLV9moGnev6YznczCYK0bNAAi5SUnrgf2j7 1UlRSeFM9jfN2DTYpY4Odbz7q2/9EFaDJ3/vvEjjMRa1knQyUpN/LLR5+HLm3Sg1BCOC ugPw== X-Gm-Message-State: AOAM531A8KV2hnfeahXt/qJn43o21PV0SWj4wfQ1+gx3i3ElbsFhs1SG //1d2oBgTjX4TuRsZlp8H9OLksXf2QHPbV0= X-Received: by 2002:a92:d74a:: with SMTP id e10mr166855ilq.315.1637618314819; Mon, 22 Nov 2021 13:58:34 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:edf5:499:2479:42a8]) by smtp.gmail.com with ESMTPSA id o1sm5668802ilj.41.2021.11.22.13.58.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 13:58:34 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 15:58:10 -0600 Message-Id: <20211122215821.9849-5-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211122215821.9849-1-rcombs@rcombs.me> References: <20211122215821.9849-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/16] lavc/videotoolbox: escape 0x00000[0-3]s in avcC PSs 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: uRezBgHPcAOo Content-Length: 3075 --- libavcodec/videotoolbox.c | 53 +++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 49e726a75f..bd6e769207 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -140,14 +140,51 @@ int ff_videotoolbox_alloc_frame(AVCodecContext *avctx, AVFrame *frame) #define AV_W8(p, v) *(p) = (v) +static int escape_ps(uint8_t* dst, const uint8_t* src, int src_size) +{ + int i; + int size = src_size; + uint8_t* p = dst; + + for (i = 0; i < src_size; i++) { + if (i + 2 < src_size && + src[i] == 0x00 && + src[i + 1] == 0x00 && + src[i + 2] <= 0x03) { + if (dst) { + *p++ = src[i++]; + *p++ = src[i++]; + *p++ = 0x03; + } else { + i += 2; + } + size++; + } + if (dst) + *p++ = src[i]; + } + + if (dst) + av_assert0((p - dst) == size); + + return size; +} + CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx) { VTContext *vtctx = avctx->internal->hwaccel_priv_data; H264Context *h = avctx->priv_data; CFDataRef data = NULL; uint8_t *p; - int vt_extradata_size = 6 + 2 + h->ps.sps->data_size + 3 + h->ps.pps->data_size; - uint8_t *vt_extradata = av_malloc(vt_extradata_size); + int sps_size = escape_ps(NULL, h->ps.sps->data, h->ps.sps->data_size); + int pps_size = escape_ps(NULL, h->ps.pps->data, h->ps.pps->data_size); + int vt_extradata_size; + uint8_t *vt_extradata; + int i; + + vt_extradata_size = 6 + 2 + sps_size + 3 + pps_size; + vt_extradata = av_malloc(vt_extradata_size); + if (!vt_extradata) return NULL; @@ -159,14 +196,14 @@ CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx) AV_W8(p + 3, h->ps.sps->data[3]); /* level */ AV_W8(p + 4, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 3 (11) */ AV_W8(p + 5, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */ - AV_WB16(p + 6, h->ps.sps->data_size); - memcpy(p + 8, h->ps.sps->data, h->ps.sps->data_size); - p += 8 + h->ps.sps->data_size; + AV_WB16(p + 6, sps_size); + p += 8; + p += escape_ps(p, h->ps.sps->data, h->ps.sps->data_size); AV_W8(p + 0, 1); /* number of pps */ - AV_WB16(p + 1, h->ps.pps->data_size); - memcpy(p + 3, h->ps.pps->data, h->ps.pps->data_size); + AV_WB16(p + 1, pps_size); + p += 3; + p += escape_ps(p, h->ps.pps->data, h->ps.pps->data_size); - p += 3 + h->ps.pps->data_size; av_assert0(p - vt_extradata == vt_extradata_size); // save sps header (profile/level) used to create decoder session,