From patchwork Sun May 3 22:05:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 19468 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 3BC9244B916 for ; Mon, 4 May 2020 01:06:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EB4E68C1EF; Mon, 4 May 2020 01:06:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E03E968C0BC for ; Mon, 4 May 2020 01:06:06 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id g12so6671137wmh.3 for ; Sun, 03 May 2020 15:06:06 -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=UFQjzdiR1BEz4tIIQ+uYm6HH9ChV1Z56s/FmvK5DD40=; b=wfqK8PA1VnN5liwyOL3a7fVYwF4vHsGJrLkdd7qIfKazwVmnXhR++Fx+QUofxf80Nx IvDyIJZBvsEgy2moSfGZWy6HmL1y+pGYd77TNjMRtqiVtwxIcr1sQyEj52TLVyE41S0f xMOagw35+qAjzZrCHTYUJrVIc4yKWRH2wdOx+05/OCCWzpXfiPBe3tMd8MCU0cN1fw9t kOtJ1pOdmdUs1Hbx0mH2Vpmb2KTXJq3wqfI51eT6rM+CH3QzH5DZIBkMqsA211r67Ynu 118f5VR4n6oLajGPGrM2zXoTOV+g2PP1JT3HM620vpLvFAd0/6zEDlryZYb2vH6xLiTl QlZg== 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=UFQjzdiR1BEz4tIIQ+uYm6HH9ChV1Z56s/FmvK5DD40=; b=EdTEpCBMK+06oCpLSPeOrPgvzwGVZQiI7LB/JAF+mYj+WO5wvK6S/OEOW66H3V/AQ3 LGQWilvPqavXjr8xeG1dpp6Ypyjw7MlJL0/dIDjHrkNWKjUGnRL5MsUyMS8XL3htaEBG notzA/H5obYxeRbQvIu5lWCpYsJ6Oe/0VLFsGxGndg87BDvWOWSpemDtFFRK4hEGXM9M SJHEe8I3/YR5t2+jcZQM6yW07EaYrJJ8I7Xoruay4LqXkF9h3Y5ZdEnpEu6MR/F191Lm ogHmjZK9dzhCyH3NXWzi3+rW77h/yc4BQSpmmxh06aEsEssrDTE2xQfbIHsUOxMhQ+5j 12KQ== X-Gm-Message-State: AGi0PubBNja3WnqwvYcahn43NDM0Tpq5cZi5HTJSIwLofFUqPE1vrxPs Jb0G2+HDQ5YvD2h0XOGX+xLvziSgJUs= X-Google-Smtp-Source: APiQypI9gQhBC87UbjsmQrrMql4R72JWxy4ocaLR1tYX8G7wHoT7C6XIpGiU+ozUyG7kHwD+yK4tSA== X-Received: by 2002:a1c:3c54:: with SMTP id j81mr10793663wma.140.1588543565908; Sun, 03 May 2020 15:06:05 -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 a24sm10307285wmb.24.2020.05.03.15.06.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 15:06:05 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 May 2020 23:05:42 +0100 Message-Id: <20200503220548.23543-16-sw@jkqxz.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200503220548.23543-1-sw@jkqxz.net> References: <20200503220548.23543-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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 75759c7f25..096949e67b 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 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 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 */