From patchwork Sun Oct 8 20:01:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5478 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1906659jah; Sun, 8 Oct 2017 13:04:41 -0700 (PDT) X-Received: by 10.28.141.1 with SMTP id p1mr5824105wmd.68.1507493081307; Sun, 08 Oct 2017 13:04:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507493081; cv=none; d=google.com; s=arc-20160816; b=DM4PaqMbDxvHNfrc2VLbXyP0W3hc41p9rU7ECrCgqpSF1+JOiHeHTJkqhRnIfFSWBH xTWB44Mpgv3HI71yShHM1v9T20458lhVExMPcM9SFfcijRSoBOpoHvJuZUyUMl24mhPT xHy8EfVyNJGnXzboXfodgzMRM4z/P7wH5pEkDRGMzPoM4UHyc3grZtviIP53kBjAe919 s8Ysva3SOLnJLNBf8YMEIfkNbZcKaB8PC+lZzm991vvEI91IsEV8wuGUydUY9qb1+OQB jjkVGLabjqTJdMxCzDvkql75fyfdKZcgeO+ECWkRskzPlt1aGuUAIHuDP2+lJbkVCLz2 gqCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=xO9NR+7FmUE6DERSyzHc7rcYtZ4JIHI9jSBdoxy6pQ4=; b=rvsmbbrQGUik4K7dSzeLZiA4SRcGc/MML1Um4Z9uGtzYvP+NetvkU7QPsEj17VyZAV YC2m2YXSryKa79/5cDfQ799DOgRdmsbq4xF3xTODzN6R+mBgBN0vQ85rbY7Gbqvxai18 yH1xIS5s/mskGHSzms4A9bmrDhh8uPXUqmTHZyYJJdhVV9ZSBWXLufB0mDxXegO1gWxs +66e6l5idaqyoECVvJ+MIG0A5WlMpq7FD8Z+GJjsTw77GbUNg3R/rBTqylCtqprAqcuS mrJGQtXtZrN/k9jUW/u9ZOuQ543H3CwsUisNU8gfPq6XJMwF6HqsjpYx1t4u/Ma7ioZd JOmw== 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=ICcLDtT3; 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 l5si5256054wml.80.2017.10.08.13.04.40; Sun, 08 Oct 2017 13:04:41 -0700 (PDT) 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=ICcLDtT3; 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 8C798689E84; Sun, 8 Oct 2017 23:02:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D97AA689E46 for ; Sun, 8 Oct 2017 23:02:11 +0300 (EEST) Received: by mail-wm0-f42.google.com with SMTP id u138so18533088wmu.4 for ; Sun, 08 Oct 2017 13:02:13 -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; bh=3QyFt99WyJ/MbHlNdXxtmGDZGqjcqKenARJgdhAzzzs=; b=ICcLDtT3+R/CHqMWqkTMFeNfRwjdTIAN2ShUxTG1VhifGhLyCPhAWYKQ0mKhosMGJI I/YtEUvUlkYBUYP/+CQJUOlNPY87EsJNxyx8G5frDBnhk2C1FDLcn2pxHTLCHbO4IMdR lPyQSF7BOlczx6tHjCVtHMs3Y+hQzeT2PK+p8/SY+vBp43nnXKpHm75p0M+qxEo732HC QpIgK+F0oFx4YtyJCHmMsCzJqTTWLArRGoA1ghjTnD+X3a97FTkqVQwX2SIvLdX3cXEk g4eSJa9qx+C5R0nS4WjdjW8KQFph8kD7klZEtOs23Q5YeyZ7l2xNQwBzhDb6Z/t/BZVv 19Ug== 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; bh=3QyFt99WyJ/MbHlNdXxtmGDZGqjcqKenARJgdhAzzzs=; b=ofIptlm25hNRheAYrFLWKOMB+wQtXv7G+WgLcxmLVLCkk1oIoouszSYxhNShQlyKtl yS/Q01wVOOAat5nwj5ds8BlfCyJ5M7HH4gM4F+fSNcu9AmguDj5ygIHHpcd7T+7H3X0e JENAIrcHAHqJyI10s289CCXBJUKm2A8dHX6bucAcG3L4AQ0gv9NIpG9pigV2EysRENHw LXUtRo5vBalmeOsW8bY+QxYUw8iL5NEpZOjuTYD7tMxUSZ5BQAc42DKI0zoGzh9g3x2w v5UkusejmLchcUY/88yrHm63qNg1L5QEhVWxc4ojUJO542HxoVPN+tV/fCNbP7tUXZCb 6aNg== X-Gm-Message-State: AMCzsaV09Vf5RAGQVh9kJPEOsYuQcBl8o2+j5XBP+eQveppRI4aMyzSh pwFmIEVcYNxsGfXEIwf7ffahQJHx X-Google-Smtp-Source: AOwi7QCt/O4f1CF/VY+R1YrLDWgjAZdLpAsParjX84uUwLeGpfiTTq6jnatjjc2M9p1MVcJgIQm2QQ== X-Received: by 10.223.161.8 with SMTP id o8mr7311507wro.260.1507492932796; Sun, 08 Oct 2017 13:02:12 -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 x49sm2897856wrb.25.2017.10.08.13.02.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 13:02:12 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Oct 2017 21:01:49 +0100 Message-Id: <20171008200154.4873-16-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171008200154.4873-1-sw@jkqxz.net> References: <20171008200154.4873-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 15/20] vaapi_h264: Add support for SEI recovery points 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Included by default with non-IDR intra frames. (cherry picked from commit a49ee60d5fdbdae1706a44cfbb814abb9793815f) --- libavcodec/vaapi_encode_h264.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 5c043baabb..8ca82df084 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -37,6 +37,7 @@ enum { SEI_TIMING = 0x01, SEI_IDENTIFIER = 0x02, + SEI_RECOVERY_POINT = 0x04, }; // Random (version 4) ISO 11578 UUID. @@ -61,6 +62,7 @@ typedef struct VAAPIEncodeH264Context { H264RawSEIBufferingPeriod buffering_period; H264RawSEIPicTiming pic_timing; + H264RawSEIRecoveryPoint recovery_point; H264RawSEIUserDataUnregistered identifier; char *identifier_string; @@ -232,6 +234,11 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, priv->sei.payload[i].payload.pic_timing = priv->pic_timing; ++i; } + if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { + priv->sei.payload[i].payload_type = H264_SEI_TYPE_RECOVERY_POINT; + priv->sei.payload[i].payload.recovery_point = priv->recovery_point; + ++i; + } priv->sei.payload_count = i; av_assert0(priv->sei.payload_count > 0); @@ -617,6 +624,14 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->sei_needed = 1; } + if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { + priv->recovery_point.recovery_frame_cnt = 0; + priv->recovery_point.exact_match_flag = 1; + priv->recovery_point.broken_link_flag = ctx->b_per_p > 0; + + priv->sei_needed = 1; + } + vpic->CurrPic = (VAPictureH264) { .picture_id = pic->recon_surface, .frame_idx = priv->frame_num, @@ -970,7 +985,7 @@ static const AVOption vaapi_encode_h264_options[] = { { "sei", "Set SEI to include", OFFSET(sei), AV_OPT_TYPE_FLAGS, - { .i64 = SEI_IDENTIFIER | SEI_TIMING }, + { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT }, 0, INT_MAX, FLAGS, "sei" }, { "identifier", "Include encoder version identifier", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_IDENTIFIER }, @@ -978,6 +993,9 @@ static const AVOption vaapi_encode_h264_options[] = { { "timing", "Include timing parameters (buffering_period and pic_timing)", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_TIMING }, INT_MIN, INT_MAX, FLAGS, "sei" }, + { "recovery_point", "Include recovery points where appropriate", + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_RECOVERY_POINT }, + INT_MIN, INT_MAX, FLAGS, "sei" }, { NULL }, };