Display and control your Android device
Move icon texture from sc_texture to sc_screen
Romain Vimonta6c25475939f
diff --git a/app/src/screen.c b/app/src/screen.cindex 5ae65f70..b00533a0 100644--- a/app/src/screen.c+++ b/app/src/screen.c@@ -157,6 +157,28 @@ sc_screen_track_resize(struct sc_screen *screen, struct sc_size size) {screen->resize_tracker.size = size;}+static bool+sc_screen_set_texture_from_surface(struct sc_screen *screen,+ SDL_Surface *surface) {+ // The current "frame" texture can be discarded+ sc_texture_reset(&screen->tex);++ if (screen->icon_tex) {+ SDL_DestroyTexture(screen->icon_tex);+ }++ screen->icon_tex = SDL_CreateTextureFromSurface(screen->renderer, surface);+ if (!screen->icon_tex) {+ LOGE("Could not create texture from surface: %s", SDL_GetError());+ return false;+ }++ // Once is_icon_active is true, it may never become false again+ screen->is_icon_active = true;++ return true;+}+static inline boolsc_screen_is_relative_mode(struct sc_screen *screen) {// screen->im.mp may be NULL if --no-control@@ -167,6 +189,7 @@ static voidcompute_content_rect(struct sc_size window_size, struct sc_size content_size,bool is_icon, enum sc_render_fit render_fit,SDL_FRect *rect) {+ // Only upscale video frames, not iconif (is_icon) {if (content_size.width <= window_size.width&& content_size.height <= window_size.height) {@@ -223,12 +246,10 @@ compute_content_rect(struct sc_size window_size, struct sc_size content_size,static voidsc_screen_update_content_rect(struct sc_screen *screen) {- // Only upscale video frames, not icon- bool is_icon = !screen->video || screen->disconnected;-struct sc_size window_size = sc_sdl_get_window_size(screen->window);- compute_content_rect(window_size, screen->content_size, is_icon,- screen->render_fit, &screen->rect);+ compute_content_rect(window_size, screen->content_size,+ screen->is_icon_active, screen->render_fit,+ &screen->rect);}// render the texture to the renderer@@ -248,7 +269,8 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {SDL_SetRenderDrawColor(renderer, bg.r, bg.g, bg.b, 0);sc_sdl_render_clear(renderer);- SDL_Texture *texture = screen->tex.texture;+ SDL_Texture *texture = screen->is_icon_active ? screen->icon_tex+ : screen->tex.texture;if (!texture) {goto end;}@@ -621,6 +643,8 @@ sc_screen_init(struct sc_screen *screen,goto error_destroy_texture;}+ screen->icon_tex = NULL;+ screen->is_icon_active = false;SDL_Surface *icon = sc_icon_load(SC_ICON_FILENAME_SCRCPY);if (icon) {if (!SDL_SetWindowIcon(screen->window, icon)) {@@ -630,7 +654,7 @@ sc_screen_init(struct sc_screen *screen,if (!params->video) {screen->content_size.width = icon->w;screen->content_size.height = icon->h;- ok = sc_texture_set_from_surface(&screen->tex, icon);+ ok = sc_screen_set_texture_from_surface(screen, icon);if (!ok) {LOGE("Could not set icon: %s", SDL_GetError());}@@ -945,7 +969,7 @@ sc_screen_apply_frame(struct sc_screen *screen, bool can_resize) {sc_screen_update_content_rect(screen);}- bool ok = sc_texture_set_from_frame(&screen->tex, frame);+ bool ok = sc_texture_update(&screen->tex, frame);if (!ok) {return false;}@@ -1245,8 +1269,8 @@ sc_screen_handle_disconnection(struct sc_screen *screen) {SDL_Surface *icon_disconnected = event.user.data1;assert(icon_disconnected);- bool ok = sc_texture_set_from_surface(&screen->tex,- icon_disconnected);+ bool ok = sc_screen_set_texture_from_surface(screen,+ icon_disconnected);if (ok) {screen->content_size.width = icon_disconnected->w;screen->content_size.height = icon_disconnected->h;diff --git a/app/src/screen.h b/app/src/screen.hindex a8058d9f..72503116 100644--- a/app/src/screen.h+++ b/app/src/screen.h@@ -102,6 +102,10 @@ struct sc_screen {bool disconnect_started;struct sc_disconnect disconnect;+ SDL_Texture *icon_tex;+ // render icon rather than frame?+ bool is_icon_active;+// Track resize requests caused by frame-size changesstruct sc_resize_tracker {sc_tick time; // 0 means nonediff --git a/app/src/texture.c b/app/src/texture.cindex a8daebb9..d4c1370b 100644--- a/app/src/texture.c+++ b/app/src/texture.c@@ -174,13 +174,12 @@ sc_texture_create_frame_texture(struct sc_texture *tex,}bool-sc_texture_set_from_frame(struct sc_texture *tex, const AVFrame *frame) {+sc_texture_update(struct sc_texture *tex, const AVFrame *frame) {struct sc_size size = {frame->width, frame->height};assert(size.width && size.height);if (!tex->texture- || tex->texture_type != SC_TEXTURE_TYPE_FRAME|| tex->texture_size.width != size.width|| tex->texture_size.height != size.height) {// Incompatible texture, recreate it@@ -198,13 +197,11 @@ sc_texture_set_from_frame(struct sc_texture *tex, const AVFrame *frame) {}tex->texture_size = size;- tex->texture_type = SC_TEXTURE_TYPE_FRAME;LOGI("Texture: %" PRIu16 "x%" PRIu16, size.width, size.height);}assert(tex->texture);- assert(tex->texture_type == SC_TEXTURE_TYPE_FRAME);bool ok = SDL_UpdateYUVTexture(tex->texture, NULL,frame->data[0], frame->linesize[0],@@ -229,25 +226,6 @@ sc_texture_set_from_frame(struct sc_texture *tex, const AVFrame *frame) {return true;}-bool-sc_texture_set_from_surface(struct sc_texture *tex, SDL_Surface *surface) {- if (tex->texture) {- SDL_DestroyTexture(tex->texture);- }-- tex->texture = SDL_CreateTextureFromSurface(tex->renderer, surface);- if (!tex->texture) {- LOGE("Could not create texture: %s", SDL_GetError());- return false;- }-- tex->texture_size.width = surface->w;- tex->texture_size.height = surface->h;- tex->texture_type = SC_TEXTURE_TYPE_ICON;-- return true;-}-voidsc_texture_reset(struct sc_texture *tex) {if (tex->texture) {diff --git a/app/src/texture.h b/app/src/texture.hindex 44b0e1c7..a23d8678 100644--- a/app/src/texture.h+++ b/app/src/texture.h@@ -11,17 +11,11 @@#include "coords.h"#include "opengl.h"-enum sc_texture_type {- SC_TEXTURE_TYPE_FRAME,- SC_TEXTURE_TYPE_ICON,-};-struct sc_texture {SDL_Renderer *renderer; // owned by the callerSDL_Texture *texture;// Only valid if texture != NULLstruct sc_size texture_size;- enum sc_texture_type texture_type;struct sc_opengl gl;@@ -36,10 +30,7 @@ voidsc_texture_destroy(struct sc_texture *tex);bool-sc_texture_set_from_frame(struct sc_texture *tex, const AVFrame *frame);--bool-sc_texture_set_from_surface(struct sc_texture *tex, SDL_Surface *surface);+sc_texture_update(struct sc_texture *tex, const AVFrame *frame);voidsc_texture_reset(struct sc_texture *tex);