From fed95c832fefc94def98f3a77e63961a1cf8937c Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Wed, 29 Jan 2020 20:05:06 +0200
Subject: [PATCH] Increase bitrates
---
components/codecs/src/nvpipe_encoder.cpp | 14 +++++++-------
components/streams/src/netstream.cpp | 4 ++--
components/streams/src/sender.cpp | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/components/codecs/src/nvpipe_encoder.cpp b/components/codecs/src/nvpipe_encoder.cpp
index c8a44e47c..e4ad3589e 100644
--- a/components/codecs/src/nvpipe_encoder.cpp
+++ b/components/codecs/src/nvpipe_encoder.cpp
@@ -77,14 +77,14 @@ static ftl::codecs::format_t formatFromPacket(const ftl::codecs::Packet &pkt) {
static uint64_t calculateBitrate(definition_t def, float ratescale) {
float bitrate = 1.0f; // Megabits
switch (def) {
- case definition_t::UHD4k : bitrate = 32.0f; break;
- case definition_t::HTC_VIVE : bitrate = 16.0f; break;
- case definition_t::HD1080 : bitrate = 6.0f; break;
- case definition_t::HD720 : bitrate = 4.0f; break;
+ case definition_t::UHD4k : bitrate = 40.0f; break;
+ case definition_t::HTC_VIVE : bitrate = 32.0f; break;
+ case definition_t::HD1080 : bitrate = 12.0f; break;
+ case definition_t::HD720 : bitrate = 8.0f; break;
case definition_t::SD576 :
- case definition_t::SD480 : bitrate = 2.0f; break;
- case definition_t::LD360 : bitrate = 1.0f; break;
- default : bitrate = 8.0f;
+ case definition_t::SD480 : bitrate = 4.0f; break;
+ case definition_t::LD360 : bitrate = 2.0f; break;
+ default : bitrate = 16.0f;
}
bitrate *= 1000.0f*1000.0f;
diff --git a/components/streams/src/netstream.cpp b/components/streams/src/netstream.cpp
index cb0a64876..f8857d5c8 100644
--- a/components/streams/src/netstream.cpp
+++ b/components/streams/src/netstream.cpp
@@ -80,9 +80,9 @@ bool Net::post(const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet
// Quality filter the packets
if (pkt.bitrate > 0 && pkt.bitrate != client.quality) {
- ++c;
+ //++c;
LOG(INFO) << "Incorrect quality: " << (int)pkt.bitrate << " but requested " << (int)client.quality;
- continue;
+ //continue;
}
try {
diff --git a/components/streams/src/sender.cpp b/components/streams/src/sender.cpp
index 6036b1a19..0592d24f6 100644
--- a/components/streams/src/sender.cpp
+++ b/components/streams/src/sender.cpp
@@ -269,7 +269,7 @@ void Sender::_encodeChannel(const ftl::rgbd::FrameSet &fs, Channel c, bool reset
pkt.frame_count = count;
pkt.codec = codec;
pkt.definition = definition_t::Any;
- pkt.bitrate = max_bitrate;
+ pkt.bitrate = (!lossless && ftl::codecs::isFloatChannel(c)) ? max_bitrate : max_bitrate/2;
pkt.flags = 0;
if (!lossless && ftl::codecs::isFloatChannel(c)) pkt.flags = ftl::codecs::kFlagFloat | ftl::codecs::kFlagMappedDepth;
--
GitLab