Display and control your Android device
Use the GPU of the renderer for VA-API decoding
Romain Vimontfd583a4e94e5
diff --git a/app/src/egl.c b/app/src/egl.cindex 08e5a354..0e6ddad1 100644--- a/app/src/egl.c+++ b/app/src/egl.c@@ -68,6 +68,23 @@ sc_egl_init(struct sc_egl *egl) {SDL_GL_GetProcAddress("glEGLImageTargetTexture2DOES");}+ // EGL_EXT_device_query is a client extension (not specific to a display)+ const char *client_extensions =+ egl->QueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);++ egl->QueryDisplayAttribEXT = NULL;+ egl->QueryDeviceStringEXT = NULL;+ if (client_extensions && sc_egl_has_extension(client_extensions,+ "EGL_EXT_device_query")) {+ egl->QueryDisplayAttribEXT = (PFNEGLQUERYDISPLAYATTRIBEXTPROC)+ SDL_EGL_GetProcAddress("eglQueryDisplayAttribEXT");+ assert(egl->QueryDisplayAttribEXT);++ egl->QueryDeviceStringEXT = (PFNEGLQUERYDEVICESTRINGEXTPROC)+ SDL_EGL_GetProcAddress("eglQueryDeviceStringEXT");+ assert(egl->QueryDeviceStringEXT);+ }+egl->has_dma_buf_import =sc_egl_has_extension(extensions, "EGL_EXT_image_dma_buf_import");egl->has_dma_buf_import_modifiers =@@ -77,6 +94,33 @@ sc_egl_init(struct sc_egl *egl) {return true;}+const char *+sc_egl_get_drm_render_node(struct sc_egl *egl) {+ if (!egl->QueryDisplayAttribEXT || !egl->QueryDeviceStringEXT) {+ return NULL;+ }++ EGLAttrib attrib;+ if (!egl->QueryDisplayAttribEXT(egl->display, EGL_DEVICE_EXT, &attrib)) {+ return NULL;+ }++ EGLDeviceEXT device = (EGLDeviceEXT) attrib;+ if (device == EGL_NO_DEVICE_EXT) {+ return NULL;+ }++ const char *extensions = egl->QueryDeviceStringEXT(device, EGL_EXTENSIONS);+ if (!extensions+ || !sc_egl_has_extension(extensions,+ "EGL_EXT_device_drm_render_node")) {+ return NULL;+ }++ // May be NULL if the device has no render node+ return egl->QueryDeviceStringEXT(device, EGL_DRM_RENDER_NODE_FILE_EXT);+}+EGLImageKHRsc_egl_create_image_dma_buf(struct sc_egl *egl, uint32_t drm_format,int width, int height,diff --git a/app/src/egl.h b/app/src/egl.hindex d9d5d91f..eeefd8b3 100644--- a/app/src/egl.h+++ b/app/src/egl.h@@ -28,6 +28,10 @@ struct sc_egl {PFNEGLCREATEIMAGEKHRPROC CreateImageKHR;PFNEGLDESTROYIMAGEKHRPROC DestroyImageKHR;+ // EGL_EXT_device_query (NULL if unsupported)+ PFNEGLQUERYDISPLAYATTRIBEXTPROC QueryDisplayAttribEXT;+ PFNEGLQUERYDEVICESTRINGEXTPROC QueryDeviceStringEXT;+// GL_OES_EGL_image, the OpenGL side of EGLImage (NULL if unsupported)PFNGLEGLIMAGETARGETTEXTURE2DOESPROC EGLImageTargetTexture2DOES;@@ -54,6 +58,15 @@ struct sc_egl_dma_buf_plane {boolsc_egl_init(struct sc_egl *egl);+/**+ * Return the DRM render node of the device used by the EGL display (for example+ * "/dev/dri/renderD128")+ *+ * The string is owned by EGL. Return NULL if it is unknown.+ */+const char *+sc_egl_get_drm_render_node(struct sc_egl *egl);+/*** Import a single-plane DMA-BUF as an EGLImage*diff --git a/app/src/hwdec.c b/app/src/hwdec.cindex edbdbe64..9312fb20 100644--- a/app/src/hwdec.c+++ b/app/src/hwdec.c@@ -73,7 +73,8 @@ sc_hwdec_init_d3d11va(struct sc_hwdec *hwdec, SDL_Renderer *renderer) {boolsc_hwdec_init(struct sc_hwdec *hwdec, enum AVHWDeviceType hw_type,- bool hw_forced, SDL_Renderer *renderer) {+ const char *hw_device, bool hw_forced, SDL_Renderer *renderer) {+ (void) hw_device; // only used by some hardware decoders(void) renderer; // only used by some hardware decodershwdec->hw_type = hw_type;@@ -85,8 +86,9 @@ sc_hwdec_init(struct sc_hwdec *hwdec, enum AVHWDeviceType hw_type,break;#ifdef HAVE_VAAPIcase AV_HWDEVICE_TYPE_VAAPI: {+ LOGD("VA-API device: %s", hw_device ? hw_device : "(default)");int ret = av_hwdevice_ctx_create(&hwdec->hw_device_ctx, hw_type,- NULL, NULL, 0);+ hw_device, NULL, 0);if (ret < 0) {LOGE("Could not create VA-API device: %s", av_err2str(ret));return false;diff --git a/app/src/hwdec.h b/app/src/hwdec.hindex 692a58cd..f4b09c96 100644--- a/app/src/hwdec.h+++ b/app/src/hwdec.h@@ -22,7 +22,7 @@ struct sc_hwdec {boolsc_hwdec_init(struct sc_hwdec *hwdec, enum AVHWDeviceType hw_type,- bool hw_forced, SDL_Renderer *renderer);+ const char *hw_device, bool hw_forced, SDL_Renderer *renderer);const AVCodec *sc_hwdec_find_decoder(struct sc_hwdec *hwdec, enum AVCodecID codec_id);diff --git a/app/src/interop/interop.h b/app/src/interop/interop.hindex fa5a4395..9bbf3b80 100644--- a/app/src/interop/interop.h+++ b/app/src/interop/interop.h@@ -18,6 +18,7 @@ struct sc_interop {const char *name;enum AVHWDeviceType hw_type;+ const char *hw_device;enum AVPixelFormat pix_fmt;SDL_Texture *texture;diff --git a/app/src/interop/interop_d3d11va.c b/app/src/interop/interop_d3d11va.cindex 90b9d1e4..993b628d 100644--- a/app/src/interop/interop_d3d11va.c+++ b/app/src/interop/interop_d3d11va.c@@ -188,6 +188,7 @@ sc_interop_d3d11va_new(SDL_Renderer *renderer) {d3d11va->interop.name = "d3d11va";d3d11va->interop.hw_type = AV_HWDEVICE_TYPE_D3D11VA;+ d3d11va->interop.hw_device = NULL;d3d11va->interop.pix_fmt = AV_PIX_FMT_D3D11;d3d11va->interop.texture = NULL;d3d11va->interop.ops = &ops;diff --git a/app/src/interop/interop_software.c b/app/src/interop/interop_software.cindex cccc6dbd..2e643df0 100644--- a/app/src/interop/interop_software.c+++ b/app/src/interop/interop_software.c@@ -170,6 +170,7 @@ sc_interop_software_new(SDL_Renderer *renderer, struct sc_opengl *gl,sw->interop.name = "software";sw->interop.hw_type = AV_HWDEVICE_TYPE_NONE;+ sw->interop.hw_device = NULL;sw->interop.pix_fmt = AV_PIX_FMT_YUV420P;sw->interop.texture = NULL;sw->interop.ops = &ops;diff --git a/app/src/interop/interop_vaapi.c b/app/src/interop/interop_vaapi.cindex 76f323ad..e1a05f43 100644--- a/app/src/interop/interop_vaapi.c+++ b/app/src/interop/interop_vaapi.c@@ -340,6 +340,8 @@ sc_interop_vaapi_new(SDL_Renderer *renderer, struct sc_opengl *gl,vaapi->interop.name = "vaapi";vaapi->interop.hw_type = AV_HWDEVICE_TYPE_VAAPI;+ // Decode on the GPU used by the renderer+ vaapi->interop.hw_device = sc_egl_get_drm_render_node(&vaapi->egl);vaapi->interop.pix_fmt = AV_PIX_FMT_VAAPI;vaapi->interop.texture = NULL;vaapi->interop.ops = &ops;diff --git a/app/src/interop/interop_videotoolbox.c b/app/src/interop/interop_videotoolbox.cindex 74f94c25..0b7a979f 100644--- a/app/src/interop/interop_videotoolbox.c+++ b/app/src/interop/interop_videotoolbox.c@@ -144,6 +144,7 @@ sc_interop_videotoolbox_new(SDL_Renderer *renderer) {vt->interop.name = "videotoolbox";vt->interop.hw_type = AV_HWDEVICE_TYPE_VIDEOTOOLBOX;+ vt->interop.hw_device = NULL;vt->interop.pix_fmt = AV_PIX_FMT_VIDEOTOOLBOX;vt->interop.texture = NULL;vt->interop.ops = &ops;diff --git a/app/src/scrcpy.c b/app/src/scrcpy.cindex 68e074e8..0967e5da 100644--- a/app/src/scrcpy.c+++ b/app/src/scrcpy.c@@ -338,14 +338,16 @@ static boolsc_init_video_hwdec(struct sc_hwdec *hwdec, enum sc_hwdec_mode mode,struct sc_screen *screen) {enum AVHWDeviceType hw_type = AV_HWDEVICE_TYPE_NONE;+ const char *hw_device = NULL;SDL_Renderer *renderer = NULL;if (screen) {hw_type = sc_screen_get_hw_type(screen);+ hw_device = sc_screen_get_hw_device(screen);renderer = screen->renderer;}bool hw_forced = hw_type != AV_HWDEVICE_TYPE_NONE&& mode != SC_HWDEC_MODE_AUTO;- if (sc_hwdec_init(hwdec, hw_type, hw_forced, renderer)) {+ if (sc_hwdec_init(hwdec, hw_type, hw_device, hw_forced, renderer)) {return true;}@@ -368,7 +370,7 @@ sc_init_video_hwdec(struct sc_hwdec *hwdec, enum sc_hwdec_mode mode,}// Initialize software decoder- return sc_hwdec_init(hwdec, AV_HWDEVICE_TYPE_NONE, false, NULL);+ return sc_hwdec_init(hwdec, AV_HWDEVICE_TYPE_NONE, NULL, false, NULL);}enum scrcpy_exit_codediff --git a/app/src/screen.h b/app/src/screen.hindex 9b641542..ffa03608 100644--- a/app/src/screen.h+++ b/app/src/screen.h@@ -216,6 +216,11 @@ sc_screen_get_hw_type(struct sc_screen *screen) {return sc_texture_get_hw_type(&screen->tex);}+static inline const char *+sc_screen_get_hw_device(struct sc_screen *screen) {+ return sc_texture_get_hw_device(&screen->tex);+}+static inline boolsc_screen_disable_hwdec(struct sc_screen *screen) {return sc_texture_disable_hwdec(&screen->tex);diff --git a/app/src/texture.c b/app/src/texture.cindex acfd2f05..cc5cd58e 100644--- a/app/src/texture.c+++ b/app/src/texture.c@@ -72,6 +72,11 @@ sc_texture_get_hw_type(struct sc_texture *tex) {return tex->interop->hw_type;}+const char *+sc_texture_get_hw_device(struct sc_texture *tex) {+ return tex->interop->hw_device;+}+struct sc_sizesc_texture_get_frame_size(struct sc_texture *tex) {assert(tex->interop && tex->interop->texture);diff --git a/app/src/texture.h b/app/src/texture.hindex f450355e..7f5fd339 100644--- a/app/src/texture.h+++ b/app/src/texture.h@@ -46,6 +46,9 @@ sc_texture_reset(struct sc_texture *tex);enum AVHWDeviceTypesc_texture_get_hw_type(struct sc_texture *tex);+const char *+sc_texture_get_hw_device(struct sc_texture *tex);+boolsc_texture_disable_hwdec(struct sc_texture *tex);