From patchwork Tue Dec 17 10:22: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: 16853 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 98A9744A003 for ; Tue, 17 Dec 2019 12:22:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78EFF689FE7; Tue, 17 Dec 2019 12:22:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE307689F6F for ; Tue, 17 Dec 2019 12:22:27 +0200 (EET) Received: by mail-pg1-f179.google.com with SMTP id 6so5428129pgk.0 for ; Tue, 17 Dec 2019 02:22:27 -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=wjLYNgzCJrgUApUsNdrJR4UPpBcWRJr+2zfZKAgPFYU=; b=DOxXOzJwCmqMhtGOLWLHQavgAns5yJot6Q0gtb+Fpn5/fNNqN6LVBQp05+Az+uuUA6 w/L5g1NM4PT8gIIzAOU7AXsNvzO2kxUbdwSTqVPD07d8nMBzXJ/IxSeXgb0SqzlRLPt6 GFoAbw49Qqxv5QDemYZYmQriVK58cWPJlhknhNiSJgam8UZn0Yaot3PJrTg16fBYbWvO TnTFJInVIhUnYD1cjjJY55grXUcvyNyPkAqG/OW67wPSumYCrIpSjC0qOrVjQUJs5PcF ipdyz0q0DYwPJdqdQ120TW2iRqRmQg3HVo1BS6js2JA/yO3B1wIwOLj2+PET68WpWvbX Gu9A== 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=wjLYNgzCJrgUApUsNdrJR4UPpBcWRJr+2zfZKAgPFYU=; b=MGkvT+alBUgx/mK7vRwYZjD0Vq33RmogKBplDjsshr1pzB8oxUFovH59jVL/q77E0U XDpBRKqnenP49QvHYCUyp81D1q6obFIB2W+nHeZlDBjwlXO/yAQcf+VbsWNRnDuaPNKy 2Xxz55jQZl2JSEfuKKdn/4yJ6/HoYRUvCQC/e6tgYhDFdUMqTukLkIbOwCSUZpx9zpl8 ZR20UId5dP6iPIaEMJq034WvdtKlSHtAmQ+ocpPRhUh4aYQLsbWm0iOKdIUgJk8pPfIC NUMmaHspkYGUmXl1SI35l16yLCrAzSzz0SLtmKIHKcIsU4h19hwqF1SQf5hqkKDHusHJ 7tmQ== X-Gm-Message-State: APjAAAUIRnqrOEcpHYr+aI1VejZG+Wxo6wtIdMqXHzLE3ROJhAJ8CQov c0CqpndUnEuaTZN8TnAJdwyEF4IY X-Google-Smtp-Source: APXvYqzbJuoQb9Lwfn5mVc73+FOfIMp/jKABYbyi26xdvykdI1I0qHwUueIT5zumkMCNK7d+QXuz4Q== X-Received: by 2002:a63:3089:: with SMTP id w131mr24692157pgw.453.1576578145748; Tue, 17 Dec 2019 02:22:25 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j7sm29027254pgn.0.2019.12.17.02.22.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Dec 2019 02:22:25 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Dec 2019 18:22:14 +0800 Message-Id: <20191217102217.4811-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191217102217.4811-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 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 | 28 ++++++++++++++++++++++++++++ libavcodec/hevc_sei.h | 7 +++++++ libavcodec/hevcdec.c | 10 ++++++++++ 3 files changed, 45 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index c59bd4321e..1af9594607 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -206,6 +206,28 @@ 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) +{ + const int uuid_size = 16; + int i; + + if (size < uuid_size || size > INT_MAX - uuid_size) + return AVERROR(EINVAL); + + s->user_data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!s->user_data) + return AVERROR(ENOMEM); + s->user_data_size = size; + + for (i = 0; i < size; i++) + s->user_data[i] = get_bits(gb, 8); + memset(s->user_data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + s->present = 1; + return 0; +} + static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb, int size) { @@ -293,6 +315,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 +389,8 @@ void ff_hevc_reset_sei(HEVCSEI *s) { s->a53_caption.a53_caption_size = 0; av_freep(&s->a53_caption.a53_caption); + + s->unregistered.user_data_size = 0; + s->unregistered.present = 0; + av_freep(&s->unregistered.user_data); } diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index f6516ae982..1d312392e9 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -87,6 +87,12 @@ typedef struct HEVCSEIA53Caption { uint8_t *a53_caption; } HEVCSEIA53Caption; +typedef struct HEVCSEIUnregistered { + int present; + int user_data_size; + uint8_t *user_data; +} HEVCSEIUnregistered; + typedef struct HEVCSEIMasteringDisplay { int present; uint16_t display_primaries[3][2]; @@ -112,6 +118,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..bc9ab7ceb7 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.present) { + AVFrameSideData *sd = av_frame_new_side_data(out, AV_FRAME_DATA_USER_DATA_UNREGISTERED, + s->sei.unregistered.user_data_size); + if (sd) + memcpy(sd->data, s->sei.unregistered.user_data, s->sei.unregistered.user_data_size); + av_freep(&s->sei.unregistered.user_data); + s->sei.unregistered.user_data_size = 0; + s->sei.unregistered.present = 0; + } + return 0; }