From patchwork Wed Oct 2 23:04:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 15487 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 5FE0244A2B6 for ; Thu, 3 Oct 2019 02:13:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49B61688147; Thu, 3 Oct 2019 02:13:13 +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 5A473688151 for ; Thu, 3 Oct 2019 02:13:07 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id o18so750240wrv.13 for ; Wed, 02 Oct 2019 16:13:07 -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=bOnHFDoqkJierYFg2SgjZbuQaWBy0ROULjAy/fKNR9U=; b=pjKMTTwpLN2EN6pL+EplCT5feKdps2mMB8fK4MxYHD7rWrLgGFe6VKgOTPSMurmr4E hcJfglgxLlHAW/xNFFbEXLVWJFiADaqFnSRykVnq8sZNVGImbdyFhew944+fyJRaY10t XoRVOiUxcifP0f4Ab4Ff3VkzLnZVrxCWgdroOr7VsgsjkJhgHLu8oZ6qdB2c0jDkhr6W ZBu3BM7hAVFN59m5xoLbcua3/P5Gq2EmpXq35mfYsnZNOywM4JEp8lpTRxijHhhAXsb+ UGO2SgazH075AIXnE/W3qlef6ac5aeZ5w3G4Nv+Ea3G8UvLHqT9YzZI/bO0fNZc+G4H6 i+/w== 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=bOnHFDoqkJierYFg2SgjZbuQaWBy0ROULjAy/fKNR9U=; b=V1hvx4O6qsEvn0JZzlQXHlla+llJ3LNFs+vCmz1QBdnST8DcPRWzLmH8WgXJjznBHe KMwQrEwwIdT4dOQwJIOMsGnVu9xecmed7QPYZVmWSqkWtaeerJrsjYBwlJAcGojoR5xl w+q5KBvljzo7b8Fr4Q2/Y7ZqSud3t3y4K6IFNl4xn3mZUluDc8NTvpXZQRf7BXRgultM GP1neE5Nup9OAJBSp0VuSlPMf1piBhZ0JpWP8uMEpsydr1X0Y1aSTk0XkXVC96mBk+Ta hlmKP+idQvcSjoZlVPEN31Y66G8p+GAkDBXdaIJhUcponquMk4h0nmqH6v3dIZ//aCjo sTug== X-Gm-Message-State: APjAAAUCLvGkVZNKC0I3XssVPqIzHb6jNzkaTO7zV2Gkr4O4DMAvMHNB CAKyLaVVLV1u2q25yxEZ3ZsoiqW0F24= X-Google-Smtp-Source: APXvYqwT1QUOX3Oglm2JuR31e6wJ+Dqg7dMdDJbsF51kkXKmdIbCV42acEaoDd80vyO4SCptUFv3qw== X-Received: by 2002:adf:b1da:: with SMTP id r26mr4445432wra.244.1570057511125; Wed, 02 Oct 2019 16:05:11 -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.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2019 16:05:10 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2019 00:04:51 +0100 Message-Id: <20191002230453.6462-16-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 16/18] 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. --- This was requested recently on ffmpeg-user - . Easy to add, so here you go. Output matches that produced by libx264 in the cases I could test. libavcodec/vaapi_encode_h264.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) 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,