From patchwork Sun Feb 21 19:51:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25864 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 E400B449DB5 for ; Sun, 21 Feb 2021 21:53:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8F7068A558; Sun, 21 Feb 2021 21:53:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7ABD3689246 for ; Sun, 21 Feb 2021 21:53:31 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id m1so12509369wml.2 for ; Sun, 21 Feb 2021 11:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=djO7NnHXIWlj2S5dVzckVj/xE1cyOrM0VJLt1K3O+90=; b=kkU+ce4Gks55LlH0bNkVNOpmrAKIrySpx0miJ+B6MWDA39bCOkux5ZwoLTC1WHu8KQ pQobwoJk0UFHELAdFkN70cSJiD7USEeewDWfZIhKDNYwYByLtRaU7oNzHD+XAwsUyYd2 e9pmnTl6A48RxMgcemErUuF3N1JRqeORuNIwCeYU2vkal8cIA/mkvfvDQWPDPj91shQ0 wepd3bMBqWO0TzfhSnwt4s1pFpteusQm9ZWt2hpIEBcs/0T0Xr6N1Yn3NNb/XrU34IF6 ALx46NuKCzt35CKIh/FVQCJIgkDE91WQ3lT/FJahVs59mNByBH7MI1HWkcsLsdpFuqWu f5ag== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=djO7NnHXIWlj2S5dVzckVj/xE1cyOrM0VJLt1K3O+90=; b=OWndJwW00WEk3DZi+taqaPC3Vt4KynoJwmRuLWUZr9kdmx1Ku3vJ0N9YKf45dfAmei 2Nt1qecCqLgWSyONOGmVNsQe0OiAkNVqw6wOTgygGHbQ8c2BdnkIm76GTffw/AlnONui lFyBN1hB7kfC1MlmNxIt7GYCetCeEVErgUJisuYifAl7g9ZiuQe5DvEUGrp3vVilhTFH 5RETfY+CyBKssYPThFl6aIXyAVeKVFIQrAruBE0FqLNBX1Q9jfqRGGqiAusWALA4oXjS 7XNqFqLWKsz4xxom7dTfix81VpYVZzj+cTT/PaWZlD6nrW0qoXzR9mv5t/xXyk7SaOgZ OmDg== X-Gm-Message-State: AOAM532UNglBgZ9QLCWEkeJVBRYnuZ3rl8dyPI23IynJEStpuAfKLRh6 8jV74kWh0MndiKIvO/ZtE2Vb3Ur62f1bGg== X-Google-Smtp-Source: ABdhPJxCGQwnNa0h1oNfdplvXmexQjuL5LDzUCZV83LD9yn2kpYRvRamx/dw5RiR2Y6jKcPsSGYdyw== X-Received: by 2002:a7b:c842:: with SMTP id c2mr17248371wml.100.1613937210941; Sun, 21 Feb 2021 11:53:30 -0800 (PST) Received: from localhost.localdomain (cpc91226-cmbg18-2-0-cust7.5-4.cable.virginm.net. [82.0.29.8]) by smtp.gmail.com with ESMTPSA id z18sm1780372wrs.19.2021.02.21.11.53.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 11:53:30 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Feb 2021 19:51:09 +0000 Message-Id: <20210221195125.1901683-2-sw@jkqxz.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210221195125.1901683-1-sw@jkqxz.net> References: <20210221195125.1901683-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 02/18] cbs_h264: Add support for frame packing arrangement SEI messages 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" --- libavcodec/cbs_h264.h | 23 ++++++++++++++++ libavcodec/cbs_h2645.c | 6 +++++ libavcodec/cbs_h264_syntax_template.c | 39 +++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index 9eb97eae24..1466ed12fa 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -282,6 +282,29 @@ typedef struct H264RawSEIRecoveryPoint { uint8_t changing_slice_group_idc; } H264RawSEIRecoveryPoint; +typedef struct H264RawSEIFramePackingArrangement { + uint32_t frame_packing_arrangement_id; + uint8_t frame_packing_arrangement_cancel_flag; + + uint8_t frame_packing_arrangement_type; + uint8_t quincunx_sampling_flag; + uint8_t content_interpretation_type; + uint8_t spatial_flipping_flag; + uint8_t frame0_flipped_flag; + uint8_t field_views_flag; + uint8_t current_frame_is_frame0_flag; + uint8_t frame0_self_contained_flag; + uint8_t frame1_self_contained_flag; + uint8_t frame0_grid_position_x; + uint8_t frame0_grid_position_y; + uint8_t frame1_grid_position_x; + uint8_t frame1_grid_position_y; + uint8_t frame_packing_arrangement_reserved_byte; + uint16_t frame_packing_arrangement_repetition_period; + + uint8_t frame_packing_arrangement_extension_flag; +} H264RawSEIFramePackingArrangement; + typedef struct H264RawSEIDisplayOrientation { uint8_t display_orientation_cancel_flag; uint8_t hor_flip; diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 6005d46e0d..0c591871d4 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1570,6 +1570,12 @@ static const SEIMessageTypeDescriptor cbs_sei_h264_types[] = { sizeof(H264RawSEIRecoveryPoint), SEI_MESSAGE_RW(h264, sei_recovery_point), }, + { + SEI_TYPE_FRAME_PACKING_ARRANGEMENT, + 1, 0, + sizeof(H264RawSEIFramePackingArrangement), + SEI_MESSAGE_RW(h264, sei_frame_packing_arrangement), + }, { SEI_TYPE_DISPLAY_ORIENTATION, 1, 0, diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 9587f33985..e03d41e47a 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -719,6 +719,45 @@ static int FUNC(sei_recovery_point)(CodedBitstreamContext *ctx, RWContext *rw, return 0; } + + +static int FUNC(sei_frame_packing_arrangement) + (CodedBitstreamContext *ctx, RWContext *rw, + H264RawSEIFramePackingArrangement *current, SEIMessageState *sei) +{ + int err; + + HEADER("Frame Packing Arrangement"); + + ue(frame_packing_arrangement_id, 0, UINT32_MAX - 1); + flag(frame_packing_arrangement_cancel_flag); + + if (!current->frame_packing_arrangement_cancel_flag) { + u(7, frame_packing_arrangement_type, 0, 7); + flag(quincunx_sampling_flag); + u(6, content_interpretation_type, 0, 2); + flag(spatial_flipping_flag); + flag(frame0_flipped_flag); + flag(field_views_flag); + flag(current_frame_is_frame0_flag); + flag(frame0_self_contained_flag); + flag(frame1_self_contained_flag); + if (!current->quincunx_sampling_flag && + current->frame_packing_arrangement_type != 5) { + ub(4, frame0_grid_position_x); + ub(4, frame0_grid_position_y); + ub(4, frame1_grid_position_x); + ub(4, frame1_grid_position_y); + } + u(8, frame_packing_arrangement_reserved_byte, 0, 0); + ue(frame_packing_arrangement_repetition_period, 0, 16384); + } + + flag(frame_packing_arrangement_extension_flag); + + return 0; +} + static int FUNC(sei_display_orientation)(CodedBitstreamContext *ctx, RWContext *rw, H264RawSEIDisplayOrientation *current, SEIMessageState *sei)