From 19702b7cdf7aae6bb28346abfd4baa622bace463 Mon Sep 17 00:00:00 2001
From: Pierre Lespagnol <pierre.lespagnol@savoirfairelinux.com>
Date: Tue, 19 Jan 2021 10:45:13 -0500
Subject: [PATCH] encoder: fix unset default bitrate for conference
Change-Id: Ia8e96b9bf414b215a9fee01474754778a8c24295
---
src/media/media_encoder.cpp | 6 +++---
src/media/media_stream.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index 33cdaf57c7..da565bb655 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -103,10 +103,10 @@ MediaEncoder::setOptions(const MediaStream& opts)
// resolutions
videoOpts_.width -= videoOpts_.width % 2;
videoOpts_.height -= videoOpts_.height % 2;
- if (not videoOpts_.frameRate)
+ if (!videoOpts_.frameRate)
videoOpts_.frameRate = 30;
- if (opts.bitrate)
- libav_utils::setDictValue(&options_, "max_rate", std::to_string(opts.bitrate));
+ if (!videoOpts_.bitrate)
+ videoOpts_.bitrate = SystemCodecInfo::DEFAULT_VIDEO_BITRATE;;
} else {
audioOpts_ = opts;
}
diff --git a/src/media/media_stream.h b/src/media/media_stream.h
index bf4300ad61..b13f79dcc4 100644
--- a/src/media/media_stream.h
+++ b/src/media/media_stream.h
@@ -38,7 +38,7 @@ struct MediaStream
int64_t firstTimestamp {0};
int width {0};
int height {0};
- int bitrate;
+ int bitrate {0};
rational<int> frameRate;
int sampleRate {0};
int nbChannels {0};
--
GitLab