From patchwork Mon Jul 27 16:32:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21301 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 2678444A99C for ; Mon, 27 Jul 2020 19:35:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1BF5B68B952; Mon, 27 Jul 2020 19:33:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C9C068B910 for ; Mon, 27 Jul 2020 19:33:00 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id k8so5079396wma.2 for ; Mon, 27 Jul 2020 09:33:00 -0700 (PDT) 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=c8R5qEuIArDuIg822yqD5QWgkq8mY22l+hHJM1y3Dbg=; b=loHtcj6+QcSjCPSBkegfnfDTgfhk16syLVqElApP1q3v9SXpoewzVk6tlYdGfILcCL J/QwjcHrQCSgoXlcg9iJ7XhZHv0yF0YPGBud/Y3FAtc2oyZoIwRhdXL0vEm1JquNEkuI 9dAAa86BMEMAOaWqgSHkH+QMVu/pn77Pbh1wgCEGH3JLbdX4V/x0UmmvE4NwWP0Nn3VZ CtEB3pFpUSQhlEQvWXegY6sjZTgCG3fOge8RQ7QpL9dptAHBcnziwEnY/f+e8hynvnN3 ETG4K251xT5VnGe5rZJ8zqPwKujlFjxkxnTOY4qO6htJGIx1g+L/tX13QBV4I0IC/qeb ej2g== 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=c8R5qEuIArDuIg822yqD5QWgkq8mY22l+hHJM1y3Dbg=; b=gpbA+X3bHiFJy2vMjKqKQR90QkDrAzv+ngsHPk5oKP7qnKpP2IcWH8UH1kzyfx4u8m OgpEQ5ouYR2qSV31fsnXQ09L2ASD6jfq/Y3bG5XvZgCAOqrBbzVxBQfKqw4CEdcPzApT NW/PGc/6bauIV1r9p/GfOAq1RFT6yPSk010UWJcFDQaDMxu0SXmL0C5sXK2ZnDedZgnO dAdt2waJXzoj8XorjuY3oOlB/LTfGDPlindHYsaWyhMaSs1b70nOV/jlAsru+Ph24aYw G90JqJihMki3BtU+ok8eQXYe0jmjYk2UIvdXt9sIqMvjdWft/ZN7AmZEfH58RIPYmr69 cr1A== X-Gm-Message-State: AOAM530NUCIkJVppQIUcs/39ui6ZXjPYF05ia7PSJWaLJzWbP9Qoiaji j4dDotAx3khMu/TrrRcL9ws1RqxFnjk= X-Google-Smtp-Source: ABdhPJwvCL4WPiR0yyizFEbY0ITCEG9iGnqi/faKDQBjIoxns9RdA8h+F8V/yxlZD37CnqDXqqjLNA== X-Received: by 2002:a7b:c195:: with SMTP id y21mr145962wmi.20.1595867579205; Mon, 27 Jul 2020 09:32:59 -0700 (PDT) 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 w16sm14706791wrg.95.2020.07.27.09.32.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 09:32:58 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jul 2020 17:32:31 +0100 Message-Id: <20200727163237.23371-17-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727163237.23371-1-sw@jkqxz.net> References: <20200727163237.23371-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 16/22] 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 c86c6d565c..a128745799 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" #include "cbs_internal.h" @@ -106,3 +108,48 @@ void ff_cbs_h264_delete_sei_message(CodedBitstreamFragment *au, (sei->payload_count - position) * sizeof(*sei->payload)); } } + +void ff_cbs_h264_fill_sei_frame_packing_arrangement(H264RawSEIFramePackingArrangement *fp, + const AVStereo3D *st) +{ + static const uint8_t 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 ca717a3b57..2f537564a7 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -523,4 +523,12 @@ void ff_cbs_h264_delete_sei_message(CodedBitstreamFragment *access_unit, 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 */