mirror of
http://100.103.83.12:3003/fegger/screen_cast.git
synced 2026-09-17 09:42:44 +00:00
perf(codec): upgrade x264 preset and downscale to the receiver display
Two quality improvements: Preset: ultrafast -> veryfast. Unlocks Main profile with CABAC entropy coding, hexagonal motion search, 3 reference frames, and adaptive quantization — typically 30-40% better quality at the same bitrate. The desktop handles the extra encoding cost trivially (150+ fps at 1080p). Downscaling: the receiver now advertises its display resolution in the signaling answer (display_width/display_height, 0 = unknown). When the capture exceeds the display (e.g. 2256x1504 source on a 1920x1080 receiver), the sender scales down preserving aspect ratio before encoding — the same sws_scale pass that already converts the pixel format also handles the resolution change, so there is no extra step. This concentrates the entire bitrate into pixels the display actually shows (~2.7x more bits per visible pixel at 4000 kbps when going from 2256x1504 to 1620x1080). The renderer caches the display size during window creation (native monitor resolution in fullscreen/KMSDRM; window size otherwise). The receiver includes it in every signaling answer; the sender pipeline computes aspect-preserving, even-rounded scaled dimensions when the display is smaller than the capture. meson test 5/5 in both configurations, valgrind clean.
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <chrono>
|
||||
#include <condition_variable>
|
||||
@@ -123,6 +124,23 @@ class SenderPipeline::Impl {
|
||||
config.width = frame.width;
|
||||
config.height = frame.height;
|
||||
|
||||
// Downscale to the receiver's display when the capture is larger,
|
||||
// preserving aspect ratio and rounding to even values (YUV420P
|
||||
// requires even dimensions for the chroma planes). This avoids
|
||||
// encoding pixels the display cannot show.
|
||||
if (config_.max_encode_width > 0 && config_.max_encode_height > 0 &&
|
||||
(frame.width > config_.max_encode_width || frame.height > config_.max_encode_height)) {
|
||||
const double scale = std::min(static_cast<double>(config_.max_encode_width) / frame.width,
|
||||
static_cast<double>(config_.max_encode_height) / frame.height);
|
||||
config.width = std::max(2, static_cast<int>(frame.width * scale) & ~1);
|
||||
config.height = std::max(2, static_cast<int>(frame.height * scale) & ~1);
|
||||
std::cerr << std::format("screencast: downscaling {}x{} to {}x{} for the receiver's display\n",
|
||||
frame.width,
|
||||
frame.height,
|
||||
config.width,
|
||||
config.height);
|
||||
}
|
||||
|
||||
auto encoder_result = EncoderFactory::create(config);
|
||||
if (is_codec_error(encoder_result)) {
|
||||
std::cerr << std::format("screencast: encoder creation failed: {}\n", codec_error(encoder_result).message);
|
||||
@@ -334,6 +352,12 @@ class ReceiverPipeline::Impl {
|
||||
// Empty address: the sender targets the address of its signaling
|
||||
// connection, which reaches this RTP port.
|
||||
answer.rtp_endpoint = Endpoint{"", config_.local_rtp_endpoint.port};
|
||||
// Tell the sender what display it is rendering to so it can
|
||||
// downscale instead of encoding pixels the display cannot show.
|
||||
if (renderer_ != nullptr) {
|
||||
answer.display_width = renderer_->display_width();
|
||||
answer.display_height = renderer_->display_height();
|
||||
}
|
||||
signaling_->send(answer);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user