From patchwork Wed Jun 17 16:07:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20440 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 AC6B244AB10 for ; Wed, 17 Jun 2020 19:07:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99DC168B553; Wed, 17 Jun 2020 19:07:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF0D168B53F for ; Wed, 17 Jun 2020 19:07:23 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id a127so1333636pfa.12 for ; Wed, 17 Jun 2020 09:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KhQjBAuPhEthnL8ifpsTFzZUWSlKn0bMYex0ds8nSJQ=; b=ujy7mWxi5deMyO+hNQdsIEavNulM9qmEn0bv4qUkBh6JPU+I8U6s/XPlvfPCLM84A7 xtOVnq5KuDLF1f6GxLM0M7GsrjmiZm5CKWQDlCpuSx2mOO9jJs0l4s7dM0MRhdYv23wr CXJcjuy9ckOWgHGc/VhOdRZ5e6cNKVNRJaRTZU6svSuWPy5NOwtGZmBPqEa6xB/SMCma /O6KQv3qF0+xqG0it+4eDNEl2Nb5Ngqoy0HddpkZ7xtvTmx2343ykewETvEB+caVqT1X 8R+DsB+3OYvlUcKn7ltlWr53Jt8g0GVgDHBfhvZ24HzyIG+1NX24Dn4gHIQfLdiWFx92 Entg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KhQjBAuPhEthnL8ifpsTFzZUWSlKn0bMYex0ds8nSJQ=; b=m4ah6VyETiHq1bjUsmV7XL/kP3b85B2n/z9VHhgfLf6OPDoqj7ur5zuQdQ85OO7Oug R8e1ctKllJMFSS9JThz0SesttkIVrt4dh0hLf9OBnUEWHl8CaD41QR59Mcmgf8teql8n QN+3BFW0mO0iz+F29bGBaokwAlUa37Ao3zazyvEg9N9c/sSTwC6E9P6fb2ZVvIS5Wat5 qS8tSC19OHuIkdEpSj/OMo6gVFbr35X2ikH5/xoSoa72NLvYkJMnEnNSVSDi8B9o+wcC J9syR9ET3K9IGcTWUweyM+EDee/du9TkxK3vpgS8ipPlrAhaYA7p7hkvAnsZKEHSCBjI dx6w== X-Gm-Message-State: AOAM531HijEwcdY5qKl4XfeoC5h3qhd9MU+bi+I6fPEr5wuGDUfN+/Ge pF4bNl4/j1uSX6a+61Jq0SCM2Ixo X-Google-Smtp-Source: ABdhPJwA83LD9TUuugx06FmAlj5fg9wrxy/byjV8HDtqK4S1gdxLWY6cFvgkRLRNOKQNivWXe5tvug== X-Received: by 2002:a62:196:: with SMTP id 144mr2298482pfb.316.1592410042102; Wed, 17 Jun 2020 09:07:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id g84sm318178pfb.113.2020.06.17.09.07.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2020 09:07:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 00:07:09 +0800 Message-Id: <1592410030-6553-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592410030-6553-1-git-send-email-lance.lmwang@gmail.com> References: <1592231234-6049-1-git-send-email-lance.lmwang@gmail.com> <1592410030-6553-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] avcodec/nvenc: add more sei data support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index e269c71..e4356ce 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1776,7 +1776,8 @@ static int nvenc_upload_frame(AVCodecContext *avctx, const AVFrame *frame, static void nvenc_codec_specific_pic_params(AVCodecContext *avctx, NV_ENC_PIC_PARAMS *params, - NV_ENC_SEI_PAYLOAD *sei_data) + NV_ENC_SEI_PAYLOAD *sei_data, + int sei_count) { NvencContext *ctx = avctx->priv_data; @@ -1786,9 +1787,9 @@ static void nvenc_codec_specific_pic_params(AVCodecContext *avctx, ctx->encode_config.encodeCodecConfig.h264Config.sliceMode; params->codecPicParams.h264PicParams.sliceModeData = ctx->encode_config.encodeCodecConfig.h264Config.sliceModeData; - if (sei_data) { + if (sei_count > 0) { params->codecPicParams.h264PicParams.seiPayloadArray = sei_data; - params->codecPicParams.h264PicParams.seiPayloadArrayCnt = 1; + params->codecPicParams.h264PicParams.seiPayloadArrayCnt = sei_count; } break; @@ -1797,9 +1798,9 @@ static void nvenc_codec_specific_pic_params(AVCodecContext *avctx, ctx->encode_config.encodeCodecConfig.hevcConfig.sliceMode; params->codecPicParams.hevcPicParams.sliceModeData = ctx->encode_config.encodeCodecConfig.hevcConfig.sliceModeData; - if (sei_data) { + if (sei_count > 0) { params->codecPicParams.hevcPicParams.seiPayloadArray = sei_data; - params->codecPicParams.hevcPicParams.seiPayloadArrayCnt = 1; + params->codecPicParams.hevcPicParams.seiPayloadArrayCnt = sei_count; } break; @@ -2072,8 +2073,9 @@ int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) NVENCSTATUS nv_status; NvencSurface *tmp_out_surf, *in_surf; int res, res2; - NV_ENC_SEI_PAYLOAD *sei_data = NULL; - size_t sei_size; + NV_ENC_SEI_PAYLOAD sei_data[8]; + int sei_count = 0; + int i; NvencContext *ctx = avctx->priv_data; NvencDynLoadFunctions *dl_fn = &ctx->nvenc_dload_funcs; @@ -2139,18 +2141,22 @@ int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) pic_params.inputTimeStamp = frame->pts; if (ctx->a53_cc && av_frame_get_side_data(frame, AV_FRAME_DATA_A53_CC)) { - if (ff_alloc_a53_sei(frame, sizeof(NV_ENC_SEI_PAYLOAD), (void**)&sei_data, &sei_size) < 0) { + void *a53_data = NULL; + size_t a53_size = 0; + + if (ff_alloc_a53_sei(frame, 0, (void**)&a53_data, &a53_size) < 0) { av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); } - if (sei_data) { - sei_data->payloadSize = (uint32_t)sei_size; - sei_data->payloadType = 4; - sei_data->payload = (uint8_t*)(sei_data + 1); + if (a53_data) { + sei_data[sei_count].payloadSize = (uint32_t)a53_size; + sei_data[sei_count].payloadType = 4; + sei_data[sei_count].payload = (uint8_t*)a53_data; + sei_count ++; } } - nvenc_codec_specific_pic_params(avctx, &pic_params, sei_data); + nvenc_codec_specific_pic_params(avctx, &pic_params, sei_data, sei_count); } else { pic_params.encodePicFlags = NV_ENC_PIC_FLAG_EOS; ctx->encoder_flushing = 1; @@ -2161,7 +2167,9 @@ int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) return res; nv_status = p_nvenc->nvEncEncodePicture(ctx->nvencoder, &pic_params); - av_free(sei_data); + + for ( i = 0; i < sei_count; i++) + av_freep(&sei_data[i].payload); res = nvenc_pop_context(avctx); if (res < 0)