diff --git a/components/codecs/src/nvpipe_encoder.cpp b/components/codecs/src/nvpipe_encoder.cpp index c8a44e47c223dac248f204010330757a289ebf75..e4ad3589e20a3c261a3c16a1e61cbb1e01888b41 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 cb0a648764f846dbb01c9f28cbeace88ddfd606f..f8857d5c8ec6ca6a8e65344d9438347f4855333b 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 6036b1a19deb0e16142d3bf8789a57f0969d92d5..0592d24f67d68a30561c74e79ad017f82c4c129a 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;