From patchwork Sun Feb 21 19:51:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25870 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 DA7D3449DB5 for ; Sun, 21 Feb 2021 21:53:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C32DF68A912; Sun, 21 Feb 2021 21:53:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37C9268A59A for ; Sun, 21 Feb 2021 21:53:35 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id 7so16925759wrz.0 for ; Sun, 21 Feb 2021 11:53:35 -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=l28x5CP7JRAA4A0zUj/Ih4P2eWUErAmkuFVAZSSLzrA=; b=yuQ/rMHvT43MkhL6pVDnriHIqK7BlusVZZoUR5t1pIC5rVjYzcmlCs/Ejjtj7kBWId gSivHMdO2Kggf/apRGpg0g5TDtyEj8e0Pjp+y3vaGft4OenKQLE8T/LBXjXvBpml82T8 FobLSN1dLKLFRNyxsKGKrAtl8Gttmg77imqh2TspWy6WMsriGOA05oS1pFgLNgcaDsnj 4GjgJmAK6EFrZSsRxpoBX5jZHQEa4HGhbSLFWFk0yAosbgKuheN22OAJn1xn6wo4iMP/ UxFI70uE/UUS+2lwA59S1r1ntvLoq2TB9X3t/LuogyvcYzD+1B9FxWxVQ/41mvoLSnHA cisQ== 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=l28x5CP7JRAA4A0zUj/Ih4P2eWUErAmkuFVAZSSLzrA=; b=OURg1mVoM9v30Gfc4SLYJNKpT2xIqoG2LOR5MFn3wu0c8WEOM5Ab0cPSKU9B8Y6p2h OyfLzlfPJZWyFAaBy26d79ZvIXiwZBv/1PeAtB8zMtSVlpUc5PjXY7sZSb94+f8fd8tv POsqDNIhhkbxvOXY7Zp+aF6pq0KSy0doU1hNOLIS4cYMd7OIF1+uFk8XmnfUmmGJnTVS VjL9ZwUXeNOf78ZPo6tq5eYA0P24LsTy+wYS6ib3UT5Xx+d2s6pE9EhR/b7Eh49lC4E6 oVtBNijk6P8HDf+IU/6ghw1/5G96VR8mc7fvc5ev4OwYNPTo5DJL/rAiq1xbmshQ6NNB u1rA== X-Gm-Message-State: AOAM530kgxNssawL+BlHRXD3S8Ou6XjPhfsKvD52jLjXYXob3M7TLgAs xBsOl++/mjv3rST0TFOgdB1kfb0dT4tn6Q== X-Google-Smtp-Source: ABdhPJwAvMl3ezyLsgDcJTbU/r1aiRoDFuIWsJosXMUa1BiGka01Pd0Jx83ptxBW9oGPnQpshdFWaQ== X-Received: by 2002:adf:f38a:: with SMTP id m10mr18869102wro.218.1613937214817; Sun, 21 Feb 2021 11:53:34 -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.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 11:53:34 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Feb 2021 19:51:14 +0000 Message-Id: <20210221195125.1901683-7-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 07/18] cbs_h264: Implement fill and extract for frame packing arrangement 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" This maps from/to stereo 3D metadata. --- libavcodec/cbs_h2645.c | 83 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/cbs_sei.c | 2 + 2 files changed, 85 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index c01d243455..8efcd87156 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -20,6 +20,7 @@ #include "libavutil/avassert.h" #include "libavutil/display.h" #include "libavutil/mastering_display_metadata.h" +#include "libavutil/stereo3d.h" #include "bytestream.h" #include "cbs.h" @@ -1684,6 +1685,87 @@ static const SEIMessageTypeDescriptor cbs_sei_common_types[] = { SEI_MESSAGE_TYPE_END, }; +static struct { + enum AVStereo3DType st_type; + uint8_t fpa_type; +} cbs_sei_fpa_type_map[] = { + { AV_STEREO3D_2D, 6 }, + { AV_STEREO3D_SIDEBYSIDE, 3 }, + { AV_STEREO3D_TOPBOTTOM, 4 }, + { AV_STEREO3D_FRAMESEQUENCE, 5 }, + { AV_STEREO3D_CHECKERBOARD, 0 }, + { AV_STEREO3D_SIDEBYSIDE_QUINCUNX, 3 }, + { AV_STEREO3D_LINES, 2 }, + { AV_STEREO3D_COLUMNS, 1 }, +}; + +static void cbs_h264_fill_sei_frame_packing_arrangement + (H264RawSEIFramePackingArrangement *fpa, const AVStereo3D *st) +{ + memset(fpa, 0, sizeof(*fpa)); + + for (int i = 0; i < FF_ARRAY_ELEMS(cbs_sei_fpa_type_map); i++) { + if (cbs_sei_fpa_type_map[i].st_type == st->type) { + fpa->frame_packing_arrangement_type = + cbs_sei_fpa_type_map[i].fpa_type; + break; + } + } + + fpa->quincunx_sampling_flag = + st->type == AV_STEREO3D_CHECKERBOARD || + st->type == AV_STEREO3D_SIDEBYSIDE_QUINCUNX; + + if (st->type == AV_STEREO3D_2D) + fpa->content_interpretation_type = 0; + else if (st->flags & AV_STEREO3D_FLAG_INVERT) + fpa->content_interpretation_type = 2; + else + fpa->content_interpretation_type = 1; + + if (st->type == AV_STEREO3D_FRAMESEQUENCE) { + if (st->flags & AV_STEREO3D_FLAG_INVERT) + fpa->current_frame_is_frame0_flag = + st->view == AV_STEREO3D_VIEW_RIGHT; + else + fpa->current_frame_is_frame0_flag = + st->view == AV_STEREO3D_VIEW_LEFT; + } + + fpa->frame_packing_arrangement_repetition_period = + st->type != AV_STEREO3D_FRAMESEQUENCE; +} + +static void cbs_h264_extract_sei_frame_packing_arrangement + (AVStereo3D *st, const H264RawSEIFramePackingArrangement *fpa) +{ + memset(st, 0, sizeof(*st)); + + if (fpa->frame_packing_arrangement_cancel_flag) { + st->type = AV_STEREO3D_2D; + return; + } + + for (int i = 0; i < FF_ARRAY_ELEMS(cbs_sei_fpa_type_map); i++) { + if (cbs_sei_fpa_type_map[i].fpa_type == + fpa->frame_packing_arrangement_type) { + st->type = cbs_sei_fpa_type_map[i].st_type; + break; + } + } + + if (st->type == AV_STEREO3D_SIDEBYSIDE && + fpa->quincunx_sampling_flag) + st->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX; + + if (st->type == AV_STEREO3D_2D) { + if (fpa->current_frame_is_frame0_flag) + st->view = AV_STEREO3D_VIEW_LEFT; + else + st->view = AV_STEREO3D_VIEW_RIGHT; + } +} + static void cbs_h264_fill_sei_display_orientation (H264RawSEIDisplayOrientation *disp, const int32_t matrix[9]) { @@ -1791,6 +1873,7 @@ static const SEIMessageTypeDescriptor cbs_sei_h264_types[] = { 1, 0, sizeof(H264RawSEIFramePackingArrangement), SEI_MESSAGE_RW(h264, sei_frame_packing_arrangement), + SEI_MESSAGE_FE(h264, sei_frame_packing_arrangement), }, { SEI_TYPE_DISPLAY_ORIENTATION, diff --git a/libavcodec/cbs_sei.c b/libavcodec/cbs_sei.c index 27b5997e47..3fbea264aa 100644 --- a/libavcodec/cbs_sei.c +++ b/libavcodec/cbs_sei.c @@ -386,6 +386,8 @@ static const SEIMetadata cbs_sei_metadata[] = { SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO }, { CBS_METADATA_DISPLAY_MATRIX, SEI_TYPE_DISPLAY_ORIENTATION }, + { CBS_METADATA_STEREO3D, + SEI_TYPE_FRAME_PACKING_ARRANGEMENT }, }; static const SEIMessageTypeDescriptor *cbs_sei_find_type_from_metadata