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;
}
#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);
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
}
}
-#if FF_API_PRIVATE_OPT
-FF_DISABLE_DEPRECATION_WARNINGS
- if (avctx->frame_skip_threshold)
- ctx->drop_threshold = avctx->frame_skip_threshold;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
enccfg.rc_dropframe_thresh = ctx->drop_threshold;
//0-100 (0 => CBR, 100 => VBR)
codecctl_int(avctx, VP8E_SET_SHARPNESS, ctx->sharpness);
if (CONFIG_LIBVPX_VP8_ENCODER && avctx->codec_id == AV_CODEC_ID_VP8) {
-#if FF_API_PRIVATE_OPT
-FF_DISABLE_DEPRECATION_WARNINGS
- if (avctx->noise_reduction)
- ctx->noise_sensitivity = avctx->noise_reduction;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, ctx->noise_sensitivity);
codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS, av_log2(avctx->slices));
}
int pict_type;
memcpy(pkt->data, cx_frame->buf, pkt->size);
pkt->pts = pkt->dts = cx_frame->pts;
-#if FF_API_CODED_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
- avctx->coded_frame->pts = cx_frame->pts;
- avctx->coded_frame->key_frame = !!(cx_frame->flags & VPX_FRAME_IS_KEY);
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (!!(cx_frame->flags & VPX_FRAME_IS_KEY)) {
pict_type = AV_PICTURE_TYPE_I;
-#if FF_API_CODED_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
- avctx->coded_frame->pict_type = pict_type;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
pkt->flags |= AV_PKT_FLAG_KEY;
} else {
pict_type = AV_PICTURE_TYPE_P;
-#if FF_API_CODED_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
- avctx->coded_frame->pict_type = pict_type;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
ff_side_data_set_encoder_stats(pkt, 0, cx_frame->sse + 1,
if (cx_frame->have_sse) {
int i;
/* Beware of the Y/U/V/all order! */
-#if FF_API_CODED_FRAME && FF_API_ERROR_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
- avctx->coded_frame->error[0] = cx_frame->sse[1];
- avctx->coded_frame->error[1] = cx_frame->sse[2];
- avctx->coded_frame->error[2] = cx_frame->sse[3];
- avctx->coded_frame->error[3] = 0; // alpha
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
for (i = 0; i < 3; ++i) {
avctx->error[i] += cx_frame->sse[i + 1];
}
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 = 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");
+ "Ignoring ref-frame-config for a non-VP9 codec\n");
}
}
#endif
.version = LIBAVUTIL_VERSION_INT,
};
-AVCodec ff_libvpx_vp8_encoder = {
+const AVCodec ff_libvpx_vp8_encoder = {
.name = "libvpx",
.long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
.type = AVMEDIA_TYPE_VIDEO,
.init = vp8_init,
.encode2 = vpx_encode,
.close = vpx_free,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
+ .caps_internal = FF_CODEC_CAP_AUTO_THREADS,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE },
.priv_class = &class_vp8,
.defaults = defaults,
.init = vp9_init,
.encode2 = vpx_encode,
.close = vpx_free,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
+ .caps_internal = FF_CODEC_CAP_AUTO_THREADS,
.profiles = NULL_IF_CONFIG_SMALL(ff_vp9_profiles),
.priv_class = &class_vp9,
.defaults = defaults,
projects / ffmpeg / blobdiff