From patchwork Thu Aug 1 19:42:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14182 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 A5423449EFF for ; Thu, 1 Aug 2019 22:49:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76AF668AB8D; Thu, 1 Aug 2019 22:49:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D87468A8CA for ; Thu, 1 Aug 2019 22:49:04 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id w79so54971688oif.10 for ; Thu, 01 Aug 2019 12:49:04 -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=B9XKWXLcg5qe0XsMhKjwEfcBup8Mj1uYWf8Olqbbkl4=; b=uOLFzoC2NYRwF6nPotSmeoLQiXTGZP9QJq5bX9KUzZ9lFdN2wLFfJAkOtgZ2dFXCmj ttE0KjcZiqSI2jcQN3iWzCkKJ4a85T3w7kN6bl9A0oixyOHiXK/aZkFldGGRO97k0g++ kSwJ6CvkT630XTVJlPFtHqqbMt3Ze5BwBkb8P9ODtVcl2Ji2Nv7kUXtstlkstbs0w0l4 v5HulpNlNrmdA4uktr8S7tGOCwtnc2x1F2ce88Mf2WJ4ChQbUN8WiEMdu/m1KIt5RuMg bCf/+5SsMp67wc6nfOyqZmQjOW5aHTcjCD89wQJ3GuBjt9XwMly4/SoEr8sV+2wbt9cU 104A== 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=B9XKWXLcg5qe0XsMhKjwEfcBup8Mj1uYWf8Olqbbkl4=; b=N3NHmata17NC2zxXfcpRV/g2fgc6DSha+VA5dee7396RpwRm+PqekjGiO6CCSSsGwh imd1Y4iBO3qO6YiKqqPrQ1e/EJYbpaofRCQKNdkHalHdKIzrGhuswtvAL/U4Nj2usTBS tEssayIOqxLTmGLEX2Cl/Htwb6nErntOeT+klkNAMzNAgDeR+RF5bxafLnOhPZW99LkL kk9yqSFd1t8akEYTMhZ3ZtD0izFg8Qe/xIZuzDKUgfItFez7Qor1PGHxQMcQ4jO9nSfD vlhrFhTaEToctL52/pStKe7KWON9Oqo47yAxTf9jtKGiwXOpVVInu01TS8mJbjZPmiRH lktg== X-Gm-Message-State: APjAAAWSddq4b00aHTMVx/96HYKV1mdvEDvzH2u8B3JjLd1nSSE27e5z e3zSe5wIGjySULzaKabvwmfssb+XWR0= X-Google-Smtp-Source: APXvYqxOsWT/FHbB4FpDNOHHo/JUyaSxpit0mXPm5ux5c6D/NTSdIKTZE1ou6GEKTcxtOMxY2ISFmA== X-Received: by 2002:aca:b2d5:: with SMTP id b204mr264009oif.101.1564688589349; Thu, 01 Aug 2019 12:43:09 -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 z26sm29044144ote.40.2019.08.01.12.43.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Aug 2019 12:43:08 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Aug 2019 12:42:59 -0700 Message-Id: <20190801194259.52199-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index f4965d8b09..f66e483b7f 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. @@ -96,6 +97,7 @@ typedef struct VAAPIEncodeH264Context { H264RawSEIBufferingPeriod sei_buffering_period; H264RawSEIPicTiming sei_pic_timing; H264RawSEIRecoveryPoint sei_recovery_point; + H264RawSEIUserDataRegistered sei_a53_cc; H264RawSEIUserDataUnregistered sei_identifier; char *sei_identifier_string; @@ -251,6 +253,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_a53_cc; + ++i; + } sei->payload_count = i; av_assert0(sei->payload_count > 0); @@ -626,7 +633,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; + AVFrameSideData *side_data = NULL; + int i, err; if (pic->type == PICTURE_TYPE_IDR) { av_assert0(pic->display_order == pic->encode_order); @@ -700,6 +708,27 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->sei_needed |= SEI_RECOVERY_POINT; } + side_data = av_frame_get_side_data(pic->input_image, AV_FRAME_DATA_A53_CC); + if (side_data && side_data->size) { + priv->sei_a53_cc.itu_t_t35_country_code = 181; + priv->sei_a53_cc.data_length = side_data->size + 9; + err = av_reallocp(&priv->sei_a53_cc.data, priv->sei_a53_cc.data_length); + if (err < 0) + return err; + priv->sei_a53_cc.data[0] = 0; + priv->sei_a53_cc.data[1] = 49; + priv->sei_a53_cc.data[2] = 'G'; + priv->sei_a53_cc.data[3] = 'A'; + priv->sei_a53_cc.data[4] = '9'; + priv->sei_a53_cc.data[5] = '4'; + priv->sei_a53_cc.data[6] = 3; + priv->sei_a53_cc.data[7] = 0xc0 | (side_data->size/3); + priv->sei_a53_cc.data[8] = 255; + memcpy(priv->sei_a53_cc.data+9, side_data->data, side_data->size); + + priv->sei_needed |= SEI_A53_CC; + } + vpic->CurrPic = (VAPictureH264) { .picture_id = pic->recon_surface, .frame_idx = hpic->frame_num, @@ -1245,6 +1274,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_a53_cc.data); return ff_vaapi_encode_close(avctx); }