From patchwork Fri May 17 09:55:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13185 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 F4155447DAF for ; Fri, 17 May 2019 13:04:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4C5068A47D; Fri, 17 May 2019 13:04:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 546BD689D68 for ; Fri, 17 May 2019 13:03:59 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id y11so3436748pfm.13 for ; Fri, 17 May 2019 03:03:59 -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:mime-version :content-transfer-encoding; bh=66BGfgwwMpIGBD+31Cw4sgegY3miQbh1+wo2UrinT1c=; b=n08YeSWWWjB9O8EV5FIi7ZLzFphfAFrj24AhqwSV5oXB6yWThYnGLYAJZFpssHT7T+ UCYRsXxlviw6UtlGUT1lsyWKNW/hFKWSyka+pSDK7AA8UPyKF1KItG8CIB3HfMjd8xeJ VPeGoNh7xi9n18E0EO0Q6aNXwGN/VBY2FO46f1OBmG19+eVcE/hN8vwYfOf+xHSNiv37 yRe1/Dq7pdSLXIxpgs/GKOb4lZVGfpY11qz+g4NT5ul/Ddosabm0rHplDdB77KJ3Un/y DwXhYuZBAhy3zXmxhcFe6jZOTOcdBJf87e6OAT0j8bW1Q1Zq4j4KUnHJ6xHFWboKbm3z n9wg== 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:mime-version :content-transfer-encoding; bh=66BGfgwwMpIGBD+31Cw4sgegY3miQbh1+wo2UrinT1c=; b=qHEVhQqnA0jhQpvn2ZUzAoIcLy0CTVzc0bRVUq/LTh57z5PHJZWEW/eXHPIpRORgvk +S6a/n3VjLtDoN1IUwhzQudPzOl+fSp9Wol9QJz3bm8Co6atBYjp6XDvVp5ptUHufRkK kpfPYMIvItyhg4aGZbsqL9vb9PltSP20jrWvVV2nVoSueVUfuJdW5K0tJoi9YiLcUa6v X4UH5ZElmTUNNnaIPMloj0vdjvDl3vf0bSWttYRaFhtPqwMcPpFzyxx7on2FxiDpfjWc dnMBi0SHMwhvhzY28J5Mr8tWbm7wqk8rwp2IODSBg1yLJrXByFy7k1L4BxWgAbbvbnUM GjiA== X-Gm-Message-State: APjAAAWca3XMwxcTk4X+80xscUwr7EeA0cZL0Ttt3OkhEzLxRol+p50a BjpbvGTO5T6azJwSn03x3+76OdQONBI= X-Google-Smtp-Source: APXvYqzi+RxpzbZk+R8zyl/0SMK5UIMO5W4rQn2o0VQFY+drqh66Q1pRrweH3C/d9AbJAa2tpFvbTg== X-Received: by 2002:a63:5cb:: with SMTP id 194mr56292375pgf.294.1558086961488; Fri, 17 May 2019 02:56:01 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j64sm6088845pfb.126.2019.05.17.02.55.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 May 2019 02:56:00 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2019 17:55:37 +0800 Message-Id: <20190517095538.32264-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang --- libavcodec/nvenc.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 3fe64bba8b..77eb9918a4 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1705,7 +1705,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; @@ -1715,9 +1716,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; @@ -1726,9 +1727,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; @@ -2023,8 +2024,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; @@ -2093,18 +2095,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; @@ -2115,7 +2121,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)