From patchwork Fri Nov 17 17:24:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44690 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a20:b0:181:818d:5e7f with SMTP id e32csp450752pzh; Fri, 17 Nov 2023 01:25:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHGxf8/Upjb4Bdg8DMNqfPjveUsqOyXw1vteAkRTRNqjFi+pMIzsmy4HO8GZuooO5hG0R5T X-Received: by 2002:a05:6402:192:b0:543:dd0:a0d8 with SMTP id r18-20020a056402019200b005430dd0a0d8mr14331093edv.31.1700213141019; Fri, 17 Nov 2023 01:25:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700213141; cv=none; d=google.com; s=arc-20160816; b=QSZgj8hb9wXtbtvZonQ3I1Bx4Ae7Llae5wtQbak8PjI+ePk215AFnwCtklHvYo5KGQ cbXfIhiaHxktviPx1o2OGj49035r2oK0/K6J4tNxkF7AdN7g1YjkF/UrpD8rP+fFA5uQ yc2i+fqu5Lzv16XBQzTm84lUyJEBc0W28/feP8toHE3zw19h4PqDU+AL+JMDhiB5jWkf UYskePI0pQcPWDjv8LOm6iFlqUX+Qyd7INTGql6NkFDp4O9czgv5giCvzagFCiyEmJzM rsbtTna3oRj8pUxtBJmaIULctbsmSx1ym/Np6bTrrQAIPWKK+8FQUqq0UKl+nkxDp3+Y i4Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=kLPfbk7yKzhKNCVYTmtL4DdY3rEtDdsEgMmobl2fEdM=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=p3romfAP5weFjcl0FCnab2aU16BxcXQS0c6yL6NTsAus7P8YsSWAUVQjOb8vNXLdlK q4f2Xkz9g91Vv9E/cO+6wHYsfIMXeHA8+iag3bxYK02uXWuR1R8wpqE688QKBIw9F8h4 JE3tDXHZwvrFOGp8Nw1PZy/R1GP8Sw3WikFMqkpkaBCXeq8m4I2CkYqls4zDoQaiRSCV GQyPAGwAWLLMwxoNdKlO599mSeRDUjQ+oFwPjOs4Tgg8Vn8qsp/3FnMDPO48ruoJimD2 ZE9kX7h7EJepZbfa5/EzQ7twPJp/wkvoBPSiHOIUAy/vD6SxlPRE8bfQJH+MX30vc+x4 gDdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WlvFO8CG; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g26-20020a50d0da000000b0053e08a66bccsi778295edf.371.2023.11.17.01.25.40; Fri, 17 Nov 2023 01:25:40 -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=@foxmail.com header.s=s201512 header.b=WlvFO8CG; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4EC468CD26; Fri, 17 Nov 2023 11:25:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-87.mail.qq.com (out162-62-57-87.mail.qq.com [162.62.57.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0191668CCDC for ; Fri, 17 Nov 2023 11:24:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1700213085; bh=/6PgLCBuvjpceDHseb9tM7knBRzhCcIvMmBA9pCIsfA=; h=From:To:Cc:Subject:Date; b=WlvFO8CGY6LewB+P/sASQDxf+RBVV2womW0HfYY047iW5zqN7dYcsVEqAYvRIITfq Bsi3eSjQFRNvG6rrYUu0NSoUkcU4LD2IezhavnSBxvGhD7jTOyZDVTE2h2eHmZQ6X6 YENk3Jm+bYpdC13LSvuOPNt21/d605JI7pmNQxKQ= Received: from localhost.localdomain ([113.108.77.61]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 62C14297; Fri, 17 Nov 2023 17:24:44 +0800 X-QQ-mid: xmsmtpt1700213084t4xabax7r Message-ID: X-QQ-XMAILINFO: MmPNY57tR1XnJqt1Srw/MxdOUIj4wykL8m7BMrU/n4xroHKHGHhS957JYLHVHe T/dsVjNenaCv6gOi5d8C5IDFEcubAb5/76lvBKdD82x/9YkTH0275dB62HHXraTFbuATZYnkx8Ap XJbPMLBlcLVcDMSO1r0zXbDKycs02ISLiem+019h2w2R0fc55eqkozNgA4kEQkJYaCrpi4VxtUhM KVkzteV0ieXzTIYfQfCzpTcHyaSqZC3viISczDsan7ILzXA+eQ691Ccmuk+NSRiZgyuBu7bsyz5x Qdr0JWPelCIbcoMZOLWaVjyOuqBShCuJFxFBOiF7Kt/Jb+hhPSh51No4UDKwT6KFiy1us7GQivCl g7AU2P8LcX0JHSufQ3/QcTWNV4atM6/pbCrAIex2Y66ATeYmiNZ6OlRE/Vuw5ImdpuzOKPdWuPEV buU1iXykfLuOGuJChbIQd8wpu3yvbP3h6H24lxThlMOjaJk43WW3IQlbn/qXwplh7GFrgOIc1Ow5 4uqul3+zh/q6REOZW+i/wOzShIGGZi+biTcrh6qIlP3cioAvn3vCqrBFZobHzRCbj8/vPy6YBu1b jE2Y5znQAeysK75VD9w5ZjtlQNWvQvKaCVn8J2C/FOvMzWHhWFD1JJWNTObuwL1VKTq623CqL6N+ Tmoe8R+zHZALdqitXjF1nBRs0UQXfAucBydNR2TSNwnHoTHJpug4VPex5Uh5nh+7XCVhpuaaSJfw JQpDxZiZpylBc20pNtkvpo7p6jmnbCrcBwNFRaU12fTgE4zlc7uj1q03Ii9dFsfcb6mqL8U7p/IR +f0ZB/CubJnQemB/qjx+hyH6R8Aa7kO2VIxcU8VM52MshlIWSeXqWmbOVOWbSZ7DmhvNKDlPZD6R beJc3phRa0b1SjYETaA7Ia59wWuxPn62ZBTo6UAr+y+lnSsqsBd2/45tnirk9QkstINMKwqSsPd8 6uZucRN8noGsYMIG8izc2gAgqjXcxv X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Nov 2023 01:24:37 +0800 X-OQ-MSGID: <20231117172441.288316-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/5] avcodec/h264_mp4toannexb_bsf: refactor start_code_size handling 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /i83ndcd9T2i From: Zhao Zhili start_code_size depends on whether PS comes from out-of-band or in-band. Make the code more readable. --- libavcodec/h264_mp4toannexb_bsf.c | 34 ++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index d11be455c2..7dce1ae9b6 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -43,10 +43,26 @@ typedef struct H264BSFContext { int extradata_parsed; } H264BSFContext; +enum PsSource { + PS_OUT_OF_BAND = -1, + PS_NONE = 0, + PS_IN_BAND = 1, +}; + static void count_or_copy(uint8_t **out, uint64_t *out_size, - const uint8_t *in, int in_size, int ps, int copy) + const uint8_t *in, int in_size, enum PsSource ps, int copy) { - uint8_t start_code_size = ps < 0 ? 0 : *out_size == 0 || ps ? 4 : 3; + uint8_t start_code_size; + + if (ps == PS_OUT_OF_BAND) + /* start code already present in out-of-band ps data, so don't need to + * add it manually again + */ + start_code_size = 0; + else if (ps == PS_IN_BAND || *out_size == 0) + start_code_size = 4; + else + start_code_size = 3; if (copy) { memcpy(*out + start_code_size, in, in_size); @@ -202,6 +218,7 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) do { uint32_t nal_size = 0; + enum PsSource ps; /* possible overread ok due to padding */ for (int i = 0; i < s->length_size; i++) @@ -230,7 +247,7 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) if (!s->sps_size) { LOG_ONCE(ctx, AV_LOG_WARNING, "SPS not present in the stream, nor in AVCC, stream may be unreadable\n"); } else { - count_or_copy(&out, &out_size, s->sps, s->sps_size, -1, j); + count_or_copy(&out, &out_size, s->sps, s->sps_size, PS_OUT_OF_BAND, j); sps_seen = 1; } } @@ -246,19 +263,22 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) if (new_idr && unit_type == H264_NAL_IDR_SLICE && !sps_seen && !pps_seen) { if (ctx->par_out->extradata) count_or_copy(&out, &out_size, ctx->par_out->extradata, - ctx->par_out->extradata_size, -1, j); + ctx->par_out->extradata_size, PS_OUT_OF_BAND, j); new_idr = 0; /* if only SPS has been seen, also insert PPS */ } else if (new_idr && unit_type == H264_NAL_IDR_SLICE && sps_seen && !pps_seen) { if (!s->pps_size) { LOG_ONCE(ctx, AV_LOG_WARNING, "PPS not present in the stream, nor in AVCC, stream may be unreadable\n"); } else { - count_or_copy(&out, &out_size, s->pps, s->pps_size, -1, j); + count_or_copy(&out, &out_size, s->pps, s->pps_size, PS_OUT_OF_BAND, j); } } - count_or_copy(&out, &out_size, buf, nal_size, - unit_type == H264_NAL_SPS || unit_type == H264_NAL_PPS, j); + if (unit_type == H264_NAL_SPS || unit_type == H264_NAL_PPS) + ps = PS_IN_BAND; + else + ps = PS_NONE; + count_or_copy(&out, &out_size, buf, nal_size, ps, j); if (!new_idr && unit_type == H264_NAL_SLICE) { new_idr = 1; sps_seen = 0;