From patchwork Tue Jan 7 05:03:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17227 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1754244B956 for ; Tue, 7 Jan 2020 07:04:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB5A868A956; Tue, 7 Jan 2020 07:04:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2B0F68A1E1 for ; Tue, 7 Jan 2020 07:04:12 +0200 (EET) Received: by mail-pl1-f195.google.com with SMTP id b22so22697931pls.12 for ; Mon, 06 Jan 2020 21:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dhSkt1TgImKMHENSYE9HCR8RFigAM0RUQyIIZnGgL+c=; b=S5nWDlpJV2xtndyHj+9h9rMaBYBRRZ8B0f583IJPlf3ky3+TB+CtPrO5Nhm9YLzlh4 Gp8RZJTPsh2B6aTy7zgKkrhB+dAgPlSRytHjX71q9t5tzytqUmzela82JEgZet2vJyLo DogQuHQf/LEeU043li3kPPHPTKVMTfRj2S/Q8SRcdDoA7Z+aJnMFdpcHnKdScp5AWcss Io664i1+z87B72U7rjggS6PB8d2zTKj7Aewh787jwYK+l9mDsgtVOgqFQKQBeExG+XNH 4uqhMsA/ypYjtzKUUZqbVszgga4pHn5j95AEhm8M/cWG90uSErn8Pq83qcEJmQQc6aA2 oCNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dhSkt1TgImKMHENSYE9HCR8RFigAM0RUQyIIZnGgL+c=; b=q4vrjX3+rKTSf5zi74HaVtW24+vo/QaHi6JwxmVoEbklwpSwCloFP4SeMCaCdExhja dTc8WUYj/3tTkm18UnZLADdVsdVZM7+ZCBQKoYxggJZI5F7ucNaJgNMHEFp3UdjOGOKo v5XeJgo1PZqC0lOm8ZtRmGssH9cVyqAYO9/97/o+mhP6FFl4orYdx7ak6l1R1jy7wSTr Z7jEpwSNRAm3JFEh9Aq1zKZH78nhlmN1OGDUvceNnHloGHFJO2lufOH9CgLTjXLPtKE8 AuKvMNvA0ZPCFVp+TIkHFIRnnJfC+5xGbqhl3fezV/EQqmYBppKzsptX9ATLDMqYjeWY iW5g== X-Gm-Message-State: APjAAAXuKBvqzG+wuvk7yPAhMEIvc+NX0gvmAmgd5MncCYriDP8H5onH b84X+cLzS/hH8Plk+KhFTX88967o X-Google-Smtp-Source: APXvYqxhgjh/yaP+wg0h7QmDqUSwMW+5VieTAiuf5VfrQeARi5ag8jJYqhSevtxaFHYN7O6bpsfnaw== X-Received: by 2002:a17:90a:a58d:: with SMTP id b13mr47645526pjq.61.1578373451133; Mon, 06 Jan 2020 21:04:11 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j9sm74096591pfn.152.2020.01.06.21.04.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 21:04:10 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jan 2020 13:03:53 +0800 Message-Id: <20200107050355.17503-6-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200107050355.17503-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20200107050355.17503-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 6/8] avcodec/h264_metadata_bsf: Fix user data failed to insert in case no SPSs NAL for global headers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/h264_metadata_bsf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index d96a50dbf7..a320589530 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -279,7 +279,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { H264MetadataContext *ctx = bsf->priv_data; CodedBitstreamFragment *au = &ctx->access_unit; - int err, i, j, has_sps; + int err, i, j, has_sps, has_keyframe = 0; H264RawAUD aud; err = ff_bsf_get_packet_ref(bsf, pkt); @@ -359,11 +359,13 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) goto fail; has_sps = 1; } + if (au->units[i].type == H264_NAL_IDR_SLICE) + has_keyframe = 1; } // Only insert the SEI in access units containing SPSs, and also // unconditionally in the first access unit we ever see. - if (ctx->sei_user_data && (has_sps || !ctx->done_first_au)) { + if (ctx->sei_user_data && (has_sps || !ctx->done_first_au || has_keyframe)) { H264RawSEIPayload payload = { .payload_type = H264_SEI_TYPE_USER_DATA_UNREGISTERED, };