From patchwork Thu Dec 26 01:01:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16962 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 5582044A171 for ; Thu, 26 Dec 2019 04:07:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C0BF6891F1; Thu, 26 Dec 2019 04:07:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B6DA6881F9 for ; Thu, 26 Dec 2019 04:07:00 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id z16so12543460pfk.0 for ; Wed, 25 Dec 2019 18:07:00 -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=uw9bqjatguieq7uOHxOTrI9Z2OqQQNanOKl0FQwa++I=; b=t3nAxRvyrsvLIDC5W2df+0KZPS049zmW4pLvebwAgCMAKvtDluZAxKFD4uiqXwwmmd QO4QVTD4ZTqFlOKp8S2oEbU6Gkp9j7jpXiXrpOJif3KFeA+zD7dvSj7MSK64j5o7+YYf 6zMTH9WZGcnGq1JlOO8K5zUwRpc8X0MIymYTS0YVv52KUNl+JNlPvz7t5RyCx6BRo0eF fX7KshYTD5eQigxEDHzdASKb2RZGZmFGgRcrsLIAq/OzVkePhIq/GoSl5HJJcYjPsmkx nSenvt8YGXuQCz4O7kzwkx+wyTlmU38+MkIr1SaNkBEeXsIx7OFXmzVHrrCOTlfuGhZ3 ijYQ== 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=uw9bqjatguieq7uOHxOTrI9Z2OqQQNanOKl0FQwa++I=; b=VmKqBMNz4jfhHXkUaF9Kqw16+9l33QhGBbUhE94Zrfnn3+DolJjQ0AkREqhexW+Gmb LKaBVSpmuUTBhNutIuhh6lndCYRLBkVJ581bp+xiMr1RJ9++GDOjM8f+jynQLZsy1JiV bdH2ObRf6bkkUQBN5DkzjWt2vjL9djjM+6uDdOua6UR1nyKDeftOpeUZdqxiHKjVWUT8 M8is8z/RHlPALJA4Q3DMLm1qSQ2HiXdzNDtvLddIf5zyEMTmEgTb0fsepaaJQMMUAgDu Lec8rnCEvexjEzzmBijKqeH+4rK2gP+x3AnPwpx1arr5cKkOEdk227dukQGziT/RJAr5 5ztw== X-Gm-Message-State: APjAAAUPqAz+E44QC6SjVr9Ovqd5nUfSaay2egcXpzYnI4hmyk4duhpw Ch5y3HlBuh8+HSR2mTkOQ0OQNgtc X-Google-Smtp-Source: APXvYqyKPlaCxLS70GSdJetmge9ayQWvmmtamoxXNtkp7t9RWjVu2S1Is/gO5XdA3bh5b5zAchNacA== X-Received: by 2002:a63:1b54:: with SMTP id b20mr45283737pgm.312.1577322067826; Wed, 25 Dec 2019 17:01:07 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id s130sm30613043pgc.82.2019.12.25.17.01.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Dec 2019 17:01:07 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 09:01:03 +0800 Message-Id: <20191226010103.29008-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191211150204.16965-2-lance.lmwang@gmail.com> References: <20191211150204.16965-2-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/h265_metadata_bsf: add option to insert a string as SEI unregistered user data 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 --- update to add keyframe NAL checking as H.264 patch for global header doc/bitstream_filters.texi | 8 ++++ libavcodec/h265_metadata_bsf.c | 68 +++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 8fe5b3ad75..81b41d70b3 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -376,6 +376,14 @@ The argument must be the name of a level (for example, @samp{5.1}), a or the special name @samp{auto} indicating that the filter should attempt to guess the level from the input stream properties. +@item sei_user_data +Insert a string as SEI unregistered user data. The argument must +be of the form @emph{UUID+string}, where the UUID is as a 32-character +(16 bytes) hexadecimal string possibly separated by hyphens, and the +string can be anything. + +For example, @samp{086f3693-b7b3-4f2c-9653-21492feee5b8+hello} will +insert the string ``hello'' associated with the given 32-bit UUID. @end table @section hevc_mp4toannexb diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index b3a1fda144..615a701b37 100644 --- a/libavcodec/h265_metadata_bsf.c +++ b/libavcodec/h265_metadata_bsf.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/opt.h" @@ -23,6 +24,7 @@ #include "cbs.h" #include "cbs_h265.h" #include "hevc.h" +#include "hevc_sei.h" #include "h265_profile_level.h" enum { @@ -65,6 +67,8 @@ typedef struct H265MetadataContext { int crop_top; int crop_bottom; + const char *sei_user_data; + int level; int level_guess; int level_warned; @@ -340,7 +344,7 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { H265MetadataContext *ctx = bsf->priv_data; CodedBitstreamFragment *au = &ctx->access_unit; - int err, i; + int err, i, j, has_sps = 0, has_vps = 0, is_keyframe = 0; err = ff_bsf_get_packet_ref(bsf, pkt); if (err < 0) @@ -410,11 +414,70 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) err = h265_metadata_update_vps(bsf, au->units[i].content); if (err < 0) goto fail; + has_vps = 1; } if (au->units[i].type == HEVC_NAL_SPS) { err = h265_metadata_update_sps(bsf, au->units[i].content); if (err < 0) goto fail; + has_sps = 1; + } + if (au->units[i].type >= HEVC_NAL_BLA_W_LP && + au->units[i].type <= HEVC_NAL_IRAP_VCL23) + is_keyframe = 1; + } + + // Only insert the SEI in access units containing SPSs or VPSs or Keyframe + if (ctx->sei_user_data && (has_sps || has_vps || is_keyframe)) { + H265RawSEIPayload payload = { + .payload_type = HEVC_SEI_TYPE_USER_DATA_UNREGISTERED, + }; + H265RawSEIUserDataUnregistered *udu = + &payload.payload.user_data_unregistered; + + for (i = j = 0; j < 32 && ctx->sei_user_data[i]; i++) { + int c, v; + c = ctx->sei_user_data[i]; + if (c == '-') { + continue; + } else if (av_isxdigit(c)) { + c = av_tolower(c); + v = (c <= '9' ? c - '0' : c - 'a' + 10); + } else { + goto invalid_user_data; + } + if (i & 1) + udu->uuid_iso_iec_11578[j / 2] |= v; + else + udu->uuid_iso_iec_11578[j / 2] = v << 4; + ++j; + } + if (j == 32 && ctx->sei_user_data[i] == '+') { + size_t len = strlen(ctx->sei_user_data + i + 1); + + udu->data_ref = av_buffer_alloc(len + 1); + if (!udu->data_ref) { + err = AVERROR(ENOMEM); + goto fail; + } + + udu->data = udu->data_ref->data; + udu->data_length = len + 1; + memcpy(udu->data, ctx->sei_user_data + i + 1, len + 1); + + err = ff_cbs_h265_add_sei_prefix_message(ctx->cbc, au, &payload); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to add user data SEI " + "message to access unit.\n"); + goto fail; + } + + } else { +invalid_user_data: + av_log(bsf, AV_LOG_ERROR, "Invalid user data: " + "must be \"UUID+string\".\n"); + err = AVERROR(EINVAL); + goto fail; } } @@ -547,6 +610,9 @@ static const AVOption h265_metadata_options[] = { OFFSET(crop_bottom), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, HEVC_MAX_HEIGHT, FLAGS }, + { "sei_user_data", "Insert SEI user data (UUID+string)", + OFFSET(sei_user_data), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { "level", "Set level (tables A.6 and A.7)", OFFSET(level), AV_OPT_TYPE_INT, { .i64 = LEVEL_UNSET }, LEVEL_UNSET, 0xff, FLAGS, "level" },