From 0768e7d45d1d9290b12cda2d6fe2fabff6e2142d Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sat, 26 Oct 2019 13:03:53 +0300
Subject: [PATCH] Use calculated bitrate
---
components/codecs/src/nvpipe_encoder.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/components/codecs/src/nvpipe_encoder.cpp b/components/codecs/src/nvpipe_encoder.cpp
index 5b4fbdcc5..28407a658 100644
--- a/components/codecs/src/nvpipe_encoder.cpp
+++ b/components/codecs/src/nvpipe_encoder.cpp
@@ -172,7 +172,7 @@ static uint64_t calculateBitrate(definition_t def, bitrate_t rate) {
switch (def) {
case definition_t::UHD4k : bitrate = 24.0f; break;
case definition_t::HTC_VIVE : bitrate = 16.0f; break;
- case definition_t::HD1080 : bitrate = 12.0f; break;
+ case definition_t::HD1080 : bitrate = 16.0f; break;
case definition_t::HD720 : bitrate = 8.0f; break;
case definition_t::SD576 :
case definition_t::SD480 : bitrate = 4.0f; break;
@@ -186,6 +186,9 @@ static uint64_t calculateBitrate(definition_t def, bitrate_t rate) {
bool NvPipeEncoder::_createEncoder(const cv::Mat &in, definition_t def, bitrate_t rate) {
if (_encoderMatch(in, def) && nvenc_) return true;
+ uint64_t bitrate = calculateBitrate(def, rate);
+ LOG(INFO) << "Calculated bitrate: " << bitrate;
+
if (in.type() == CV_32F) is_float_channel_ = true;
else is_float_channel_ = false;
current_definition_ = def;
@@ -196,7 +199,7 @@ bool NvPipeEncoder::_createEncoder(const cv::Mat &in, definition_t def, bitrate_
(is_float_channel_) ? NVPIPE_UINT16 : NVPIPE_RGBA32,
(preference_ == codec_t::Any || preference_ == codec_t::HEVC) ? NVPIPE_HEVC : NVPIPE_H264,
(is_float_channel_) ? NVPIPE_LOSSLESS : NVPIPE_LOSSY,
- 16*1000*1000,
+ bitrate,
fps, // FPS
ftl::codecs::getWidth(def), // Output Width
ftl::codecs::getHeight(def) // Output Height
--
GitLab