From bf3fc61ef770e676b3326aac84c5a7169ef5c684 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Sat, 4 Dec 2021 23:05:12 +0100 Subject: [PATCH] Bad idea: do not use nvidia hardware decoder for jpeg just crashes without reason and not very useful --- GstToolkit.cpp | 4 ++-- MediaPlayer.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/GstToolkit.cpp b/GstToolkit.cpp index 4e01c1a..c2d9472 100644 --- a/GstToolkit.cpp +++ b/GstToolkit.cpp @@ -214,10 +214,10 @@ string GstToolkit::gst_version() #if GST_GL_HAVE_PLATFORM_GLX // https://gstreamer.freedesktop.org/documentation/nvcodec/index.html?gi-language=c#plugin-nvcodec // list ordered with higher priority first (e.g. nvidia proprietary before vaapi) - const char *plugins[12] = { "nvh264dec", "nvh265dec", "nvmpeg2videodec", "nvmpeg4videodec", "nvvp8dec", "nvvp9dec", "nvjpegdec", + const char *plugins[11] = { "nvh264dec", "nvh265dec", "nvmpeg2videodec", "nvmpeg4videodec", "nvvp8dec", "nvvp9dec", "vaapidecodebin", "omxmpeg4videodec", "omxmpeg2dec", "omxh264dec", "vdpaumpegdec", }; - const int N = 12; + const int N = 11; #elif GST_GL_HAVE_PLATFORM_CGL const char *plugins[2] = { "vtdec_hw", "vtdechw" }; const int N = 2; diff --git a/MediaPlayer.cpp b/MediaPlayer.cpp index 9695cc1..efe9502 100644 --- a/MediaPlayer.cpp +++ b/MediaPlayer.cpp @@ -854,8 +854,6 @@ void MediaPlayer::init_texture(guint index) // initialize decoderName once Log::Info("MediaPlayer %s Uses %s decoding and OpenGL PBO texturing.", std::to_string(id_).c_str(), decoderName().c_str()); } - else - Log::Info("MediaPlayer %s Uses %s decoding.", std::to_string(id_).c_str(), decoderName().c_str()); glBindTexture(GL_TEXTURE_2D, 0); }