jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to render cursor when X11 is available

Browse source
This commit is contained in:
loki 2021-08-15 20:38:30 +02:00
commit fdb7754043
8 changed files with 251 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

40
sunshine/platform/linux/vaapi.cpp
View file

@ -198,7 +198,7 @@ public:
return 0;
}
int _set_frame(AVFrame *frame) {
int set_frame(AVFrame *frame) override {
this->hwframe.reset(frame);
this->frame = frame;
@ -252,6 +252,12 @@ public:
return -1;
}
auto sws_opt = egl::sws_t::make(width, height, frame->width, frame->height);
if(!sws_opt) {
return -1;
}
this->sws = std::move(*sws_opt);
this->nv12 = std::move(*nv12_opt);
return 0;
@ -284,27 +290,12 @@ public:
sws.convert(nv12);
return 0;
}
int set_frame(AVFrame *frame) override {
if(_set_frame(frame)) {
return -1;
}
auto sws_opt = egl::sws_t::make(width, height, frame->width, frame->height);
if(!sws_opt) {
return -1;
}
this->sws = std::move(*sws_opt);
return 0;
}
};
class va_vram_t : public va_t {
public:
int convert(platf::img_t &img) override {
sws.load_vram(img, offset_x, offset_y, framebuffer[0]);
sws.load_vram((egl::cursor_t &)img, offset_x, offset_y, framebuffer[0]);
sws.convert(nv12);
return 0;
@ -331,21 +322,6 @@ public:
return 0;
}
int set_frame(AVFrame *frame) override {
if(_set_frame(frame)) {
return -1;
}
auto sws_opt = egl::sws_t::make(width, height, frame->width, frame->height);
if(!sws_opt) {
return -1;
}
this->sws = std::move(*sws_opt);
return 0;
}
file_t fb_fd;
egl::rgb_t rgb;