From patchwork Wed May 22 06:59:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13239 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 95FC544892D for ; Wed, 22 May 2019 10:07:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75DB2680BED; Wed, 22 May 2019 10:07:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA3296802F6 for ; Wed, 22 May 2019 10:07:03 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id d21so614652plr.3 for ; Wed, 22 May 2019 00:07:03 -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=4lVZukGM4fyAiY5HrCyV7vRYvkjkGrtLu8sLg4jdXlQ=; b=cq5pBXfzUKLcAyQ9/JvHlpljkiwgmT8OmxhNwJDHSBAUjXxscR5d/Co0PU3YADTCcf /qpgLGOPlcZ9UahuxGIzTjMT7F4bophWAlDJdS/UDgZLOrEUINiAICHX7s2A/Ti3GBgy ERfYVWcKlZLG3aCJqhARVgqjStbydsGiSqWPXOmQMTX6Ub7moTYV6E+MpaFxSHMtE33H dOb2gWIZBxzPgJ/oz33JtKNa59kNsZP7MEw+XqnhLV9Xc5BxTo5Ey3FY4HEwqlNjPat7 dpUrfWXBeTeZfvLKQGAOCgWOd16hWYSSrozm5McH2MHqCHF68o9j/GFLvf3nzUOHTJLF L4Gw== 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=4lVZukGM4fyAiY5HrCyV7vRYvkjkGrtLu8sLg4jdXlQ=; b=GIsLc/GqKxSjlqgYAM3sGBHGFX91DhNq+oHmExjiqMGh3INwAnUb4OgV73ZDURybFE 53C7/7J7X5aDuG9EKPt0Xpp7ReFmYDIPVn1pN/PTyZESHzOIPAbef7OY6Cwadvnltifb OM5xh+teMs347TLngXjuRQnjcMGpBxI/mCv2jV4Ii2duEj44HfJmTZ2W8gfR6mBosonm SN4PieUAK2lCjoy8doHO8ohN8VYJE8erT4GBLVeAfxKleYKe7iP0iGFmEvzZWin84mow sUT7AP/P8aoY4wstSHEKpHKfNwux8ng4esziTcocOKH8r2crrtiuJN422FGh0hr6y78T anlw== X-Gm-Message-State: APjAAAVZAgUADNSqzIJbmm6+cJdEgCagBV+WHSDFxkw4EWt4sYNBsEl5 KkalGhGu3xYbVhWH2ZgBWRCF3307 X-Google-Smtp-Source: APXvYqwZSySe0ncG7Php5Hwd1jz93fBIStG03hDwXKSmi0jCy43tMiKy0a9CKe2TJZVE3VqItRsHmA== X-Received: by 2002:a17:902:d890:: with SMTP id b16mr40328774plz.91.1558508431941; Wed, 22 May 2019 00:00:31 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id k67sm34662706pfb.44.2019.05.22.00.00.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 May 2019 00:00:31 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2019 14:59:52 +0800 Message-Id: <20190522065954.62328-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] 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 , timo@rothenpieler.org 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..75dda6d689 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)