From patchwork Thu Feb 18 19:01:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wonkap Jang X-Patchwork-Id: 25769 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 28AA5449298 for ; Thu, 18 Feb 2021 21:01:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF357689D60; Thu, 18 Feb 2021 21:01:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3362A680D41 for ; Thu, 18 Feb 2021 21:01:35 +0200 (EET) Received: by mail-pj1-f74.google.com with SMTP id nm21so453789pjb.6 for ; Thu, 18 Feb 2021 11:01:35 -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=C3cT+y/j3lEUNnAJ9FCdj74rhwcBLWZvaFOQ0UTqNcs=; b=nT3eQwW51Y8JNSpcvzCze69iq+5CDYFC0dZxXHcjaDIpDWU6Pi7X8P2LzYdv0psT4o 99wOz/7jjcZ1sfB2F4kwR773NyK88jW/w7LtREE0dRLisiCTzv+pNCf0RcyruKMJpjFC sjSqyUPh0KJc1nsr+NY2vu49d79SJNLIHZeriNCID/92X6HyGMIgKDyL5NsbwVpDEODd F8vdgw8t3obQx1/2De7cWcsE8ZY/DD0FgiW7Uv8yx1XiwxN/V7ToOFCOqmrwubYfXOhw IpI2QEfVJrKfbUlwTLzxW5TN9Mlavj9hFAwzKZwlinOcLGjm7Gzc96jujE+y7noV4yPk pFDg== 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=C3cT+y/j3lEUNnAJ9FCdj74rhwcBLWZvaFOQ0UTqNcs=; b=cGj1rhzLGNplTuBiMz22BwB7aEnXWjv+21LhHERLeaF+gyuTeEjORvDRM7DBV3O06V yT5RtVRQcoKua37CnToFxayBoCEGCZUJbDbopQILphF7vZBUcHW5frXdnuJErBaRgCIR cXLPGa3ghRTsn3XgUoLD9pJg6nxmGeWs10X+XQpIbmyn+JBvkRvy8lIAE0t6STXwNYSd ypfJZ/UfrpF9tROhkUeNBqGsGE5v8t6rg3d2YwOfRAckKBU2eV+mEYgql4ubwmMCgBEU AB2JRlC2HBbmJXHBsWiLfdH4/psRTXh9VW9guaqbR+v17Q6NqMhHXLqOENny6TvQuDWK tteA== X-Gm-Message-State: AOAM530asMx3m0me8JsXYYgVX1tHZyCN/nFcHm9GnTgDao6l0SjY5ZZB tAs23B2dOKbtA8U1sNUIuCUqXz/DI8CiXwPeJ4XqXvgdA0X8K9hdOCDx8w2PldbA9juSOkvl0Io +y8Un3zeisQENtjnOR4J++gXmyCyGfNKhz+66AsqkkHoTqRBcNISB7TNs9DiMmB0= X-Google-Smtp-Source: ABdhPJxicr7AXsPOGmrFdDII3U8CiLvteP9u+drgQfHV/jCAAaSyh5ZBB+VGmvio3yx8PK5Uy1JbpofURts= X-Received: from wonkap.kir.corp.google.com ([2620:15c:17:10:2516:f2a2:d805:783d]) (user=wonkap job=sendgmr) by 2002:a17:902:7897:b029:e2:c149:cbe6 with SMTP id q23-20020a1709027897b02900e2c149cbe6mr5140311pll.68.1613674892766; Thu, 18 Feb 2021 11:01:32 -0800 (PST) Date: Thu, 18 Feb 2021 11:01:31 -0800 In-Reply-To: <20210218182733.msfrn6jaw6csyalo@phare.normalesup.org> Message-Id: <20210218190131.3583724-1-wonkap@google.com> Mime-Version: 1.0 References: <20210218182733.msfrn6jaw6csyalo@phare.normalesup.org> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog From: Wonkap Jang To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5] avcodec/libvpxenc: optimize parsing vpx_svc_ref_frame_config 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 | 73 +++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 284cb9a108..dfa0763fff 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,49 @@ 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) +{ + int ret = 0; + + while (*str) { + ret = + vpx_parse_ref_frame_config_element(ref_frame_config, ss_number_layers, &str); + if (ret < 0) + return ret; + + if (*str) + str++; + } + + return ret; +} #endif #if CONFIG_LIBVPX_VP9_ENCODER @@ -1594,20 +1632,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