From patchwork Sun Feb 23 23:41:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 17897 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp2175056qvb; Sun, 23 Feb 2020 15:50:35 -0800 (PST) X-Google-Smtp-Source: APXvYqxHdZ6aQOtOIHd3IEZM9JuFyZwp6Je1c6JHoo6rM1Wf07N+TBf0dpiXr7Kc+5yH3RX1pgsi X-Received: by 2002:a05:6402:744:: with SMTP id p4mr27296863edy.104.1582501835231; Sun, 23 Feb 2020 15:50:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582501835; cv=none; d=google.com; s=arc-20160816; b=KMEA48X+djE2kczLJDxA3SGJYczIABqt1ikd4HWWXYE4p27cFWKzCADK4poNf1+/Mm weEKJTat+J3a2bY7Q29axheb195HxIK49kDz1tqIYjW5O67pIgFMvYtdiqZNLcOAudtm miCuUu4eoCJeOW9c9XbCHES49kSeMROm3kSA+6+H7//50JCDoyqPN8tHRJ9zPaenO3w8 ezR9rcPfeiP4ghPRClvWUbywq1IyCSvxsKwhYNXwPZNG62M3puIuXyRP9c/2vmSYnv+h aWOW6AwuuNVP4zkeDrwgQSxfxcLsp7J31QYoW54GYuxHH/KFjI46sw6mrs+YOo3AF95r rIiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=r1+o0PjHu11fS1abkOu6reQY3gcfkTHIdJPlDjvOX0o=; b=LJ95uHeFSfVWArZsAocclI8v/jMYwjMgnkCUa4EMxs1Zp2c7aQZI3QpTeOqAhNywUR DRdasBzuQCQ9S89FtApcNVUPl66zT/CO7wsp0hDjjs6vgHCVUy06NU4fA28vuGCl+K1l RAu2RdriA1ipKp4UcFyjWXsyVoc6Zw/hctDnQT4LvyEU9c6Hp08yvjvPgVFGzcyhI8OS pAC5nsru5COpkSBq86+RMEUW80dxx/CoqcofQsmQX25PqhTTBuMnLhSO/ra2d/TcccpW MrHOM+Ui89lfFYwAH0JdWx0mHRIvGZ5l/2Abh9TQudB9HsHBN4YLl+xHL1QwgthTLVMA ZluA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=DIbQgaYz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 10si5885816ejo.50.2020.02.23.15.50.34; Sun, 23 Feb 2020 15:50:35 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=DIbQgaYz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 537A668B569; Mon, 24 Feb 2020 01:50:04 +0200 (EET) 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 D7B4768B53B for ; Mon, 24 Feb 2020 01:50:02 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id m10so9485082wmc.0 for ; Sun, 23 Feb 2020 15:50: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=HF4AAmE9RVcIyYnBhZKqR5HQct8iO0B+N2656ELW8cU=; b=DIbQgaYzokpY6Hf2ERdS69nFT/jv12MUOLeQXkbGM4THlWwYWJtOQvfFslEVyJaEKA +GpwFnrI8PWDOosMcUppT4BA9chFsTPo59NpeVZ8NbdLHYNRSk554/x5xTpaotcsvqKs XOgdv8blw6KsE3TbyoqYTr39K6ZmrskscRLe+Hw0DmF7czIKHQn7CPCw7rca9hAF+s8e d9W4FY+KzBHe+N5TJRqjIW3vQsSoq2mSK7AOjVlwHpDKFG19KEPPV7rPF0RpvLW0P9Xz klx8OgFdy2S5x1Rj869PCCGOgfwzg0fOKbiqcaI3VBUvOuTH/knhdMF0E9Ng8uUHmQ3f g1aw== 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=HF4AAmE9RVcIyYnBhZKqR5HQct8iO0B+N2656ELW8cU=; b=ZlvCfiqVbWtpYKCtmUGSWauXpbGlCSWP8FB0P9cDdMRsy2+jasQLPan5l6HVo24T76 P+fERAZCkf6c16T306Z5ETK3bjfjZZVduHE+Y6+WfD31Iv9zIevPnmt2yxgmrgc4fnWp k5HPzAPrV8mzFDc+jo4kTvycGpBGCG4FI4XuBtvqc/NN7CiaQJb7OrBITwqEoylGwmrB QkFxpoXdOXSiEC0nuIMcNBZSJQVG9qM1v4SNpAtl5MAaQH/o7r6ppDhsbG936mwCecgJ UCzzZq9uLa3/AHhzzQPj+giexlyFWhgeZ6cLEIecajzCZjteddA0UCek8+4MaOyPMBBr UVwg== X-Gm-Message-State: APjAAAVpg9LUSGev7R/wLmG0uHqiajE14o/J62mDYDkLZuvE/tWwzbSg 8SOy2pphKQCyzhyDhIiNsSsOwoc7iKw= X-Received: by 2002:a1c:1dc7:: with SMTP id d190mr18544183wmd.48.1582501308965; 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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2020 15:41:48 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2020 23:41:20 +0000 Message-Id: <20200223234124.17689-17-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 17/21] 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" X-TUID: hHoApfPiwWwQ Content-Length: 5735 Insert frame packing arrangement messages into the stream when input frames have associated stereo 3D side-data. --- doc/encoders.texi | 3 +++ libavcodec/vaapi_encode_h264.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index e23b6b32fe..62b6902197 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3065,6 +3065,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_h264.c b/libavcodec/vaapi_encode_h264.c index f4965d8b09..58eae613c4 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" @@ -39,6 +40,7 @@ enum { SEI_TIMING = 0x01, SEI_IDENTIFIER = 0x02, SEI_RECOVERY_POINT = 0x04, + SEI_FRAME_PACKING = 0x20, }; // Random (version 4) ISO 11578 UUID. @@ -96,6 +98,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; @@ -251,6 +254,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); @@ -700,6 +709,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, @@ -1271,7 +1291,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 }, @@ -1282,6 +1302,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,