From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5EEC94117B for ; Thu, 17 Mar 2022 06:36:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2311F68AFAB; Thu, 17 Mar 2022 08:36:06 +0200 (EET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EC53689E10 for ; Thu, 17 Mar 2022 08:35:59 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647498964; x=1679034964; h=from:to:cc:subject:date:message-id; bh=SFbvSecbmH49u6mEBOlRb7QoWRD1ZHQ3DGB6i9DEk5I=; b=M1uqTJ/95pewu7BOhyS/jqrxGEENLmeLBi347LkxIPyMRprAlI4Rmcaz 8Ia2CYHZCrh+BVgsBB+MbW989VyzYcLHKp2A8Cs+gX/7u8uQdFRlXP9q4 T/Ggsa1NXGF3yLE5bQOFjfC5XodUoA//mWBBUUuJcobAMZkxQWctOKh7t 5a9pjvZXCY/GJjDgCa3V/mC9zsow/edu1hoJ12IlkRRYRcGgnkhhRG7Tb +Q20+yOjJ6sLvvz9E/r6kI8YAY5kMq599eD3nSvsVH7vYC78lZwurZF+d dACWJXTLFRfriYs9OazM1gmYRTdIVjgPvv49GK8EzQ1Tm58KUROdM1pSu A==; X-IronPort-AV: E=McAfee;i="6200,9189,10288"; a="255626315" X-IronPort-AV: E=Sophos;i="5.90,188,1643702400"; d="scan'208";a="255626315" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 23:35:57 -0700 X-IronPort-AV: E=Sophos;i="5.90,188,1643702400"; d="scan'208";a="690847544" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 23:35:56 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Mar 2022 14:35:46 +0800 Message-Id: <20220317063546.7429-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] libavcodec/hevc_mp4toannexb_bsf: insert extradata before non-AUD unit 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: Haihao Xiang MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang It is possible that an IRAP frame in input AVPacket contains VPS, SPS and PPS, and these headers should take effect. However the prepended extradata might override these headers. This patch inserts extradata before non-AUD unit, hence VPS, SPS and PPS from the input AVPacket will take effect if they are present. This should fix #7799 Signed-off-by: Haihao Xiang --- libavcodec/hevc_mp4toannexb_bsf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c index 790dfb0394..77551ba221 100644 --- a/libavcodec/hevc_mp4toannexb_bsf.c +++ b/libavcodec/hevc_mp4toannexb_bsf.c @@ -124,6 +124,7 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out) int got_irap = 0; int i, ret = 0; + int prev_nalu_is_aud = 0, extradata_offset = 0; ret = ff_bsf_get_packet(ctx, &in); if (ret < 0) @@ -169,14 +170,21 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out) prev_size = out->size; + if (prev_nalu_is_aud) + extradata_offset = prev_size; + ret = av_grow_packet(out, 4 + nalu_size + extra_size); if (ret < 0) goto fail; - if (extra_size) - memcpy(out->data + prev_size, ctx->par_out->extradata, extra_size); + if (extra_size) { + memmove(out->data + extradata_offset + extra_size, out->data + extradata_offset, prev_size - extradata_offset); + memcpy(out->data + extradata_offset, ctx->par_out->extradata, extra_size); + } + AV_WB32(out->data + prev_size + extra_size, 1); bytestream2_get_buffer(&gb, out->data + prev_size + 4 + extra_size, nalu_size); + prev_nalu_is_aud = nalu_type == HEVC_NAL_AUD; } ret = av_packet_copy_props(out, in); -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".