From patchwork Thu Jun 11 10:17:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20278 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 1FF4E44BCD3 for ; Thu, 11 Jun 2020 13:17:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D794B68B578; Thu, 11 Jun 2020 13:17:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3579868ACE4 for ; Thu, 11 Jun 2020 13:17:38 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id v24so2159924plo.6 for ; Thu, 11 Jun 2020 03:17:38 -0700 (PDT) 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=mkmKHPyZRHlABcjrn9/xKYQ02yA5b8ieTNliYTUAqX8=; b=IH0xbj3nW4T8WUSbjz4368HSbFRPv330YIFSXt9b4JtJoJd3/bMpsbVfm21PWeCSF6 aIcMrTBlBVEWHdkh5HcKvajym/FJWNawoOMXFo8g/3t8POZ/t+0qiXCWwG9y6ZFmCHH5 AcaoAduduyCfOKyiSdul83mJktiLLy2PkCvxq+youOonvN3rH8hbvqge9L1dxL4bxJMa GXqhvKZdIH0ixCzdOaPCd0nM2DtzzXhPZgDo1f00DdbTTrRIJDajl4IxUQvOvffCNnTn WoSjvEz6+VUi9+nnYegziVbhSAj2GGh0DAIluNofeGb/8Dw2uIhDdELUyrH7dk+1XJEg hWlQ== 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=mkmKHPyZRHlABcjrn9/xKYQ02yA5b8ieTNliYTUAqX8=; b=sIrkCzik1BvKjEif6KTPMsWBDHBAGnUm0eLxC5RzTPBX6pPaZ7PCWAj9M15xAppIeB Ny3eDtg/H2yQ0viX8x03xcHl2Fd6sc2zsGajj01ncPAe5QZdhCNHX++z+rsBkTYm0z73 PsKK9gBg7fGcApjBjViAG0Z/8sFFacLt2OEYFA1KtFMG9VHXzSBZyqXQ5UVqoSbH6aWQ ATmUQbnhVOuPZwv0rVYo+ukuCGqqaQ47/4Uell5JG/2k0aTUZNRTE4QSNSt1yUHbj2ne TcPi665+IS+KDD80EGSe6ON4hhozQjg69e6opOoG3RBh0dgsrAp/URNWis3HYu2Z1ejH 71QQ== X-Gm-Message-State: AOAM533rX05Tmbf1Buhm4jO/JqeFRunJqzlHcOU8oioaKQ6Jif63qo8H rrOFy2no7bZX+o1r/aenATyIgUFz X-Google-Smtp-Source: ABdhPJxgipulhGhMxwEqTNrudQX8CRvQq1/r4ql3imFPYfW0WXM+ERWcGc3l4PY5mKoBPZxj6EwVgA== X-Received: by 2002:a17:902:c192:: with SMTP id d18mr6776132pld.260.1591870655720; Thu, 11 Jun 2020 03:17:35 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q39sm2280677pja.30.2020.06.11.03.17.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2020 03:17:35 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Jun 2020 18:17:29 +0800 Message-Id: <1591870649-8572-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591746194-13213-2-git-send-email-lance.lmwang@gmail.com> References: <1591746194-13213-2-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v12 2/4] avcodec/hevc_sei: add support for user data unregistered SEI message 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/hevc_sei.c | 33 +++++++++++++++++++++++++++++++++ libavcodec/hevc_sei.h | 6 ++++++ libavcodec/hevcdec.c | 14 ++++++++++++++ tests/ref/fate/hevc-monochrome-crop | 3 +++ 4 files changed, 56 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 6057069..1736891 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -213,6 +213,32 @@ static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB return 0; } +static int decode_nal_sei_user_data_unregistered(HEVCSEIUnregistered *s, GetBitContext *gb, + int size) +{ + AVBufferRef *buf_ref, **tmp; + + if (size < 16 || size >= INT_MAX - 1) + return AVERROR_INVALIDDATA; + + tmp = av_realloc_array(s->buf_ref, s->nb_buf_ref + 1, sizeof(*s->buf_ref)); + if (!tmp) + return AVERROR(ENOMEM); + s->buf_ref = tmp; + + buf_ref = av_buffer_alloc(size + 1); + if (!buf_ref) + return AVERROR(ENOMEM); + + for (int i = 0; i < size; i++) + buf_ref->data[i] = get_bits(gb, 8); + buf_ref->data[size] = 0; + buf_ref->size = size; + s->buf_ref[s->nb_buf_ref++] = buf_ref; + + return 0; +} + static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb, int size) { @@ -300,6 +326,8 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, return decode_nal_sei_active_parameter_sets(s, gb, logctx); case HEVC_SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35: return decode_nal_sei_user_data_registered_itu_t_t35(s, gb, size); + case HEVC_SEI_TYPE_USER_DATA_UNREGISTERED: + return decode_nal_sei_user_data_unregistered(&s->unregistered, gb, size); case HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS: return decode_nal_sei_alternative_transfer(&s->alternative_transfer, gb); default: @@ -371,4 +399,9 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s, void ff_hevc_reset_sei(HEVCSEI *s) { av_buffer_unref(&s->a53_caption.buf_ref); + + for (int i = 0; i < s->unregistered.nb_buf_ref; i++) + av_buffer_unref(&s->unregistered.buf_ref[i]); + s->unregistered.nb_buf_ref = 0; + av_freep(&s->unregistered.buf_ref); } diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index a44ccca..3618d16 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -91,6 +91,11 @@ typedef struct HEVCSEIA53Caption { AVBufferRef *buf_ref; } HEVCSEIA53Caption; +typedef struct HEVCSEIUnregistered { + AVBufferRef **buf_ref; + int nb_buf_ref; +} HEVCSEIUnregistered; + typedef struct HEVCSEIMasteringDisplay { int present; uint16_t display_primaries[3][2]; @@ -116,6 +121,7 @@ typedef struct HEVCSEI { HEVCSEIDisplayOrientation display_orientation; HEVCSEIPictureTiming picture_timing; HEVCSEIA53Caption a53_caption; + HEVCSEIUnregistered unregistered; HEVCSEIMasteringDisplay mastering_display; HEVCSEIContentLight content_light; int active_seq_parameter_set_id; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 0772608..c9e28f5 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2794,6 +2794,20 @@ static int set_side_data(HEVCContext *s) s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } + for (int i = 0; i < s->sei.unregistered.nb_buf_ref; i++) { + HEVCSEIUnregistered *unreg = &s->sei.unregistered; + + if (unreg->buf_ref[i]) { + AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, + AV_FRAME_DATA_SEI_UNREGISTERED, + unreg->buf_ref[i]); + if (!sd) + av_buffer_unref(&unreg->buf_ref[i]); + unreg->buf_ref[i] = NULL; + } + } + s->sei.unregistered.nb_buf_ref = 0; + return 0; } diff --git a/tests/ref/fate/hevc-monochrome-crop b/tests/ref/fate/hevc-monochrome-crop index 4e45412..384404d 100644 --- a/tests/ref/fate/hevc-monochrome-crop +++ b/tests/ref/fate/hevc-monochrome-crop @@ -1,6 +1,9 @@ [FRAME] width=384 height=240 +[SIDE_DATA] +side_data_type=H.26[45] User Data Unregistered SEI message +[/SIDE_DATA] [/FRAME] [STREAM] width=384