From patchwork Thu Feb 18 00:41:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wonkap Jang X-Patchwork-Id: 25719 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 7B8C2449A69 for ; Thu, 18 Feb 2021 02:41:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E6656880AF; Thu, 18 Feb 2021 02:41:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF8ED680635 for ; Thu, 18 Feb 2021 02:41:03 +0200 (EET) Received: by mail-yb1-f202.google.com with SMTP id v196so700515ybv.3 for ; Wed, 17 Feb 2021 16:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to; bh=fjjPxs/f7BG5PikDJocqaeSmam5MlXzASrFaLNze9B8=; b=C1VXcMisrKuGxnX7MqHg9u0MM3XOgR9N82E5hWBWXQf77M4Fm4Qsk8lSAsFjoGzjgm WgztYlpt+W4de0kauRJMqrfX+EGm2gZaK3/BUPKuhxXztYge1SYmPWmkdRsC134rth0c +rDgQi6aCmmJwJBy+f0vDK8CI+hDkM/Ewp7uxqoBw/gmPlYysRdmncWX+8SHy5th9OVw IwQAdFISdQBE0G9TGyDNrz7lpsybo17UIg5NzmXI4WxirkN27siZNLhTQ2SL5zBmP53B Yf0R3jfj8Ys5iAQyQ2n+bCNMxII/hQtgpfJdLaj3DmBxcdzmQdmY9Sgp2VRQTlHIUjaM sKWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to; bh=fjjPxs/f7BG5PikDJocqaeSmam5MlXzASrFaLNze9B8=; b=LF/W0DIHC6uBCzg1Daq2u3FMePPF5pUG/Bq5kDOEX5VseOmSIjdI6fYLP4Mnpm7ckS wQutk51/tfwQHQw1PYlqsxzMrKe+1rVPCkI96w5WO6sc/iaPcWQk0gqZ7GQvJYavYJfi YNTw28GiiQuAtAUTEM02L/agE2q7dWiuQPoz8JQaoacdFRDHKQNLp0mvmyDOYQOA4aHx ze0ePqnAnQwNzkMK/GsnabwoutG8C/Epkpi97voGqFo/ZUhasiBg9y4zLWFmc4scQEIq ceLX9UmsyEL/AgbRG6zW7a/MhsFlV7d0obN8e3/Xq+d5cdgG4u+6rCntkO5RjJbfYd2v GM9w== X-Gm-Message-State: AOAM531smON6u3O18GzVhF4z01jaTkypgofQ1Zs2Is24QwZ/MbsfI1cl EfQuMmpRf1oZRod+yfBFt8r2NZrwqdh8INw1Ko22PM21wjg7pLe5JlsovAi0mMCFAMifxLiwstK f1zaTzNKSAxWAnfQVVLHnmTfjTtgeUb0E/cFGV0M7pCG6k5wE1Imy+Gfaz2xOW1I= X-Google-Smtp-Source: ABdhPJyZjiu9tIbi7UhFvVDo9lBzIY3xu3dKSz4nJFuqhDx15wtomd6CYFHrwjVdQA0vhM9dI+0A/jx/U9I= X-Received: from wonkap.kir.corp.google.com ([2620:15c:17:10:2516:f2a2:d805:783d]) (user=wonkap job=sendgmr) by 2002:a25:8712:: with SMTP id a18mr3081940ybl.306.1613608862093; Wed, 17 Feb 2021 16:41:02 -0800 (PST) Date: Wed, 17 Feb 2021 16:41:00 -0800 In-Reply-To: Message-Id: <20210218004100.3362853-1-wonkap@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog From: Wonkap Jang To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4] avcodec/libvpxenc: optimize parsing vpx_svc_ref_frame_config parameters 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Getting rid of unnecessary use of AVDictionary object in parsing vpx_svc_ref_frame_config. --- libavcodec/libvpxenc.c | 76 ++++++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 284cb9a108..abfd0032c1 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -42,6 +42,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/avstring.h" /** * Portion of struct vpx_codec_cx_pkt from vpx_encoder.h. @@ -127,7 +128,6 @@ typedef struct VPxEncoderContext { int roi_warned; #if CONFIG_LIBVPX_VP9_ENCODER && defined(VPX_CTRL_VP9E_SET_MAX_INTER_BITRATE_PCT) vpx_svc_ref_frame_config_t ref_frame_config; - AVDictionary *vpx_ref_frame_config; #endif } VPxContext; @@ -561,18 +561,13 @@ static int vpx_ts_param_parse(VPxContext *ctx, struct vpx_codec_enc_cfg *enccfg, } #if CONFIG_LIBVPX_VP9_ENCODER && defined(VPX_CTRL_VP9E_SET_MAX_INTER_BITRATE_PCT) -static int vpx_ref_frame_config_parse(VPxContext *ctx, const struct vpx_codec_enc_cfg *enccfg, - char *key, char *value, enum AVCodecID codec_id) +static int vpx_ref_frame_config_set_value(vpx_svc_ref_frame_config_t *ref_frame_config, + int ss_number_layers, char *key, char *value) { size_t value_len = strlen(value); - int ss_number_layers = enccfg->ss_number_layers; - vpx_svc_ref_frame_config_t *ref_frame_config = &ctx->ref_frame_config; if (!value_len) - return -1; - - if (codec_id != AV_CODEC_ID_VP9) - return -1; + return AVERROR(EINVAL); if (!strcmp(key, "rfc_update_buffer_slot")) { vp8_ts_parse_int_array(ref_frame_config->update_buffer_slot, value, value_len, ss_number_layers); @@ -600,6 +595,52 @@ static int vpx_ref_frame_config_parse(VPxContext *ctx, const struct vpx_codec_en return 0; } + +static int vpx_parse_ref_frame_config_element(vpx_svc_ref_frame_config_t *ref_frame_config, int ss_number_layers, + const char **buf, const char *key_val_sep, const char *pairs_sep) +{ + char *key = av_get_token(buf, key_val_sep); + char *val = NULL; + int ret; + + if (key && *key && strspn(*buf, key_val_sep)) { + (*buf)++; + val = av_get_token(buf, pairs_sep); + } + + if (key && *key && val && *val) + ret = vpx_ref_frame_config_set_value(ref_frame_config, ss_number_layers, key, val); + else + ret = AVERROR(EINVAL); + + av_freep(&key); + av_freep(&val); + + return ret; +} + +static int vpx_parse_ref_frame_config(vpx_svc_ref_frame_config_t *ref_frame_config, int ss_number_layers, + const char *str, const char *key_val_sep, const char *pairs_sep) +{ + int ret = 0; + + if (!ref_frame_config) + return AVERROR(EINVAL); + + if (!str) + return AVERROR(EINVAL); + + while (*str) { + if ((ret = vpx_parse_ref_frame_config_element(ref_frame_config, ss_number_layers, + &str, key_val_sep, pairs_sep)) !=0) + return ret; + + if (*str) + str++; + } + + return ret; +} #endif #if CONFIG_LIBVPX_VP9_ENCODER @@ -1594,20 +1635,19 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, if (en) { if (avctx->codec_id == AV_CODEC_ID_VP9) { - AVDictionaryEntry* en2 = NULL; - av_dict_parse_string(&ctx->vpx_ref_frame_config, en->value, "=", ":", 0); - - while ((en2 = av_dict_get(ctx->vpx_ref_frame_config, "", en2, AV_DICT_IGNORE_SUFFIX))) { - if (vpx_ref_frame_config_parse(ctx, enccfg, en2->key, en2->value, avctx->codec_id) < 0) - av_log(avctx, AV_LOG_WARNING, - "Error parsing option '%s = %s'.\n", - en2->key, en2->value); + int ret; + ret = vpx_parse_ref_frame_config(&ctx->ref_frame_config, + enccfg->ss_number_layers, en->value, "=", ":"); + if (ret != 0) { + av_log(avctx, AV_LOG_WARNING, + "Error parsing ref_frame_config option %s.\n", en->value); + return ret; } codecctl_intp(avctx, VP9E_SET_SVC_REF_FRAME_CONFIG, (int *)&ctx->ref_frame_config); } else { av_log(avctx, AV_LOG_WARNING, - "Error using option ref-frame-config for a non-VP9 codec\n"); + "Using option ref-frame-config for a non-VP9 codec\n"); } } #endif