From patchwork Fri Nov 17 17:24:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44692 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a20:b0:181:818d:5e7f with SMTP id e32csp450635pzh; Fri, 17 Nov 2023 01:25:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsoyMztuj7PhY7YIaNDmyAvW8FaLfBFGu04e1uLHRShFWCXMYDmEXA5AepDN5hd+ldULKl X-Received: by 2002:a17:906:10d9:b0:9cb:b7d3:bcf0 with SMTP id v25-20020a17090610d900b009cbb7d3bcf0mr8398920ejv.1.1700213121537; Fri, 17 Nov 2023 01:25:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700213121; cv=none; d=google.com; s=arc-20160816; b=PK0fBe0a+i3HY8Q9zHKne8u5ku4msjLE5qkunUeEvXMQyAJnegrvcNURUrVDfDJwHy R8BaJiM9gH3oM1Ks2sGgWOH9btvo+qq8O5VQipk/xpRS5qLm2oPoGGgReYXgaI9fjEgj 7wASju+wifpPECF/8KtILo/Pxoo0VJ+q7hDV8UaVIVIgcYPQnfT7NebUCBlwPyC1k3pt aMW2iEasbPxtu2XRfYbD0q7PvzuBgI6TC3MyYI3S9w+ee/PqDepu/1aWVLNGaFaC0EhH K4eAaSmCG5Xi+8t4pz76uAaCz2KrRtuBY+ul9yHQ2OsiF9qUXMRl0O6y0B1vhdJLYidI ywMA== 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=oFXewZsMkZaLfdEVjIWircUgZWff0mGofCEi/9+QM9w=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=fgrAepA7lDJosR+21YCa1K0JllFtBgyAdB1HnT2MRWcf8o7gMcDm4Uezey0E00SWc4 CwOrOvknFX5knUSq7ovMt4V0tNIgr786aafOzD+kcAFVKnL6isyXA5Qz6Ng0YA1rR8Ro PaC6Q3TmZxZZEJEtbweVrTGJal7pzQMR0xXoyFOdyMEpxlywvzDdKQDYjzFgvMGRNPxj Xn82lXlSC2O5uyJpQD3iBFHlNsjJ5YlpBSwUTZZX6gjSxyO+IVM5TlCKGWh5bjq5IRpt s8I6bSthyKdr/iefy7CTT+OnLQJzbChLQKUMr/ISYAaXLk5/aP5sW/0dNsup7BgEFrTG E59Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=llDgVCX5; 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 n21-20020a170906089500b009b98debed92si674270eje.180.2023.11.17.01.25.21; Fri, 17 Nov 2023 01:25:21 -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=llDgVCX5; 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 6E35F68C778; Fri, 17 Nov 2023 11:25:05 +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 F21B168CCC2 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=1700213086; bh=TJHyCOv2/+K7GpoQKoNvD2Vdmj/GBfKmFYZCFQRpVQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=llDgVCX54UZUj/m6jaumVipMn7/9963m6AGhUSvb0SPMjAven72CduKNeWNa5d27v m7D9CAPYwfjz6oAULiECDvn+WrjJKGnz0ZEmHhM3hEmPcouxAE9o+vski1kcolH611 rwHyYQTPQmLNM8R5hbuYt1UhoD9cTEBowvptu2pg= 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: xmsmtpt1700213085thaqrgb9e Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uTOjeXrXe+vyGya2/tdSRYCCZUebv7FN5izdQLzuKrGntRsLx1hD iiCQBOELseqcXD3QJ+NVCEuUkSFSDKNQuDBKshvF1e3ZgQ+zA8fZhwR9Pb7sHGO1uB13Mr7Oqxm1 ViMzihyT/HRwS8vQFBPIiQyxADtsoXRsbvdUBhgqMhZptQcm2F7PR6IHY6BHgXw+WAN2+LfAn/z6 8YrOWRcIqGTKBkiM5haLHtfEMWZlblcopVLLLjF1ODfntUPN6DZ8Bs2XTJNUNL0vZ7Xp0o01izIW WQk5ZzpIEzALEb2uYnwh4asn37lAjXXk/qoYS3JUfcxkTkdgBpGjMnxiRzwQFerRxDZzL8a4g0PR zRFqQaf/ZJzP+E0Hak8BVdRljhKJy9Va4rOdxjc7JRBh8dasb+9cr4cgWzAJpvkyjpaK3gDwqmOY kzOHZWYvwpWhYF1K+MnG3A37uxooeGjb9jM0PSHjNWnzfmwCUyXsN/6qSiSZ+cJmYUMFEblFzQw/ hli2SLWunsZBvyZEe+vYh6kmeyUw4jic9cGJWo1L8Pr3gcbJDQQcwFdOdUr+/aaUjCEg79LiY6zL Utf6cN0N15kti9qwTps6TgcYVeOJVM+yDKZeH/W3GZuiD3k5+q1EQfdAcsMc2aUbRj81Tx3ccPxO zZno/anH//OjsN0uOXKGw0qSpp+AcxpDR7P/2oC8H3ObicCIRsEDVtZAEGLK/y/qviusUk9NeEA1 QTeLveEJPTc/71BJShjU0w1ozWVDsiKszL+jMo+8cfgWLsok+9/0I4daN1bNtUdoPcLIDWldprc+ KEhOL0NFBMzrJXCynwz+WV+Ci48YvQnlCwV6lc6HxXLyhf0s1tdZaSfBV9+mfC5vDb2hwgt3/3PV 2lAUpIS1kfopyM71Pk3G2pXWIWNda9vjAQWPDNDP+EwMMtDwzh0F8SRKrHedyaQ9OD+YLYMo5KJ4 +5/QPwDfe2tv5BDDlHY+4n34V7upa/axdykvvJSc5FRkBudcr1pg== X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Nov 2023 01:24:39 +0800 X-OQ-MSGID: <20231117172441.288316-3-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 3/5] avcodec/h264_mp4toannexb_bsf: fix missing PS before IDR frames 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: lcuCnnQZPwDA From: Zhao Zhili If there is a single group of SPS/PPS before an IDR frame, but no SPS/PPS after that, we will miss the chance to reset idr_sps_seen/idr_pps_seen. No SPS/PPS are inserted afterwards. This patch saves in-band SPS/PPS and insert them before IDR frames when necessary. --- libavcodec/h264_mp4toannexb_bsf.c | 83 ++++++++++++++++++++++++++++--- tests/fate/h264.mak | 8 ++- 2 files changed, 84 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index 846671abb6..4073c780c5 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -36,6 +36,8 @@ typedef struct H264BSFContext { uint8_t *pps; int sps_size; int pps_size; + unsigned sps_buf_size; + unsigned pps_buf_size; uint8_t length_size; uint8_t new_idr; uint8_t idr_sps_seen; @@ -130,16 +132,33 @@ pps: memset(out + total_size, 0, padding); if (pps_offset) { - s->sps = out; + uint8_t *sps; + s->sps_size = pps_offset; + sps = av_fast_realloc(s->sps, &s->sps_buf_size, s->sps_size); + if (!sps) { + av_free(out); + return AVERROR(ENOMEM); + } + s->sps = sps; + memcpy(s->sps, out, s->sps_size); } else { av_log(ctx, AV_LOG_WARNING, "Warning: SPS NALU missing or invalid. " "The resulting stream may not play.\n"); } if (pps_offset < total_size) { - s->pps = out + pps_offset; + uint8_t *pps; + s->pps_size = total_size - pps_offset; + pps = av_fast_realloc(s->pps, &s->pps_buf_size, s->pps_size); + if (!pps) { + av_freep(&s->sps); + av_free(out); + return AVERROR(ENOMEM); + } + s->pps = pps; + memcpy(s->pps, out + pps_offset, s->pps_size); } else { av_log(ctx, AV_LOG_WARNING, "Warning: PPS NALU missing or invalid. " @@ -153,6 +172,35 @@ pps: return length_size; } +static int h264_mp4toannexb_save_ps(uint8_t **dst, int *dst_size, + unsigned *dst_buf_size, + const uint8_t *nal, uint32_t nal_size, + int first) +{ + static const uint8_t nalu_header[4] = { 0, 0, 0, 1 }; + const int start_code_size = sizeof(nalu_header); + uint8_t *ptr; + uint32_t size; + + if (first) + size = 0; + else + size = *dst_size; + + ptr = av_fast_realloc(*dst, dst_buf_size, size + nal_size + start_code_size); + if (!ptr) + return AVERROR(ENOMEM); + + memcpy(ptr + size, nalu_header, start_code_size); + size += start_code_size; + memcpy(ptr + size, nal, nal_size); + size += nal_size; + + *dst = ptr; + *dst_size = size; + return 0; +} + static int h264_mp4toannexb_init(AVBSFContext *ctx) { H264BSFContext *s = ctx->priv_data; @@ -211,6 +259,9 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) if (j) \ av_log(__VA_ARGS__) for (int j = 0; j < 2; j++) { + int sps_count = 0; + int pps_count = 0; + buf = in->data; new_idr = s->new_idr; sps_seen = s->idr_sps_seen; @@ -241,8 +292,18 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) if (unit_type == H264_NAL_SPS) { sps_seen = new_idr = 1; + if (!j) { + h264_mp4toannexb_save_ps(&s->sps, &s->sps_size, &s->sps_buf_size, + buf, nal_size, !sps_count); + sps_count++; + } } else if (unit_type == H264_NAL_PPS) { pps_seen = new_idr = 1; + if (!j) { + h264_mp4toannexb_save_ps(&s->pps, &s->pps_size, &s->pps_buf_size, + buf, nal_size, !pps_count); + pps_count++; + } /* if SPS has not been seen yet, prepend the AVCC one to PPS */ if (!sps_seen) { if (!s->sps_size) { @@ -262,9 +323,10 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) /* prepend only to the first type 5 NAL unit of an IDR picture, if no sps/pps are already present */ 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, PS_OUT_OF_BAND, j); + if (s->sps_size) + count_or_copy(&out, &out_size, s->sps, s->sps_size, PS_OUT_OF_BAND, j); + if (s->pps_size) + count_or_copy(&out, &out_size, s->pps, s->pps_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) { @@ -280,7 +342,7 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) else ps = PS_NONE; count_or_copy(&out, &out_size, buf, nal_size, ps, j); - if (!new_idr && unit_type == H264_NAL_SLICE) { + if (unit_type == H264_NAL_SLICE) { new_idr = 1; sps_seen = 0; pps_seen = 0; @@ -320,6 +382,14 @@ fail: return ret; } +static void h264_mp4toannexb_close(AVBSFContext *ctx) +{ + H264BSFContext *s = ctx->priv_data; + + av_freep(&s->sps); + av_freep(&s->pps); +} + static void h264_mp4toannexb_flush(AVBSFContext *ctx) { H264BSFContext *s = ctx->priv_data; @@ -339,5 +409,6 @@ const FFBitStreamFilter ff_h264_mp4toannexb_bsf = { .priv_data_size = sizeof(H264BSFContext), .init = h264_mp4toannexb_init, .filter = h264_mp4toannexb_filter, + .close = h264_mp4toannexb_close, .flush = h264_mp4toannexb_flush, }; diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 0ff3d6df55..c7e0d0a84e 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -224,7 +224,9 @@ FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-unescaped-extradata # this sample contains field-coded frames, with both fields in a single packet FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-twofields-packet -FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb +FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb \ + fate-h264-bsf-mp4toannexb-2 + FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580 FATE_H264-$(call FRAMECRC, MXF, H264, PCM_S24LE_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-xavc-4389 @@ -426,6 +428,10 @@ fate-h264-conformance-sva_nl1_b: CMD = framecrc -i $(TARGET_SAM fate-h264-conformance-sva_nl2_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264 fate-h264-bsf-mp4toannexb: CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -c:v copy -f h264 +# First IDR is prefixed by SPS/PPS +fate-h264-bsf-mp4toannexb-2: CMD = md5 -i $(TARGET_SAMPLES)/h264/ps_prefix_first_idr.mp4 -c:v copy -f h264 +fate-h264-bsf-mp4toannexb-2: CMP = oneline +fate-h264-bsf-mp4toannexb-2: REF = cffcfa6a2d0b58c9de1f5785f099f41d fate-h264-crop-to-container: CMD = framemd5 -i $(TARGET_SAMPLES)/h264/crop-to-container-dims-canon.mov fate-h264-direct-bff: CMD = framecrc -i $(TARGET_SAMPLES)/h264/direct-bff.mkv