From patchwork Mon Nov 16 22:35:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wonkap Jang X-Patchwork-Id: 23664 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 8227B4483F4 for ; Tue, 17 Nov 2020 00:35:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BF2768B622; Tue, 17 Nov 2020 00:35:56 +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 272D968B584 for ; Tue, 17 Nov 2020 00:35:50 +0200 (EET) Received: by mail-yb1-f202.google.com with SMTP id m186so8263242ybm.22 for ; Mon, 16 Nov 2020 14:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to; bh=mtTx6qNyX7Ws2PW66uwx8sd7pjWoY3/ZIXD27sukACE=; b=fknY41GlBMLWIoVmzJYu1divzQWKgRSBM1NMHuj3DHzAM6ce3sMFo7p+3VbkKhKAQa eG3yhNUKb96XRRolrrHih7/3riRShH9/wLRzMOL0Ye1vTh+fBpzZXIl1zlArkWBWVzEM PW58T0fMlevZf9VrM9/V4Dd6DTBFl0EdUXAc8xXaIZM9RcYlngGvEjk4hI0oeqtpcSLR 8AMgmTROJGh90E+YqHKd90y9vFwO38bZEPEafI6GLUSKxI+SBB43+YTcto1RFnU1WewB oM59E5fEnWYK1TT1Gmuo32KNS+VBKsS2c6csUABrScvr0qX2GXaZUh768rV79GSgsmxm bgfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to; bh=mtTx6qNyX7Ws2PW66uwx8sd7pjWoY3/ZIXD27sukACE=; b=ISw8rixBRjOzBlZ1SiuK97PpkNcu8J5nQN2tfVr7wSivRr9dGMA8rrDVKPtpVURb0D g0fNxpGA3GVlSi5eg92cJ0MpQ29RBo/VCy5uyErsTq7e8k3z8qydRM+F06PW9CCR3AR4 WMODl1FX+LcPzLREKpG3QpG3GI3eod79sH8BHEoboWl3cVtdouVUJqxeRgIR+jOZmB3u mBoaW3DwsudI5t86UCZkdkBQvah6Ef1EG+ddFdFQeLS9G5cTqFvcr+yZxCJbktp3G/sa /avGOD9hH/FGDpha3hVGQ1fmgdiqkEXJBAtol31RJHTli/9jW0iiaBydm1odiXuxp0YU zJ+Q== X-Gm-Message-State: AOAM531E9i/DVmsUq2QtN1LvI2QA/8fewpqvYvdqpQgPVcakgoeTm3N7 O6STsGi7jYCmzemZhZKXl/edHmiu1Qj5jY/bHfUcct1XO9jXd9zqK+a8RjwjZy10t+PdX7b5YUg cTAkcXkxNBqVQpBcrY89tNn1UjHIHYo3RWR4vRxTW5NH2BvLRBvh5d3ENkCar1Sk= X-Google-Smtp-Source: ABdhPJwpf2XtZHrciy18hnSAop8hnSLPYo6ug4DTdBOBbUlTVWWsjvtlKBTp8sXGnEB0mSkZY6MN1uhO3sM= X-Received: from wonkap.kir.corp.google.com ([2620:15c:17:10:f693:9fff:feed:e069]) (user=wonkap job=sendgmr) by 2002:a25:c382:: with SMTP id t124mr21634123ybf.476.1605566148433; Mon, 16 Nov 2020 14:35:48 -0800 (PST) Date: Mon, 16 Nov 2020 14:35:46 -0800 Message-Id: <20201116223546.1745620-1-wonkap@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog From: Wonkap Jang To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v1] avcodec/libvpxenc: add a way to set VP9E_SET_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" In order to fine-control referencing schemes in VP9 encoding, there is a need to use VP9E_SET_SVC_REF_FRAME_CONFIG method. This commit provides a way to use the API through frame metadata. --- libavcodec/libvpxenc.c | 77 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index a7c76eb835..dbe399bf72 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -125,6 +125,11 @@ typedef struct VPxEncoderContext { * encounter a frame with ROI side data. */ int roi_warned; + +#if (VPX_ENCODER_ABI_VERSION >= 12) && CONFIG_LIBVPX_VP9_ENCODER + vpx_svc_ref_frame_config_t ref_frame_config; + AVDictionary *vpx_ref_frame_config; +#endif } VPxContext; /** String mappings for enum vp8e_enc_control_id */ @@ -152,6 +157,7 @@ static const char *const ctlidstr[] = { [VP9E_SET_SVC_LAYER_ID] = "VP9E_SET_SVC_LAYER_ID", #if VPX_ENCODER_ABI_VERSION >= 12 [VP9E_SET_SVC_PARAMETERS] = "VP9E_SET_SVC_PARAMETERS", + [VP9E_SET_SVC_REF_FRAME_CONFIG] = "VP9E_SET_SVC_REF_FRAME_CONFIG", #endif [VP9E_SET_SVC] = "VP9E_SET_SVC", #if VPX_ENCODER_ABI_VERSION >= 11 @@ -394,6 +400,18 @@ static void vp8_ts_parse_int_array(int *dest, char *value, size_t value_len, int } } +static void vp8_ts_parse_int64_array(int64_t *dest, char *value, size_t value_len, int max_entries) +{ + int dest_idx = 0; + char *saveptr = NULL; + char *token = av_strtok(value, ",", &saveptr); + + while (token && dest_idx < max_entries) { + dest[dest_idx++] = strtoul(token, NULL, 10); + token = av_strtok(NULL, ",", &saveptr); + } +} + static void set_temporal_layer_pattern(int layering_mode, vpx_codec_enc_cfg_t *cfg, int *layer_flags, int *flag_periodicity) { @@ -541,6 +559,48 @@ static int vpx_ts_param_parse(VPxContext *ctx, struct vpx_codec_enc_cfg *enccfg, return 0; } +#if (VPX_ENCODER_ABI_VERSION >= 12) && CONFIG_LIBVPX_VP9_ENCODER +static int vpx_ref_frame_config_parse(VPxContext *ctx, const struct vpx_codec_enc_cfg *enccfg, + char *key, char *value, enum AVCodecID codec_id) +{ + 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; + + if (!strcmp(key, "rfc_update_buffer_slot")) { + vp8_ts_parse_int_array(ref_frame_config->update_buffer_slot, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_update_last")) { + vp8_ts_parse_int_array(ref_frame_config->update_last, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_update_golden")) { + vp8_ts_parse_int_array(ref_frame_config->update_golden, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_update_alt_ref")) { + vp8_ts_parse_int_array(ref_frame_config->update_alt_ref, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_lst_fb_idx")) { + vp8_ts_parse_int_array(ref_frame_config->lst_fb_idx, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_gld_fb_idx")) { + vp8_ts_parse_int_array(ref_frame_config->gld_fb_idx, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_alt_fb_idx")) { + vp8_ts_parse_int_array(ref_frame_config->alt_fb_idx, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_reference_last")) { + vp8_ts_parse_int_array(ref_frame_config->reference_last, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_reference_golden")) { + vp8_ts_parse_int_array(ref_frame_config->reference_golden, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_reference_alt_ref")) { + vp8_ts_parse_int_array(ref_frame_config->reference_alt_ref, value, value_len, ss_number_layers); + } else if (!strcmp(key, "rfc_reference_duration")) { + vp8_ts_parse_int64_array(ref_frame_config->duration, value, value_len, ss_number_layers); + } + + return 0; +} +#endif + #if CONFIG_LIBVPX_VP9_ENCODER static int set_pix_fmt(AVCodecContext *avctx, vpx_codec_caps_t codec_caps, struct vpx_codec_enc_cfg *enccfg, vpx_codec_flags_t *flags, @@ -1528,6 +1588,23 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, #endif layer_id_valid = 1; } +#if (VPX_ENCODER_ABI_VERSION >= 12) && CONFIG_LIBVPX_VP9_ENCODER + en = av_dict_get(frame->metadata, "ref-frame-config", NULL, 0); + + if (en) { + 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); + } + + codecctl_intp(avctx, VP9E_SET_SVC_REF_FRAME_CONFIG, (int *)&ctx->ref_frame_config); + } +#endif } if (sd) {