From patchwork Thu Aug 1 23:33:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14189 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 56798447E95 for ; Fri, 2 Aug 2019 02:38:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30C6168AAC6; Fri, 2 Aug 2019 02:38:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA43568AA9A for ; Fri, 2 Aug 2019 02:38:49 +0300 (EEST) Received: by mail-ot1-f67.google.com with SMTP id r21so70197672otq.6 for ; Thu, 01 Aug 2019 16:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1qsGgLkLOE0uDBVFuKcoAqqXXKKsHqlF5hzZtapu6P8=; b=g394u7kIFKLQYsCmD5m+AGb2+8G6QAhInNuEISa2NZTUNOgzSXkPDdF4WxWjObaZNY 4j6DiNW+Lz4DhlFu/OXCbp1pzGPc5+3N3SEFn3BAaZAUBmojtNC2wDhmEDs9M3HX/EKz PCGaFS2ciwbSlYSlha161j99gNdb+dZEP/phMxfnBCwBlmi65OWQb1GSKdhT0/dCIXD4 +1MmGKHPkA8z9Z2a+LPVR1cOVdW3ynZSo3+IU9fwriU+umyeGfasOrira+rtwDvzkaus YC54z3ojlzK+1MlSJ+pwUaMA2ZEEhWTVlU3kOxFm2jN9pMlTrOFD7d1qMqfMdLJcsri4 RAUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1qsGgLkLOE0uDBVFuKcoAqqXXKKsHqlF5hzZtapu6P8=; b=cGysWJN96fFPpF1cZe9QYhShNrB1vIbPEv0j+Di84iFzSQez8GZjPvX1XRc4N06EwS FNTs+FaQto9P9WVL0sO0rV9edxwy4tDZ5crFb0bJksSiN3hh9wpyvjxLypvUSKMXc9Eh mSNgTxScNxVNMCqZuc+3TPo0DWgDSVtsav3FdT6w+QMwwzYzh01k07UxJikBbwBK1zHQ mG23dE3CzBkhE+NLBZWUr6pE48mrTJbQApBRVFdwruYkcuLyKLzHmexPsQvb8Foj53Ih OHYwC/rNKWPp8xfR/XR5+OyxfMAIH8AHJNNXAc1otWZfDmdh8SFtYu0bx+Ckffui6vxq 1Ifg== X-Gm-Message-State: APjAAAXJ1fjMlZ3tsBPHLVTHsONCEYbIPVwTeg6Ph6cte/BX0pxAmvgQ bPleJ85hRCuZMZRHfCcsSvm/z68z X-Google-Smtp-Source: APXvYqy6qLpnbUvUtb69N5B7/FuZyPK+0LFF5bQ/5dmRtgutOQbVSMp4jSv5zIDyGax/0z7Qmhghlg== X-Received: by 2002:a9d:66c8:: with SMTP id t8mr5146058otm.94.1564702403945; Thu, 01 Aug 2019 16:33:23 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id q20sm24635652otm.32.2019.08.01.16.33.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Aug 2019 16:33:22 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2019 16:33:17 -0700 Message-Id: <20190801233317.58567-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190801194259.52199-1-ffmpeg@tmm1.net> References: <20190801194259.52199-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/vaapi_encode_h264: add support for a/53 closed caption 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 Cc: Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavcodec/vaapi_encode_h264.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index f4965d8b09..9860bacb91 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -39,6 +39,7 @@ enum { SEI_TIMING = 0x01, SEI_IDENTIFIER = 0x02, SEI_RECOVERY_POINT = 0x04, + SEI_A53_CC = 0x08, }; // Random (version 4) ISO 11578 UUID. @@ -98,6 +99,8 @@ typedef struct VAAPIEncodeH264Context { H264RawSEIRecoveryPoint sei_recovery_point; H264RawSEIUserDataUnregistered sei_identifier; char *sei_identifier_string; + H264RawSEIUserDataRegistered sei_a53cc; + void *sei_a53cc_data; int aud_needed; int sei_needed; @@ -251,6 +254,11 @@ 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_A53_CC) { + sei->payload[i].payload_type = H264_SEI_TYPE_USER_DATA_REGISTERED; + sei->payload[i].payload.user_data_registered = priv->sei_a53cc; + ++i; + } sei->payload_count = i; av_assert0(sei->payload_count > 0); @@ -626,7 +634,8 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, VAAPIEncodePicture *prev = pic->prev; VAAPIEncodeH264Picture *hprev = prev ? prev->priv_data : NULL; VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params; - int i; + int i, err; + size_t sei_a53cc_len; if (pic->type == PICTURE_TYPE_IDR) { av_assert0(pic->display_order == pic->encode_order); @@ -700,6 +709,18 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->sei_needed |= SEI_RECOVERY_POINT; } + av_freep(&priv->sei_a53cc_data); + err = ff_alloc_a53_sei(pic->input_image, 0, &priv->sei_a53cc_data, &sei_a53cc_len); + if (err < 0) + return err; + if (priv->sei_a53cc_data != NULL) { + priv->sei_a53cc.itu_t_t35_country_code = 181; + priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1; + priv->sei_a53cc.data_length = sei_a53cc_len - 1; + + priv->sei_needed |= SEI_A53_CC; + } + vpic->CurrPic = (VAPictureH264) { .picture_id = pic->recon_surface, .frame_idx = hpic->frame_num, @@ -1245,6 +1266,7 @@ static av_cold int vaapi_encode_h264_close(AVCodecContext *avctx) ff_cbs_fragment_free(priv->cbc, &priv->current_access_unit); ff_cbs_close(&priv->cbc); av_freep(&priv->sei_identifier_string); + av_freep(&priv->sei_a53cc_data); return ff_vaapi_encode_close(avctx); }