From patchwork Fri Nov 17 17:24:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a20:b0:181:818d:5e7f with SMTP id e32csp450693pzh; Fri, 17 Nov 2023 01:25:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjRuL/nelT5KuBrwg9na1wDuJcGfhSTFNyfF41OE9nxJpJJqI+vIN04zrio3kKqNXVJTkE X-Received: by 2002:a05:6402:2022:b0:543:54da:1a37 with SMTP id ay2-20020a056402202200b0054354da1a37mr11991166edb.6.1700213130643; Fri, 17 Nov 2023 01:25:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700213130; cv=none; d=google.com; s=arc-20160816; b=JDNrxfnM4ZO8ssUbIJ1JDm0J3lhVPGwmwVCLlRh2EMM/TW0zD9Sa7znhZTLjbQ6K85 OplSJyF4s2Ki2ziRDNDd4K/mzaAwNkApzHJXOVt90bc2Top7YrzGAMOWU6BVTx3urtCn RNK6KRClCg/1M3YUMSswc8tP6fjfRqlNhBsvRawSz7AuqGQvwrSWjL/LWU5Bz68IJWxW CV0aMQW+qfKar5SaIaqpub/fKWwMDGQLKbLjOMTJVGCH2lQpXB8yQLXHt+9s8dIEr/Di okLViORtm1B9lM5dZnxYPndySnb6qrU8c7FPSs2a1w2ySDGUc9+f1AbudbEDqj5Xd3XP INaQ== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=OhidYGB9Y6T4BnX7ZMSakS9e4mNw1QMcw4G/7/T6t7U=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=cNyAaAlwYM4xBS+yBIusdTsUQg/qLy246tV5RoMOk1FbRlxLbD+zGbltKKgk5rV2vV bPkN75ps6kFoats0C5ZAnxmFaEt3IcVUk4mU54x3MUm7tMkL/WhtG5tyJDOvwWJxbl0s 7mQ2wywssEFfApJ1d69sd4ALLWSO5eNESRRSzOGCY4YjoeOIuHqv4TjYM3FubL5XUmC1 mMTDER5vKpxzO/g2wWY+q77n9lfGgqJ+vMacfduedpyR324HBWp2eOxTYYuZMqj3sjM+ aqxvN4nxN+dSmBwa38mJtQhlQnzsMjBeFa+uIwW+RLc3FMHJmmVbsZ/A6/nqLT7SbH0D yhiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=F7XcE1pN; 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 r2-20020aa7cfc2000000b005435a064545si765252edy.195.2023.11.17.01.25.30; Fri, 17 Nov 2023 01:25:30 -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=F7XcE1pN; 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 9550A68CD29; Fri, 17 Nov 2023 11:25:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0576368CCEB 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=EA/8jVXkkvYpbA6+KYDnlUM5LVLZimC2+XNOn1YQpok=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F7XcE1pNpTw5GcaDo55qYlqTqAVoBVQFOEKsPqE8Eo4bg3JJRchb+4lQC9gv224IG qEJeexoaBgDNtL9ihX5vpqOlZ8sF0YO3o95lgrftsaRfLMSEf8ldYunfqFs9Q18kE2 phvNlc9/aMVmk3v+23W4chiTg9qcetA1ELK+DI04= 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: xmsmtpt1700213085t5y9hi82o Message-ID: X-QQ-XMAILINFO: MmpliBmRb3iC3IwL82etZq2d+ghe/PV6rt8M3SF1vhZcr4LzapTRdNXqWBqwf4 9tOzUARaI62eIvo3VXiK0hvFApiFQNjsYW3hDEplLmGsu0l0OlL4iWj023+OhmS0vDtSdM/0EnmA p5VjuF7aMQgKp0QFkHEnKL6GFpevtGPs0b3FJX15w2NZW93ozYFh84oavjZT5wRxg7xfNghM8jFg ROtF+VaASa38Q8hgOn3xytYv8JkMZCHLJitzFKA1Edq/mmN1y1eXJbQtQd6osJl1YSga0efbB+/Z 9RXMb06aXYy9io08Kq2Xdjvm6Nzq79gu8RjwNC9Z2x58ZHmjglysjRDsz6nYqwXXExgCXh4DuJJy xbUCNyJyqT4Nh+ldiYrnzDAGw/7dZXhQpaisz8ab/LA1tTNXaZ/Dg2tvl3vP+l4JLxFHhczHorLf ns+tcdjmIeEUE5ZDHaQbBzhVgg4e/uXqgIt9Z8VRvOdi/mOnCEZs0hPaL2uKcldfyz+JBVppXV9J /EJlQ7blPwa62TfZfeh0ARWFKSJ/5W8kxG4/9ZxYBJlb/KRb5Y8uTf/bnWeWUwkOYEpmgG933aRG PXluCAD4FrqFp3FwTYq5RLMtywJYIK7HqbAoKauFB3rVncQKY3Ymw2MNJwaSt/T2awOfNpKyowwn 4q0EQb/VYP+TncQbSSJQ0Bp3T0HTKaB1XaZ5LSu44BrYlLomo04nz0jwpbHlJPTMgLjrY2SuQIgv a5/4DCnRYdSAMj9SSnAVT5B3hKcDMVIyS/F46SxqwwsgBD6H3Zc2h59fc95gZoeQlosLtYcOgLQa sHhWZkGkK83ClwMn9Sk5ViTKFp612k3lYfwcsJaOuEKOJaajE9NJgzzrJRdhd79SmxHZZOv2p5bX YyZYgVumXKvd8DprXlPfjguBw4PtEDWnBj3xoidEQcrFje44CuC56yvdEATc+BJqCSTFdOiEO3qI s8QsDlk2zC0gV865Z1y+VOan3yj/Ki0Ucka+vdfZd0tRdp1fEKK9MiXFD4pW3Y X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Nov 2023 01:24:38 +0800 X-OQ-MSGID: <20231117172441.288316-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231117172441.288316-1-quinkblack@foxmail.com> References: <20231117172441.288316-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/5] avcodec/h264_mp4toannexb_bsf: remove pass padding size as argument 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: GrZntsmORJMq From: Zhao Zhili It's a fixed value. There is no use case to change that. --- libavcodec/h264_mp4toannexb_bsf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index 7dce1ae9b6..846671abb6 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -78,7 +78,7 @@ static void count_or_copy(uint8_t **out, uint64_t *out_size, *out_size += start_code_size + in_size; } -static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding) +static int h264_extradata_to_annexb(AVBSFContext *ctx) { H264BSFContext *s = ctx->priv_data; GetByteContext ogb, *gb = &ogb; @@ -86,6 +86,7 @@ static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding) uint32_t total_size = 0; uint8_t *out = NULL, unit_nb, sps_done = 0; static const uint8_t nalu_header[4] = { 0, 0, 0, 1 }; + const int padding = AV_INPUT_BUFFER_PADDING_SIZE; int length_size, pps_offset = 0; bytestream2_init(gb, ctx->par_in->extradata, ctx->par_in->extradata_size); @@ -165,7 +166,7 @@ static int h264_mp4toannexb_init(AVBSFContext *ctx) av_log(ctx, AV_LOG_VERBOSE, "The input looks like it is Annex B already\n"); } else if (extra_size >= 7) { - ret = h264_extradata_to_annexb(ctx, AV_INPUT_BUFFER_PADDING_SIZE); + ret = h264_extradata_to_annexb(ctx); if (ret < 0) return ret;