Display and control your Android device
Improve color space conversion
Romain Vimontf8e0b9be4bca
diff --git a/app/src/display.c b/app/src/display.cindex c84971a0..5c711345 100644--- a/app/src/display.c+++ b/app/src/display.c@@ -125,14 +125,26 @@ sc_display_destroy(struct sc_display *display) {}static SDL_YUV_CONVERSION_MODE-sc_display_to_sdl_color_range(enum AVColorRange color_range) {- return color_range == AVCOL_RANGE_JPEG ? SDL_YUV_CONVERSION_JPEG- : SDL_YUV_CONVERSION_AUTOMATIC;+sc_display_to_sdl_color_mode(enum AVColorSpace color_space,+ enum AVColorRange color_range) {+ switch (color_space) {+ case AVCOL_SPC_BT709:+ return SDL_YUV_CONVERSION_BT709;+ case AVCOL_SPC_BT470BG:+ case AVCOL_SPC_SMPTE170M:+ return SDL_YUV_CONVERSION_BT601;+ default:+ if (color_range == AVCOL_RANGE_JPEG) {+ return SDL_YUV_CONVERSION_JPEG;+ }+ return SDL_YUV_CONVERSION_AUTOMATIC;+ }}static SDL_Texture *sc_display_create_texture(struct sc_display *display,- struct sc_size size, enum AVColorRange color_range) {+ struct sc_size size, enum AVColorSpace color_space,+ enum AVColorRange color_range) {SDL_Renderer *renderer = display->renderer;SDL_Texture *texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12,SDL_TEXTUREACCESS_STREAMING,@@ -156,9 +168,9 @@ sc_display_create_texture(struct sc_display *display,}// Configure YUV color range conversion- SDL_YUV_CONVERSION_MODE sdl_color_range =- sc_display_to_sdl_color_range(color_range);- SDL_SetYUVConversionMode(sdl_color_range);+ SDL_YUV_CONVERSION_MODE sdl_color_mode =+ sc_display_to_sdl_color_mode(color_space, color_range);+ SDL_SetYUVConversionMode(sdl_color_mode);return texture;}@@ -207,6 +219,7 @@ sc_display_apply_pending(struct sc_display *display) {display->texture =sc_display_create_texture(display,display->pending.texture.size,+ display->pending.texture.color_space,display->pending.texture.color_range);if (!display->texture) {return false;@@ -233,6 +246,7 @@ sc_display_apply_pending(struct sc_display *display) {static boolsc_display_prepare_texture_internal(struct sc_display *display,struct sc_size size,+ enum AVColorSpace color_space,enum AVColorRange color_range) {assert(size.width && size.height);@@ -240,7 +254,8 @@ sc_display_prepare_texture_internal(struct sc_display *display,SDL_DestroyTexture(display->texture);}- display->texture = sc_display_create_texture(display, size, color_range);+ display->texture =+ sc_display_create_texture(display, size, color_space, color_range);if (!display->texture) {return false;}@@ -251,8 +266,10 @@ sc_display_prepare_texture_internal(struct sc_display *display,enum sc_display_resultsc_display_prepare_texture(struct sc_display *display, struct sc_size size,+ enum AVColorSpace color_space,enum AVColorRange color_range) {- bool ok = sc_display_prepare_texture_internal(display, size, color_range);+ bool ok = sc_display_prepare_texture_internal(display, size, color_space,+ color_range);if (!ok) {sc_display_set_pending_texture(display, size, color_range);return SC_DISPLAY_RESULT_PENDING;diff --git a/app/src/display.h b/app/src/display.hindex d302a34e..c5f015ad 100644--- a/app/src/display.h+++ b/app/src/display.h@@ -33,6 +33,7 @@ struct sc_display {int8_t flags;struct {struct sc_size size;+ enum AVColorSpace color_space;enum AVColorRange color_range;} texture;AVFrame *frame;@@ -54,6 +55,7 @@ sc_display_destroy(struct sc_display *display);enum sc_display_resultsc_display_prepare_texture(struct sc_display *display, struct sc_size size,+ enum AVColorSpace color_space,enum AVColorRange color_range);enum sc_display_resultdiff --git a/app/src/screen.c b/app/src/screen.cindex 0d74cac7..fc4a22ff 100644--- a/app/src/screen.c+++ b/app/src/screen.c@@ -620,7 +620,7 @@ sc_screen_apply_frame(struct sc_screen *screen) {enum sc_display_result res =sc_display_prepare_texture(&screen->display, screen->frame_size,- frame->color_range);+ frame->colorspace, frame->color_range);if (res == SC_DISPLAY_RESULT_ERROR) {return false;}