From patchwork Sun Feb 23 23:41:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 17883 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 F20984488C6 for ; Mon, 24 Feb 2020 01:48:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E118F68B503; Mon, 24 Feb 2020 01:48:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FDD868B4DC for ; Mon, 24 Feb 2020 01:48:02 +0200 (EET) Received: by mail-lj1-f196.google.com with SMTP id a13so8019064ljm.10 for ; Sun, 23 Feb 2020 15:48:02 -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=JSJ7SCnI7T5B6/8Pk/NJkfuGDf2itZVndRFST2S0tG0=; b=CV0TkCt4Kn5jQCUmWD4By5V/2rEBsQx/ZCdo804smDmMVc//Bovbp6VhxUulXWitZH UoEJ2yPdOiy8/Kmvhben0T0Cy29Fzc8NsjyRWB4OraRnYu1aZzla1nVjAqhPAPVKY5cS OTEZX8akD7g53T8fSMh6ZNeXrql6+jE6jBa5Z0UwolJyhTp2gbusibQAbMz4QEbNXEIC BhGL3MJiQILh8GJP3i1Be2g27r3XVw3yb1SWjKr/vUOsT8tfbPhGWQDtwG4GYFQClhmJ MNp2vlSvU/9uQb8ZKhXd2K3RNwK4H2PS6GbIgW6/ki5IWX8UERSvYwdshGC8TjYV92fE tfhQ== 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=JSJ7SCnI7T5B6/8Pk/NJkfuGDf2itZVndRFST2S0tG0=; b=H7zpe4146dVQv5JsK7ogWjk+1GQ0tEFDscjymlA09Z0+ajEBcwxsGR/sXuh5O02YIb WcSCIClGTvp5faFqQ8g/Ip81sSoqDep04TRVrIwdWnEp+E42vFc2vgQTT9oQZheK3GtC b7Fr+HkzoMK+HWEi9KuGibIbIdAQC1n9z9a9xxdRc+B+Iry/b1q3SFmj1+yeEz8Qsnr4 heVEexnYKOjauH7B+X2Lw90svjhrOYq/pn9qNY9rLofDlOlkE1nFdFnoEL24Unx1e+FH zxRR8gVsVO9Bj2l/OyapM2VRNxmGdedMk4FHlmCHtQsUfLR52Q2Aadr9NhKBCaCQYaZd KdLg== X-Gm-Message-State: APjAAAUogNz7AyPPDrxdbFWTB6sNd65L9RRJubuyaRJ/v5dGaQOlR0nN XbamvO4f3aJg5x2lWmPnIprJ9sZOfaA= X-Google-Smtp-Source: APXvYqzxZ9oBj8a4qhrbm61ataLT+4nxovHeKYWBVw1GhWcWYwDbteqvCOu0kJPleRalHgZHFV+O3w== X-Received: by 2002:a5d:610c:: with SMTP id v12mr59593912wrt.88.1582501308218; Sun, 23 Feb 2020 15:41:48 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id y131sm16358070wmc.13.2020.02.23.15.41.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2020 15:41:47 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2020 23:41:19 +0000 Message-Id: <20200223234124.17689-16-sw@jkqxz.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200223234124.17689-1-sw@jkqxz.net> References: <20200223234124.17689-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 16/21] cbs_h264: Add a function to turn stereo 3D metadata into SEI 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.c | 47 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/cbs_h264.h | 8 ++++++++ 2 files changed, 55 insertions(+) diff --git a/libavcodec/cbs_h264.c b/libavcodec/cbs_h264.c index 75759c7f25..cc52f68550 100644 --- a/libavcodec/cbs_h264.c +++ b/libavcodec/cbs_h264.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/stereo3d.h" + #include "cbs_h264.h" int ff_cbs_h264_add_sei_message(CodedBitstreamContext *ctx, @@ -104,3 +106,48 @@ void ff_cbs_h264_delete_sei_message(CodedBitstreamContext *ctx, (sei->payload_count - position) * sizeof(*sei->payload)); } } + +void ff_cbs_h264_fill_sei_frame_packing_arrangement(H264RawSEIFramePackingArrangement *fp, + const AVStereo3D *st) +{ + static const int 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, + }; + + memset(fp, 0, sizeof(*fp)); + + if (st->type >= FF_ARRAY_ELEMS(type_map)) + return; + + fp->frame_packing_arrangement_type = type_map[st->type]; + + fp->quincunx_sampling_flag = + st->type == AV_STEREO3D_CHECKERBOARD || + st->type == AV_STEREO3D_SIDEBYSIDE_QUINCUNX; + + if (st->type == AV_STEREO3D_2D) + fp->content_interpretation_type = 0; + else if (st->flags & AV_STEREO3D_FLAG_INVERT) + fp->content_interpretation_type = 2; + else + fp->content_interpretation_type = 1; + + if (st->type == AV_STEREO3D_FRAMESEQUENCE) { + if (st->flags & AV_STEREO3D_FLAG_INVERT) + fp->current_frame_is_frame0_flag = + st->view == AV_STEREO3D_VIEW_RIGHT; + else + fp->current_frame_is_frame0_flag = + st->view == AV_STEREO3D_VIEW_LEFT; + } + + fp->frame_packing_arrangement_repetition_period = + st->type != AV_STEREO3D_FRAMESEQUENCE; +} diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index 512674ec07..76211c976b 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -525,4 +525,12 @@ void ff_cbs_h264_delete_sei_message(CodedBitstreamContext *ctx, CodedBitstreamUnit *nal_unit, int position); +struct AVStereo3D; +/** + * Fill an SEI Frame Packing Arrangement structure with values derived from + * the AVStereo3D side-data structure. + */ +void ff_cbs_h264_fill_sei_frame_packing_arrangement(H264RawSEIFramePackingArrangement *fp, + const struct AVStereo3D *st); + #endif /* AVCODEC_CBS_H264_H */