From patchwork Thu Dec 19 05:09:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16879 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 B96EA4485BC for ; Thu, 19 Dec 2019 07:09:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A44AF68A5CF; Thu, 19 Dec 2019 07:09:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7A55689E39 for ; Thu, 19 Dec 2019 07:09:18 +0200 (EET) Received: by mail-pg1-f169.google.com with SMTP id a33so2476545pgm.5 for ; Wed, 18 Dec 2019 21:09:18 -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=UlB0CqM9Wp8BzMx+pSxmp4tDZNj2+dHWUvx0s0li8wo=; b=oGubNxMhse8a71BVlEudyZYeQN5MmlrbUieNinUFEoXunVTBK1HKZGOSsESH6nPams lUIba9ks5ujiduA+vNQi4SWYY5YNlAbSzLdfdz9itgfTV2Sxuozbf/+yoR1hjz47l9/b vvx7csLJlkoS8ngIQgmMVtBaxryUEQxdpER2q7MBKlLA/KKZ56ORFD0vE7UeSyZhhOSX bJ/yHGNXg3S+gCxcgkiBzYBio8zPVFZTrGTHqELpYyAScYrLS3QPuPizXuV/1ZtMIzeM /3gEaJSF7dTrkL9FDSyAOUP70c4Fb45BbQcxUh9vKKoSquxFXntQW7XomSxQXosNLBCv nTMQ== 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=UlB0CqM9Wp8BzMx+pSxmp4tDZNj2+dHWUvx0s0li8wo=; b=sQao1u9eF3ByjMRRt0l4RXJ2tLU1M9gx48jPCs+5J1GGy79N9b/Be9WB4PnMr+EP6C OKRs9OFkFArbNdbr9NqJmb56DhefrXUQd5FIDDK1uv/Du6k4E7APLTQ/KtgykZiFl7M8 +tMnL8FrTukVq79S6DHLIxwDfwrJXllI77efsOVrshmDU4GYFLV38tlzQaDSIBoMuxOe XLN979SM02PpQMNs9wIq9QCmkMl0PxorbKSUuAufZ4IBLmPnV4wd2g5RFj/221fQxZKg gj4NFbWd2Ug56XLMJsgUIpPkqVY1gilQOA8fz5yu6PsxJk1rz/dATFENLeAvmzoxYEjS yUDA== X-Gm-Message-State: APjAAAV17TvzrVaLwmN14LWAQHnQh3X7GFcA5iFJAPPZ5PF+SPVMzEZj vb/Pt2fQ1mwS+Y5BnxRVHh5Xex6r X-Google-Smtp-Source: APXvYqxFK/jCAb3tnQohqNQ0N2uktoXTW1g1/9prDs5oxE/3i0sxrIzC2bUprHXyNWXFHco2v91inQ== X-Received: by 2002:aa7:971d:: with SMTP id a29mr5836276pfg.29.1576732156306; Wed, 18 Dec 2019 21:09:16 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u6sm4925897pjv.31.2019.12.18.21.09.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 21:09:15 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Dec 2019 13:09:04 +0800 Message-Id: <20191219050907.15041-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191219050907.15041-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20191219050907.15041-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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 | 34 +++++++++++++++++++++++++++++ libavcodec/hevc_sei.h | 6 +++++ libavcodec/hevcdec.c | 18 +++++++++++++++ tests/ref/fate/hevc-monochrome-crop | 3 +++ 4 files changed, 61 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index c59bd4321e..7f738a049c 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -206,6 +206,33 @@ 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) + return AVERROR(EINVAL); + + if (s->nb_buf_ref > INT_MAX / sizeof(*s->buf_ref) - 1) + return AVERROR(EINVAL); + + tmp = av_realloc(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); + if (!buf_ref) + return AVERROR(ENOMEM); + + for (int i = 0; i < size; i++) + buf_ref->data[i] = get_bits(gb, 8); + 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) { @@ -293,6 +320,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 +394,9 @@ void ff_hevc_reset_sei(HEVCSEI *s) { s->a53_caption.a53_caption_size = 0; av_freep(&s->a53_caption.a53_caption); + + 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 f6516ae982..2464117d47 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -87,6 +87,11 @@ typedef struct HEVCSEIA53Caption { uint8_t *a53_caption; } HEVCSEIA53Caption; +typedef struct HEVCSEIUnregistered { + AVBufferRef **buf_ref; + int nb_buf_ref; +} HEVCSEIUnregistered; + typedef struct HEVCSEIMasteringDisplay { int present; uint16_t display_primaries[3][2]; @@ -112,6 +117,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..a4981e983c 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2789,6 +2789,24 @@ 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_USER_DATA_UNREGISTERED, + unreg->buf_ref[i]); + if (!sd) + av_buffer_unref(&unreg->buf_ref[i]); + unreg->buf_ref[i] = NULL; + } + } + + if (s->sei.unregistered.nb_buf_ref > 0) { + s->sei.unregistered.nb_buf_ref = 0; + av_freep(&s->sei.unregistered.buf_ref); + } + 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