From patchwork Tue Aug 6 22:18:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14280 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 6850F449DFF for ; Wed, 7 Aug 2019 01:42:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4201268A6A0; Wed, 7 Aug 2019 01:42:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f193.google.com (mail-vk1-f193.google.com [209.85.221.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38B07680409 for ; Wed, 7 Aug 2019 01:41:54 +0300 (EEST) Received: by mail-vk1-f193.google.com with SMTP id b64so17665300vke.13 for ; Tue, 06 Aug 2019 15:41:54 -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:mime-version :content-transfer-encoding; bh=54yQBZ1eqoZIoBZkO/lOh6LIJ5Kd8O5rLqK9lPkfsu0=; b=ioIjYH5Hc17+0Oor2a7ZKTxLspobpsfp7k9RMMid03AVOmgrFw3gTATkZ+l54kYYs4 WGvhGlb0fBBWbNX+5nFE/i96BWs/kiFuUZ7IPegmqi0ZTdbm6DwNlHXnVALFwRH4KJ1+ Vqb6vLfC+ouCNAOKS6644j/O7ZP8gtbX2/ow6T7xnIfABzQg2eSzhG+ad++92zSrGmFI IVjVKi4ESl/vxwyfyHtKmElkjY55jWl9GexrNjC4o4vLTdGXFOkWweecu7RNkXxwvVTq XSW9bsrsBmzEtWvoj538B6yujzvAQMkJrc7G8prlkqg2cMAnPHpVekIwpagEwW8pjC9z ks1g== 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 :mime-version:content-transfer-encoding; bh=54yQBZ1eqoZIoBZkO/lOh6LIJ5Kd8O5rLqK9lPkfsu0=; b=AE4cl/PoCb7/EN7EvjeLoE749sFfA2f6FMfW8aeCpkWgMkVa9NI5CB3RP8dxzg5pmX kxFkpV84k0h7+tmlCwA7WdmNd7sQaBbIFWTg/WSpjMSLd/mEJWFFkVolKY8GKqLbHyw0 YynqMZMJOqVUxrLzCdUz2cTTydM18g2xPKEAbZXLG6YHo0jh5gSUJOxTxwsz+pzu6fM2 QeTwpBqn7iufHv5dEJtz5kE3Adj+94HFGR2aEpvkNpJOtow6ZkT4MM3Y1SHMfM53E4XV r3zQk+1Qgd89aFjuNENkzGYVYQEvV7X8qbiwiiVw5G+sRShzXf0c9klR8QL2+WuYgUPm 8TPQ== X-Gm-Message-State: APjAAAUZdBA4VDLCQwbQji4XicEkZbQ/1c5aw74adPi1gTStBhra5i71 ZFnDvoxUdaWOfbxaN7M2UtiBz3N1QGI= X-Google-Smtp-Source: APXvYqyjYyF2cwYXkQOSbFQ8yaiJMN22uoZ7am9YvrLtgJhYaZFJhvrqDe0v+TNi23L7Rj9xgcVvww== X-Received: by 2002:aca:5106:: with SMTP id f6mr3328876oib.69.1565129885172; Tue, 06 Aug 2019 15:18:05 -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 a18sm28869393otf.67.2019.08.06.15.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Aug 2019 15:18:04 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Aug 2019 15:18:01 -0700 Message-Id: <20190806221801.2423-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4] 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 , "Fu, Linjie" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavcodec/vaapi_encode_h264.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index f4965d8b09..f3da3ee299 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. @@ -72,6 +73,7 @@ typedef struct VAAPIEncodeH264Context { int sei; int profile; int level; + int enable_a53_cc; // Derived settings. int mb_width; @@ -98,6 +100,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 +255,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 +635,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 +710,21 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->sei_needed |= SEI_RECOVERY_POINT; } + if (priv->enable_a53_cc) { + 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) { + 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 +1270,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); } @@ -1321,6 +1347,8 @@ static const AVOption vaapi_encode_h264_options[] = { { LEVEL("6.2", 62) }, #undef LEVEL + { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(enable_a53_cc), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS }, + { NULL }, };