From patchwork Mon Jul 27 16:32:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21303 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 C296044A99C for ; Mon, 27 Jul 2020 19:35:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A639468B95B; Mon, 27 Jul 2020 19:33:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EC3068B923 for ; Mon, 27 Jul 2020 19:33:02 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id 3so8470835wmi.1 for ; Mon, 27 Jul 2020 09:33:02 -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=NJutcFYHQZcuwEuFjextxOqe9VgzkmBGv6NZzdAnQJM=; b=DRzs3286tbm3Ar6GU9TT5vdpA/fBVBThddxz3Nrly66d0/Lwdgzii0kQMzUTTt/Hpq XTbS42VOUa9Ei9hSU6eXOvmW1YeVEUue8yaqNUpmtoVM4esvqIabY/riHqL7amOnJbmB WIq11ESdh/O35hFnPJhxzvPhBGRVXtatnXeRKAWh7Ezt1HBVuW7i/pjio5NY6ohPXnu2 bP7xnxUDlbW/WFlNPzjQer1A8nD/GbprjpSO80NGnPtG6s4RK0+7k/cT0+ivWjf9/Lm8 +miI5GggC1C/zF8XAgdhpUigYoNuPM4SqNb8yvSaYtsznZDQrI5VbRpWsbxrfVbBGi+M Kh1A== 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=NJutcFYHQZcuwEuFjextxOqe9VgzkmBGv6NZzdAnQJM=; b=Oow41oYb5iQlTru5a2Lf0o3X+86nv8Yx/tkd/j1mnWsnM5uyy3cB7Cvub5xWQT2XHn 5En7RZ4lEab8OWibaYAJUseVJ9LRP4vrmvTQHFidxcQf1NXl34RmneRPIta4UR16UjzN AomeU23wlyyLVX38UcfckZcbG5mHpRT/tyhBeyd/wAIseKN2+UTaC/Fa/tfpG5dAsoSn PaI7hu00zUwqAzaqWq9CUEPum029Z+1NPgh9kbmtFxgsZOFygy4dwgalBMt9nmJRXOQX 9GlroxYVXpt0FkpAvs7NYWZyQJWUMIHD1x0G9Y0dcNytZLLqKct+7nCN5TXWoeDn2YcV INuw== X-Gm-Message-State: AOAM53026OuHBaLpoe6KcAtEaSu04W/Ib8lrozWEMRdNZpjFHjNurWSq XNHHljiSpR/rAn8RC8MStErJl0AIckc= X-Google-Smtp-Source: ABdhPJyyhWd8McVlRZZfuagCMb4quRbCMvXb/kwObJ0EVE4Tx2rJz9OxYuETM1T1EpxdSB9VVkQ+DA== X-Received: by 2002:a1c:5f44:: with SMTP id t65mr89204wmb.99.1595867581484; Mon, 27 Jul 2020 09:33:01 -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.33.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 09:33:00 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jul 2020 17:32:33 +0100 Message-Id: <20200727163237.23371-19-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 18/22] vaapi_encode_h264: Support stereo 3D metadata 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" Insert frame packing arrangement messages into the stream when input frames have associated stereo 3D side-data. --- doc/encoders.texi | 3 +++ libavcodec/vaapi_encode.h | 1 + libavcodec/vaapi_encode_h264.c | 24 +++++++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index ed8ef63784..32870f5939 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3175,6 +3175,9 @@ Include picture timing parameters (@emph{buffering_period} and @emph{pic_timing} messages). @item recovery_point Include recovery points where appropriate (@emph{recovery_point} messages). +@item frame_packing +Include stereo 3D metadata if the input frames have it +(@emph{frame_packing_arrangement} messages). @end table @end table diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 3bb240ec68..671b21f283 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -483,6 +483,7 @@ enum { SEI_RECOVERY_POINT = 0x04, SEI_MASTERING_DISPLAY = 0x08, SEI_CONTENT_LIGHT_LEVEL = 0x10, + SEI_FRAME_PACKING = 0x20, }; diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 62f95ea59f..f6d16b5c24 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -25,6 +25,7 @@ #include "libavutil/common.h" #include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavutil/stereo3d.h" #include "avcodec.h" #include "cbs.h" @@ -90,6 +91,7 @@ typedef struct VAAPIEncodeH264Context { H264RawSEIBufferingPeriod sei_buffering_period; H264RawSEIPicTiming sei_pic_timing; H264RawSEIRecoveryPoint sei_recovery_point; + H264RawSEIFramePackingArrangement sei_frame_packing; H264RawSEIUserDataUnregistered sei_identifier; char *sei_identifier_string; @@ -244,6 +246,12 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, sei->payload[i].payload.recovery_point = priv->sei_recovery_point; ++i; } + if (priv->sei_needed & SEI_FRAME_PACKING) { + sei->payload[i].payload_type = H264_SEI_TYPE_FRAME_PACKING; + sei->payload[i].payload.frame_packing_arrangement = + priv->sei_frame_packing; + ++i; + } sei->payload_count = i; av_assert0(sei->payload_count > 0); @@ -693,6 +701,17 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->sei_needed |= SEI_RECOVERY_POINT; } + if (priv->sei & SEI_FRAME_PACKING) { + AVFrameSideData *sd = av_frame_get_side_data(pic->input_image, + AV_FRAME_DATA_STEREO3D); + if (sd) { + ff_cbs_h264_fill_sei_frame_packing_arrangement( + &priv->sei_frame_packing, (const AVStereo3D*)sd->data); + + priv->sei_needed |= SEI_FRAME_PACKING; + } + } + vpic->CurrPic = (VAPictureH264) { .picture_id = pic->recon_surface, .frame_idx = hpic->frame_num, @@ -1264,7 +1283,7 @@ static const AVOption vaapi_encode_h264_options[] = { { "sei", "Set SEI to include", OFFSET(sei), AV_OPT_TYPE_FLAGS, - { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT }, + { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT | SEI_FRAME_PACKING }, 0, INT_MAX, FLAGS, "sei" }, { "identifier", "Include encoder version identifier", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_IDENTIFIER }, @@ -1275,6 +1294,9 @@ static const AVOption vaapi_encode_h264_options[] = { { "recovery_point", "Include recovery points where appropriate", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_RECOVERY_POINT }, INT_MIN, INT_MAX, FLAGS, "sei" }, + { "frame_packing", "Include frame packing arrangement for stereo 3D", + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_FRAME_PACKING }, + INT_MIN, INT_MAX, FLAGS, "sei" }, { "profile", "Set profile (profile_idc and constraint_set*_flag)", OFFSET(profile), AV_OPT_TYPE_INT,