aljaz/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-12-18 22:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move video_buffer to screen

Browse Source 
The video buffer is now an internal detail of the screen component.

Since the screen is plugged to the decoder via the frame sink trait, the
decoder does not access to the video buffer anymore.
This commit is contained in:
Romain Vimont
2021-04-11 15:01:05 +02:00
parent 6f5ad21f57
commit e91acdb0c4
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/screen.c
View File

@@ -284,14 +284,12 @@ screen_frame_sink_close(struct sc_frame_sink *sink) {
static bool
screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
struct screen *screen = DOWNCAST(sink);
return video_buffer_push(screen->vb, frame);
return video_buffer_push(&screen->vb, frame);
}
bool
screen_init(struct screen *screen, struct video_buffer *vb,
struct fps_counter *fps_counter,
screen_init(struct screen *screen, struct fps_counter *fps_counter,
const struct screen_params *params) {
screen->vb = vb;
screen->fps_counter = fps_counter;
screen->resize_pending = false;
@@ -299,11 +297,17 @@ screen_init(struct screen *screen, struct video_buffer *vb,
screen->fullscreen = false;
screen->maximized = false;
bool ok = video_buffer_init(&screen->vb);
if (!ok) {
LOGE("Could not initialize video buffer");
return false;
}
static const struct video_buffer_callbacks cbs = {
.on_frame_available = on_frame_available,
.on_frame_skipped = on_frame_skipped,
};
video_buffer_set_consumer_callbacks(vb, &cbs, screen);
video_buffer_set_consumer_callbacks(&screen->vb, &cbs, screen);
screen->frame_size = params->frame_size;
screen->rotation = params->rotation;
@@ -349,6 +353,7 @@ screen_init(struct screen *screen, struct video_buffer *vb,
if (!screen->renderer) {
LOGC("Could not create renderer: %s", SDL_GetError());
SDL_DestroyWindow(screen->window);
video_buffer_destroy(&screen->vb);
return false;
}
@@ -400,6 +405,7 @@ screen_init(struct screen *screen, struct video_buffer *vb,
LOGC("Could not create texture: %s", SDL_GetError());
SDL_DestroyRenderer(screen->renderer);
SDL_DestroyWindow(screen->window);
video_buffer_destroy(&screen->vb);
return false;
}
@@ -409,6 +415,7 @@ screen_init(struct screen *screen, struct video_buffer *vb,
SDL_DestroyTexture(screen->texture);
SDL_DestroyRenderer(screen->renderer);
SDL_DestroyWindow(screen->window);
video_buffer_destroy(&screen->vb);
return false;
}
@@ -449,6 +456,7 @@ screen_destroy(struct screen *screen) {
SDL_DestroyTexture(screen->texture);
SDL_DestroyRenderer(screen->renderer);
SDL_DestroyWindow(screen->window);
video_buffer_destroy(&screen->vb);
}
static void
@@ -554,7 +562,7 @@ update_texture(struct screen *screen, const AVFrame *frame) {
static bool
screen_update_frame(struct screen *screen) {
av_frame_unref(screen->frame);
video_buffer_consume(screen->vb, screen->frame);
video_buffer_consume(&screen->vb, screen->frame);
AVFrame *frame = screen->frame;
fps_counter_add_rendered_frame(screen->fps_counter);