From patchwork Fri Nov 29 02:06:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16476 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 D457744A51E for ; Fri, 29 Nov 2019 04:15:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFA4168B1DC; Fri, 29 Nov 2019 04:15:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BD2B68A7FD for ; Fri, 29 Nov 2019 04:15:11 +0200 (EET) Received: by mail-qt1-f195.google.com with SMTP id i17so30975500qtq.1 for ; Thu, 28 Nov 2019 18:15:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=oEgQopia45duBj35alq9p0YpPnkOJBQTyOLgvFiODrY=; b=S8qsF04+A1ynLzGk0FK9acj4IayWCvj4os0jMVHXVV3MWtd5hS6MiP1BreTToNnBZ9 mWhYOVWC6wgkMIkzjBzRzA9BKNqav6RQItCPwp8FXFh4l+TrLP/3Gzqrb22JD3LCXupy XXN93Nrq0RUwKku5MhJmqpSHqE8Kovfmi1LXbGvAPcSZQPcAms9dilrJjFwRf37gjirQ o657xSc9FoFeMCjSYU+4GGleAv9saBLtqVGX+VMDrIWrLAK+4cOPklQnB6mslqq+QMXt l7+LjrOsNYgHTXlHufSBCkgxXQcqJjepRp3HODAjI4IEZNB6gT5qAd4VxPaI72FvJaY0 FWNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=oEgQopia45duBj35alq9p0YpPnkOJBQTyOLgvFiODrY=; b=Gzk9xaSncXq93rQf7Zd2TqdoEIjojEDC57VC/8HJH62nXX3/7z7cY9OC6hV7YY6ZEf vCqV81mUk1yXEl16/y36k+9sZBK2SZmnbZBZD6HfBBBYe+/KPHuaefQGEWN/z6puBTD8 WrhTeeB2/3vzXdHuRzlL9k/hhJF/z5Z5W1yHYlqUw3uPmYq94tW++0nTR0/YWgiUNJwM y9C0fOCbjQaUYxZFDkgbCOJm6xc3rY9cIPJsKJJb8tpzP30KkR5wDyceLDOv/ANWjD2M 3hgjPMvopX9ph8/s947TVolJL797MAbjrVHlQiL4Vs8GgwxFQKnwrITJ8USiwZodYFik mZOg== X-Gm-Message-State: APjAAAU6dwGlhw+Ck19KY7StouV52KxzZKt0xba/KAutFHZZStIKZtzE uv2Mytv5Pgn2aaI18qy4Eq/k2Y4T X-Google-Smtp-Source: APXvYqxF02MEGKswTxCM8t6P07FCyOZz9GYALwxJgiUrlNdA5+xOWSG2wgQj/5NMpbnCu5em8vPLkQ== X-Received: by 2002:ac8:2598:: with SMTP id e24mr40797266qte.189.1574993258203; Thu, 28 Nov 2019 18:07:38 -0800 (PST) Received: from localhost.localdomain ([181.23.79.171]) by smtp.gmail.com with ESMTPSA id o33sm10993449qta.27.2019.11.28.18.07.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 18:07:37 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Nov 2019 23:06:52 -0300 Message-Id: <20191129020652.5559-1-jamrial@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_h264: add support for the Content light level information 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Defined in ITU-T H.264 (06/2019) Signed-off-by: James Almer --- This is basically a copy paste of the H.265 implementation, both here and in the spec. libavcodec/cbs_h264.h | 6 ++++++ libavcodec/cbs_h2645.c | 1 + libavcodec/cbs_h264_syntax_template.c | 17 +++++++++++++++++ libavcodec/h264_sei.h | 1 + 4 files changed, 25 insertions(+) diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index 9f7c2a0d30..f8e5b743be 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -314,6 +314,11 @@ typedef struct H264RawSEIMasteringDisplayColourVolume { uint32_t min_display_mastering_luminance; } H264RawSEIMasteringDisplayColourVolume; +typedef struct H264RawSEIContentLightLevelInfo { + uint16_t max_content_light_level; + uint16_t max_pic_average_light_level; +} H264RawSEIContentLightLevelInfo; + typedef struct H264RawSEIAlternativeTransferCharacteristics { uint8_t preferred_transfer_characteristics; } H264RawSEIAlternativeTransferCharacteristics; @@ -331,6 +336,7 @@ typedef struct H264RawSEIPayload { H264RawSEIRecoveryPoint recovery_point; H264RawSEIDisplayOrientation display_orientation; H264RawSEIMasteringDisplayColourVolume mastering_display_colour_volume; + H264RawSEIContentLightLevelInfo content_light_level; H264RawSEIAlternativeTransferCharacteristics alternative_transfer_characteristics; struct { diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 88fa0029cd..0944585fa8 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -458,6 +458,7 @@ static void cbs_h264_free_sei_payload(H264RawSEIPayload *payload) case H264_SEI_TYPE_PAN_SCAN_RECT: case H264_SEI_TYPE_RECOVERY_POINT: case H264_SEI_TYPE_DISPLAY_ORIENTATION: + case H264_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: case H264_SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: case H264_SEI_TYPE_ALTERNATIVE_TRANSFER: break; diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 1671a15d33..62b40dfb42 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -819,6 +819,19 @@ static int FUNC(sei_mastering_display_colour_volume)(CodedBitstreamContext *ctx, return 0; } +static int FUNC(sei_content_light_level)(CodedBitstreamContext *ctx, RWContext *rw, + H264RawSEIContentLightLevelInfo *current) +{ + int err; + + HEADER("Content Light Level"); + + ub(16, max_content_light_level); + ub(16, max_pic_average_light_level); + + return 0; +} + static int FUNC(sei_alternative_transfer_characteristics)(CodedBitstreamContext *ctx, RWContext *rw, H264RawSEIAlternativeTransferCharacteristics *current) @@ -883,6 +896,10 @@ static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(sei_mastering_display_colour_volume) (ctx, rw, ¤t->payload.mastering_display_colour_volume)); break; + case H264_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: + CHECK(FUNC(sei_content_light_level) + (ctx, rw, ¤t->payload.content_light_level)); + break; case H264_SEI_TYPE_ALTERNATIVE_TRANSFER: CHECK(FUNC(sei_alternative_transfer_characteristics) (ctx, rw, ¤t->payload.alternative_transfer_characteristics)); diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h index a75c3aa175..ffd3948c5b 100644 --- a/libavcodec/h264_sei.h +++ b/libavcodec/h264_sei.h @@ -36,6 +36,7 @@ typedef enum { H264_SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation H264_SEI_TYPE_GREEN_METADATA = 56, ///< GreenMPEG information H264_SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME = 137, ///< mastering display properties + H264_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO = 144, ///< content light level information H264_SEI_TYPE_ALTERNATIVE_TRANSFER = 147, ///< alternative transfer } H264_SEI_Type;