From cff1bf40aec03a8d651f455f3307e40421cba8dc Mon Sep 17 00:00:00 2001
From: Pierre Lespagnol <pierre.lespagnol@savoirfairelinux.com>
Date: Wed, 11 Sep 2019 12:27:50 -0400
Subject: [PATCH] media/encoder: fix encoder.json CRF setting
"setDictValue" override "av_opt_set_int" settings. Always use av_opt_set_int to set CRF
Change-Id: I3a75773419901adf5d24d71bdbf5c571e6ab7178
---
src/media/media_encoder.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index f5f46d7a5a..f5235143ce 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -112,10 +112,6 @@ MediaEncoder::setOptions(const MediaDescription& args)
"payload_type", args.payload_type, AV_OPT_SEARCH_CHILDREN)) < 0)
JAMI_ERR() << "Failed to set payload type: " << libav_utils::getError(ret);
- // NOTE none of these are format options, and we don't have a codec context yet
- libav_utils::setDictValue(&options_, "max_rate", std::to_string(args.codec->bitrate));
- libav_utils::setDictValue(&options_, "crf", std::to_string(args.codec->quality));
-
if (not args.parameters.empty())
libav_utils::setDictValue(&options_, "parameters", args.parameters);
@@ -802,7 +798,6 @@ MediaEncoder::initVP8(AVCodecContext* encoderCtx, uint64_t br)
encoderCtx->qmin = 4;
encoderCtx->qmax = 56;
crf = std::min(encoderCtx->qmax, std::max((int)crf, encoderCtx->qmin));
- libav_utils::setDictValue(&options_, "crf", std::to_string(crf));
av_opt_set_int(encoderCtx, "crf", crf, AV_OPT_SEARCH_CHILDREN);
encoderCtx->rc_buffer_size = bufSize;
encoderCtx->rc_max_rate = maxBitrate;
@@ -866,6 +861,7 @@ MediaEncoder::readConfig(AVCodecContext* encoderCtx)
std::string path = fileutils::get_config_dir() + DIR_SEPARATOR_STR + "encoder.json";
std::string name = encoderCtx->codec->name;
if (fileutils::isFile(path)) {
+ JAMI_WARN("encoder.json file found, default settings will be erased");
try {
Json::Value root;
std::ifstream file = fileutils::ifstream(path);
--
GitLab