From patchwork Wed Dec 18 11:06:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16870 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 C309344AEDB for ; Wed, 18 Dec 2019 13:06:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A739E68A297; Wed, 18 Dec 2019 13:06:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6543468A4DB for ; Wed, 18 Dec 2019 13:06:45 +0200 (EET) Received: by mail-pj1-f50.google.com with SMTP id l35so711261pje.3 for ; Wed, 18 Dec 2019 03:06:45 -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=wUa8p9xSzosCC4X3s70qD7Ij61uY38ZZdr+/o+GKuhg=; b=KmRnEjLgSRVjU89KrtqW4+CSSCMvgCXOH1bd6i++ZS+Asw1uv78CBs/w0HRTT4MExG fvL4o36KGOFm274xDSznfFinHikjSPaAxwYWaObVBUqOh54Ibfidw6AsXtHlr3tnRQ2E Xy2iQtc260b1FXgToVKr93km4hdujW3bxoTrcyvcMi+NfievkXk8oqUMTZbSa8MONLsm pY+VzJ67H+b6/79HOH464wteiyfuv0qShmFJMnjNuo/CLN8GJfUv51lm/ogvRupUDUgc grXtoaw96xoxFuK/ZGDKppdxxIF3DCRmEsAPAcp0qAjY5XDFX5hQ+MVGz2iZcQU8Y8D8 pBQw== 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=wUa8p9xSzosCC4X3s70qD7Ij61uY38ZZdr+/o+GKuhg=; b=DlRW5ygioUnt35HgWTdKD75JvIsvYRC7RaMM744Gl4RcDS6YtWYhKcee7tib3glWz3 7Umr8O39OXQPtZ0K9qN/WIjk4sK447ISqN7etSjrjHGAXT7BcjmT3OAU4D8j71YEu3mO o0j2FJNzRV2WdjP7+/xmZ9+RdEWlef1pbXrA4uFKXeeOngQXeZ7RIKX3qtYPgyBmjYTF L48SRrp7Is3rDIRgiR+fhF4qFm7ybR1LV5Y14nZvhNY/yTr1BSp1wRYS0ACEtU8HMUnE 8P9iOrPfWOKFJZTGkcXmGE2bmNijKYhjkDeB+8Pwht5upwjJVXqXs591ms1aa7+PCFRX 5xQA== X-Gm-Message-State: APjAAAVmp+yrtYMWmRBskWKXEce/CL9ai1tuhcPfaVrof3KGfFs+K0r4 4xfVRbQDrVShwTMzwoQA8S6XlhcD X-Google-Smtp-Source: APXvYqzAYjiC0PaCbqWDmi7UYUNC/ohgzAaZDxQuJmNvp4sNKrGDxLOv+YPgkd0Z2PAMdrmCYYq/Sw== X-Received: by 2002:a17:90a:cb83:: with SMTP id a3mr2082445pju.80.1576667203369; Wed, 18 Dec 2019 03:06:43 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 144sm2977831pfc.124.2019.12.18.03.06.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 03:06:42 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Dec 2019 19:06:14 +0800 Message-Id: <20191218110617.13295-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191218110617.13295-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20191218110617.13295-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/5] 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 | 22 ++++++++++++++++++++++ libavcodec/hevc_sei.h | 5 +++++ libavcodec/hevcdec.c | 10 ++++++++++ tests/ref/fate/hevc-monochrome-crop | 3 +++ 4 files changed, 40 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index c59bd4321e..55d67c8e15 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -206,6 +206,24 @@ 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) +{ + int i; + + if (size < 16) + return AVERROR(EINVAL); + + s->buf_ref = av_buffer_alloc(size); + if (!s->buf_ref) + return AVERROR(ENOMEM); + + for (i = 0; i < size; i++) + s->buf_ref->data[i] = get_bits(gb, 8); + + return 0; +} + static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb, int size) { @@ -293,6 +311,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: @@ -365,4 +385,6 @@ void ff_hevc_reset_sei(HEVCSEI *s) { s->a53_caption.a53_caption_size = 0; av_freep(&s->a53_caption.a53_caption); + + av_buffer_unref(&s->unregistered.buf_ref); } diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index f6516ae982..a557ee7ab7 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -87,6 +87,10 @@ typedef struct HEVCSEIA53Caption { uint8_t *a53_caption; } HEVCSEIA53Caption; +typedef struct HEVCSEIUnregistered { + AVBufferRef *buf_ref; +} HEVCSEIUnregistered; + typedef struct HEVCSEIMasteringDisplay { int present; uint16_t display_primaries[3][2]; @@ -112,6 +116,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 8f1c162ace..b1c7af090e 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2789,6 +2789,16 @@ static int set_side_data(HEVCContext *s) s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } + if (s->sei.unregistered.buf_ref) { + HEVCSEIUnregistered *unreg = &s->sei.unregistered; + + AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_USER_DATA_UNREGISTERED, + unreg->buf_ref); + if (!sd) + av_buffer_unref(&unreg->buf_ref); + unreg->buf_ref = NULL; + } + return 0; } diff --git a/tests/ref/fate/hevc-monochrome-crop b/tests/ref/fate/hevc-monochrome-crop index 4e45412acf..43f0abbcfa 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=User Data Unregistered +[/SIDE_DATA] [/FRAME] [STREAM] width=384