Skip to content

[video_player] Fix to handle GstGLContext in the correct way #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
makotosato-at wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[video_player] Fix to handle GstGLContext in the correct way #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions packages/video_player/elinux/gst_video_player.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ GstVideoPlayer::GstVideoPlayer(
GstVideoPlayer::~GstVideoPlayer() {
#ifdef USE_EGL_IMAGE_DMABUF
UnrefEGLImage();
UnrefEGLContext();
#endif // USE_EGL_IMAGE_DMABUF
Stop();
DestroyPipeline();
Expand Down Expand Up @@ -198,16 +199,25 @@ void* GstVideoPlayer::GetEGLImage(void* egl_display, void* egl_context) {
GstMemory* memory = gst_buffer_peek_memory(gst_.buffer, 0);
if (gst_is_dmabuf_memory(memory)) {
UnrefEGLImage();

gint fd = gst_dmabuf_memory_get_fd(memory);
gst_gl_display_egl_ =
gst_gl_display_egl_new_with_egl_display(reinterpret_cast<gpointer>(egl_display));
gst_gl_ctx_ = gst_gl_context_new_wrapped(
GST_GL_DISPLAY_CAST(gst_gl_display_egl_), reinterpret_cast<guintptr>(egl_context),
GST_GL_PLATFORM_EGL, GST_GL_API_GLES2);
if (egl_context_ != egl_context) {
UnrefEGLContext();
gst_gl_display_egl_ =
gst_gl_display_egl_new_with_egl_display(reinterpret_cast<gpointer>(egl_display));
gst_gl_ctx_ = gst_gl_context_new(GST_GL_DISPLAY_CAST(gst_gl_display_egl_));
gst_gl_ctx_wrapped_ = gst_gl_context_new_wrapped(
GST_GL_DISPLAY_CAST(gst_gl_display_egl_), reinterpret_cast<guintptr>(egl_context),
GST_GL_PLATFORM_EGL, GST_GL_API_GLES2);
if (!gst_gl_context_create(gst_gl_ctx_, gst_gl_ctx_wrapped_, NULL)) {
UnrefEGLContext();
std::cerr << "Failed to create a gst_gl_context" << std::endl;
return nullptr;
}
egl_context_ = egl_context;
}

gst_gl_context_activate(gst_gl_ctx_, TRUE);

gint fd = gst_dmabuf_memory_get_fd(memory);
gst_egl_image_ =
gst_egl_image_from_dmabuf(gst_gl_ctx_, fd, &gst_video_info_, 0, 0);
return reinterpret_cast<void*>(gst_egl_image_get_image(gst_egl_image_));
Expand All @@ -218,10 +228,21 @@ void* GstVideoPlayer::GetEGLImage(void* egl_display, void* egl_context) {
void GstVideoPlayer::UnrefEGLImage() {
if (gst_egl_image_) {
gst_egl_image_unref(gst_egl_image_);
gst_object_unref(gst_gl_ctx_);
gst_object_unref(gst_gl_display_egl_);
gst_egl_image_ = NULL;
}
}

void GstVideoPlayer::UnrefEGLContext() {
if (gst_gl_ctx_wrapped_) {
gst_object_unref(gst_gl_ctx_wrapped_);
gst_gl_ctx_wrapped_ = NULL;
}
if (gst_gl_ctx_) {
gst_gl_context_destroy(gst_gl_ctx_);
gst_gl_ctx_ = NULL;
}
if (gst_gl_display_egl_) {
gst_object_unref(gst_gl_display_egl_);
gst_gl_display_egl_ = NULL;
}
}
Expand Down
3 changes: 3 additions & 0 deletions packages/video_player/elinux/gst_video_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class GstVideoPlayer {
void GetVideoSize(int32_t& width, int32_t& height);
#ifdef USE_EGL_IMAGE_DMABUF
void UnrefEGLImage();
void UnrefEGLContext();
#endif // USE_EGL_IMAGE_DMABUF

GstVideoElements gst_;
Expand All @@ -89,7 +90,9 @@ class GstVideoPlayer {
GstVideoInfo gst_video_info_;
GstEGLImage* gst_egl_image_ = NULL;
GstGLContext* gst_gl_ctx_ = NULL;
GstGLContext* gst_gl_ctx_wrapped_ = NULL;
GstGLDisplayEGL* gst_gl_display_egl_ = NULL;
void* egl_context_ = NULL;
#endif // USE_EGL_IMAGE_DMABUF
};

Expand Down