jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bound encoder rate requests by the negotiated mode ceiling

Browse Source
This commit is contained in:
evgeny committed 2026-10-14 21:46:53 +02:00
1 parent 3b3ba3c495
commit 327478475c
2 files changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/chatgui/src/call_video_encoder.cpp
+7 -4
View File
@@ -4,9 +4,10 @@
#include <QElapsedTimer>
// Профиль и envelope задаются явно: автоматический выбор level при смене bitrate запрещён.
bool CallVideoEncoder::open(const LiveVideoConfig& config, uint64_t generation) {
bool CallVideoEncoder::open(const LiveVideoConfig& config, uint64_t generation, uint32_t maximumBitrate) {
if (!generation || config.profile == LiveVideoProfile::Automatic || config.references != 1
|| config.bitrate < CALL_VIDEO_RATE_MIN_BPS || config.bitrate > CALL_VIDEO_RATE_MAX_BPS) {
|| maximumBitrate < CALL_VIDEO_RATE_MIN_BPS || maximumBitrate > CALL_VIDEO_RATE_MAX_BPS
|| config.bitrate < CALL_VIDEO_RATE_MIN_BPS || config.bitrate > maximumBitrate) {
m_error = "Invalid call video encoder configuration";
DEBUG_ERROR(DEBUG_CATEGORY_CALL, "call video open invalid generation=%llu bitrate=%d profile=%d refs=%d",
(unsigned long long)generation, config.bitrate, (int)config.profile, config.references); return false;
@@ -16,6 +17,7 @@ bool CallVideoEncoder::open(const LiveVideoConfig& config, uint64_t generation)
m_error = candidate->error(); DEBUG_ERROR(DEBUG_CATEGORY_CALL, "call video open failed: %s", qPrintable(m_error)); return false;
}
close(); m_encoder = std::move(candidate); m_config = config; m_config.backend = m_encoder->name(); m_generation = generation;
m_maximumBitrate = maximumBitrate;
DEBUG_INFO(DEBUG_CATEGORY_CALL, "call video encoder opened generation=%llu codec=%d encoder=%s bitrate=%d level=%d",
(unsigned long long)generation, config.codec, qPrintable(m_config.backend), config.bitrate, config.level); return true;
}
@@ -24,13 +26,14 @@ void CallVideoEncoder::close() {
if (m_encoder) DEBUG_DEBUG(DEBUG_CATEGORY_CALL, "call video encoder close generation=%llu pending_request=%llu",
(unsigned long long)m_generation, (unsigned long long)m_request);
m_encoder.reset(); m_config = {}; m_config.bitrate = 0; m_error.clear();
m_generation = m_request = m_lastRequest = m_lastPts = m_lastKey = 0; m_pendingBitrate = 0; m_haveFrame = false;
m_generation = m_request = m_lastRequest = m_lastPts = m_lastKey = 0;
m_pendingBitrate = m_maximumBitrate = 0; m_haveFrame = false;
}
// Ядро сериализует команды; повторные/чужие requests не заменяют уже ожидающую команду.
bool CallVideoEncoder::requestBitrate(uint64_t generation, uint64_t request, uint32_t bitrate) {
if (!m_encoder || generation != m_generation || !request || request <= m_lastRequest || m_request
|| bitrate < CALL_VIDEO_RATE_MIN_BPS || bitrate > CALL_VIDEO_RATE_MAX_BPS) {
|| bitrate < CALL_VIDEO_RATE_MIN_BPS || bitrate > m_maximumBitrate) {
DEBUG_WARN(DEBUG_CATEGORY_CALL, "call video bitrate rejected generation=%llu/%llu request=%llu last=%llu pending=%llu bitrate=%u",
(unsigned long long)generation, (unsigned long long)m_generation, (unsigned long long)request,
(unsigned long long)m_lastRequest, (unsigned long long)m_request, bitrate); return false;