From patchwork Wed Oct 2 23:04:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 15488 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 4A7AC44A2B6 for ; Thu, 3 Oct 2019 02:13:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30275688288; Thu, 3 Oct 2019 02:13:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 012456881FA for ; Thu, 3 Oct 2019 02:13:12 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id v8so824050wrt.2 for ; Wed, 02 Oct 2019 16:13:12 -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=uihBikCL99UrJEhgITGR/aGMrvtpnWXvBEVvCNA7LxE=; b=XgABsIoh6jOduQ2Exi7YKbF8dcvN7aniWB6VxCd2MMK70ukH880yj2Sq/neG1Gt4Lx JQ3br3m5iSJaNy+AwJUYRXOO5UgKnb2DowYW/XAGr9aXAcEzw+2nAqSwknQtbUahIN1I lPl8KZ0cWodhe8Q9rR0uB+fPm97vNZxJE8Hm/y9tEcoU0xNKbQIQrA+ZO5RX5zRrqfli /fNjZrNAKw7DV6a8gXx5p1sS0VRcAF2+vXM1/C9X1hscjRLJkPpzDXqhSejC9q51D6YI xZEStKWozrWn73nqVu4JdleDeDAlxa6rxgne+SNYZ9z1i7ouGKHIdTPHjS7nKiOA2Oay Ay9Q== 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=uihBikCL99UrJEhgITGR/aGMrvtpnWXvBEVvCNA7LxE=; b=LGuHuKoP2bqWu1xkEUJFCn8l+U1d5fNnZXs323P9vaw5+yscigMEvSxuCGkrID9TOi cxpUfYosIGPxqSm7kMuFcUdNN1Jo9RbOJc7TL08nAfnViyYY2ci0GANnuUx8UI1kce5U Tn7fkI3jkk9Hq2d8RqnUwpLQ4JIqvz42ZcW01oREFMC0k4gjvAXz6XFM9At0VACMobfz BNjnsc/q87hJ51XkhzaReFjMR+X8HOYRMXlb51llWRvCZQZSSAsNAmyaGaXs9qUhpDmm pdeBwVhSBIJUz2LCTI2bRw0I7ZnH0JuHcbhkU0xKbCIY3+nPucpqHv38UA2PM9OhOSnN 5ALw== X-Gm-Message-State: APjAAAWbIvtNNv5c71Nyyukej5RSTf3fg+ij6KNe2xTa+o3mqmTOtE9U TamLXWvQbJ1ppKw368hSedJRf/BMDnk= X-Google-Smtp-Source: APXvYqzvkUnDSomISJHTM1le3Dk9AMUMmkxmWajrPg1YI4ppQ2OvhFnwr9CgxQxCxDU7EuqbwPq8vQ== X-Received: by 2002:a5d:6108:: with SMTP id v8mr4390108wrt.28.1570057510250; Wed, 02 Oct 2019 16:05:10 -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 o9sm1489808wrh.46.2019.10.02.16.05.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2019 16:05:09 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2019 00:04:50 +0100 Message-Id: <20191002230453.6462-15-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191002230453.6462-1-sw@jkqxz.net> References: <20191002230453.6462-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/18] 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 */