From patchwork Sat Nov 13 21:09:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31398 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3678069iob; Sat, 13 Nov 2021 13:10:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDfwm3VYAtV/mJpIwXDJpjkErjMqNIgr4i7Kyk/o9cPB5WcDhmCezNn26Mw+n/6GUDx96n X-Received: by 2002:a17:906:688c:: with SMTP id n12mr6536384ejr.480.1636837817582; Sat, 13 Nov 2021 13:10:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837817; cv=none; d=google.com; s=arc-20160816; b=her3HsKR1E+pQyacQ9gr8aDN08OnCgyc9bPAgZoZjd8bIBP8nIV1ByJ+JsgtTtlLSg +xmcr6Za9PII0x8q5/kpwKqqFTu5d1O3ZAx/nevd/xQsXPSggL5l5hzhsq7eqqtkSzCW ONd3Ymw9i5ZSvbKBAP67KtaGCaC3gMcCNgFStiDWKaiOmRsTm8OsR2PZm9Vs9cQQBvGJ 9JjOHgGWKyDlHiDETWon1tR2yaQ68fF68eUFbqZSgaC30Ocvq0QfSvJoMnA0Jt5LIyOX oaRPTVEcvJuSjtS1VeYP1b4h7K3E6hSJWvDCQmJhRMePAXko5+410WK+Jpph8Jq4GoCn dXVQ== 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=tsTeZRDpqu0DvYAa6Qe5Qk7izKlraQMXPnrqjB0i5NQ=; b=XsOB0cab/2E1r1YPJselc6bC3EcSnF7P0zNOwJgOm+mOl0oybHa4TKccV1UTgbvxCU vF6aXrLVm9LX7A3HqTXs/zDMtQctIDmBC4SaNgD09jaNdrVqPfemKCLSoMs18cbs112L xqasdEDWGsMTdD0qBoswF4yZORnbURe68bW/K8n02cWGAMDLscZJlt8lcHrCkzgNszey VJQ/uByv2N+H+HuqQtCLSoPNO0dDk9tk4dwTDRtNw7PBqf4suheBJZTxN2NsQvnhhInI Kvmn/HKhGkHp3UNxfzWuUcJo+rCooBDn4PSxb3XgUC+m/91JPeTEWcdBjQBH2qYh8jUM q9Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=fjuJuMoa; 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 f20si28496817edf.188.2021.11.13.13.10.17; Sat, 13 Nov 2021 13:10:17 -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=fjuJuMoa; 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 544B868AE52; Sat, 13 Nov 2021 23:09:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D48768AE21 for ; Sat, 13 Nov 2021 23:09:26 +0200 (EET) Received: by mail-il1-f174.google.com with SMTP id x9so12400296ilu.6 for ; Sat, 13 Nov 2021 13:09:26 -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=Xu3pi1E1PRlDGDOLiyud2Vt8KBJHUJOg/wnzKutQrZQ=; b=fjuJuMoaNQhOWw4G9wlBQrmz5pquWBMazhsoZjg43+OB1rmtQCORC8Zvlo1OYSlQLi cQx25r9+3B+41wjbqGlpSU4QdWcrjlorrWfk0CwsOToLI/F9xG7Vud6wmkCGmUkTXs1P ZjzW7vTjsu/zjKeou4ANhZZlgtWsqjBV9CshTY/+Y+8f4ZT1W6R4gL8MRd5U7rHVJDG4 VBumxlTnjlC0CKTgf5NxHXZi4BXfALTdcqnSn6RamUz46E9JEX+JsxlbGeu2Ekuq+Nib uytH+UfNud/OWJ2qt3jfyXz0ReotDLTW1+hO6lyr8ilAKzQSXG6V8PwQUghG45cZYadQ CL5A== 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=Xu3pi1E1PRlDGDOLiyud2Vt8KBJHUJOg/wnzKutQrZQ=; b=NrCLq9yjSV1pnD8AOFZCd3qjv/AKxw7KyIe9Vj+dhce3pH/47vN/R6VjMWluYXMGd7 ivjuLvUktO1dWdRIam33GlMB5HFiqV5PDdUgy5SFIPG+JBjp7nmOlnG3iEK2Qtz6iThA zgq6liB0VDmJrN53FBSMZ7xJO4ToQFqT1fVrAo1zeDLgkpXmISIbQtFN9RJb+IZQQYkY Vma31dzSjiuvk+0AunpxPCraNhmyzNyidAj/rQm5ROGhyXHCY8DBeDxYbjkmBU1GSFWv VwM08wBvv2rO69DwyuTorrtwDlfCXGYqMEnV7zSciY3zYpgvJ5HtedJ/bb12pTvQxOmf u0yA== X-Gm-Message-State: AOAM530uGBs2/Ic3+pcvdPPDtSps9HokZEuNhdKnEUP8NxHvvvlD+6yI TrEkVADqdFFhjXbgCw6g1BNKLmjm/Rv/1hw= X-Received: by 2002:a05:6e02:1848:: with SMTP id b8mr13889790ilv.299.1636837764710; Sat, 13 Nov 2021 13:09:24 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:516:f322:7db9:ae0a]) by smtp.gmail.com with ESMTPSA id j23sm5243896iog.53.2021.11.13.13.09.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:24 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:06 -0600 Message-Id: <20211113210916.49167-5-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211113210916.49167-1-rcombs@rcombs.me> References: <20211113210916.49167-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/15] 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: 0595e3gjfYuN --- libavcodec/videotoolbox.c | 51 +++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 49e726a75f..510b1852ba 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -140,14 +140,49 @@ 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; + } + 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 +194,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,