1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
From 755fae82a31105808ec978855803f52affa01f87 Mon Sep 17 00:00:00 2001
From: mrgreywater <mr.greywater@googlemail.com>
Date: Fri, 19 Oct 2018 22:21:07 +0200
Subject: [PATCH] opengl-cb backward compatibility
---
src/player/mpvobject.cpp | 43 ++++++++++++++++++++++++++++++++++------
src/player/mpvobject.h | 15 +++++++++++++-
2 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp
index 2955063..31cdf73 100644
--- a/src/player/mpvobject.cpp
+++ b/src/player/mpvobject.cpp
@@ -48,16 +48,25 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
MpvRenderer(MpvObject *new_obj)
: obj{new_obj}
{
-
+#ifdef USE_OPENGL_CB
+ int r = mpv_opengl_cb_init_gl(obj->mpv_gl, nullptr, &get_proc_address_mpv, nullptr);
+ if (r < 0)
+ throw std::runtime_error("could not initialize OpenGL");
+#endif
}
virtual ~MpvRenderer()
- {}
+ {
+#ifdef USE_OPENGL_CB
+ mpv_opengl_cb_uninit_gl(obj->mpv_gl);
+#endif
+ }
// This function is called when a new FBO is needed.
// This happens on the initial frame.
QOpenGLFramebufferObject * createFramebufferObject(const QSize &size)
{
+#ifndef USE_OPENGL_CB
// init mpv_gl:
if (!obj->mpv_gl)
{
@@ -72,15 +81,17 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
throw std::runtime_error("failed to initialize mpv GL context");
mpv_render_context_set_update_callback(obj->mpv_gl, on_mpv_redraw, obj);
}
-
+#endif
return QQuickFramebufferObject::Renderer::createFramebufferObject(size);
}
void render()
{
obj->window()->resetOpenGLState();
-
QOpenGLFramebufferObject *fbo = framebufferObject();
+#ifdef USE_OPENGL_CB
+ mpv_opengl_cb_draw(obj->mpv_gl, fbo->handle(), fbo->width(), fbo->height());
+#else
mpv_opengl_fbo mpfbo{static_cast<int>(fbo->handle()), fbo->width(), fbo->height(), 0};
int flip_y{0};
@@ -97,7 +108,7 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
// See render_gl.h on what OpenGL environment mpv expects, and
// other API details.
mpv_render_context_render(obj->mpv_gl, params);
-
+#endif
obj->window()->resetOpenGLState();
}
};
@@ -115,11 +126,27 @@ MpvObject::MpvObject(QQuickItem * parent)
mpv_set_option_string(mpv, "msg-level", "all=v");
#endif
+#ifdef USE_OPENGL_CB
+ mpv_set_option_string(mpv, "vo", "opengl-cb");
+#endif
+
if (mpv_initialize(mpv) < 0)
throw std::runtime_error("could not initialize mpv context");
// Request hw decoding, just for testing.
- mpv::qt::set_option_variant(mpv, "hwdec", "auto");
+ mpv_set_option_string(mpv, "hwdec", "auto");
+
+#ifdef USE_OPENGL_CB
+ // Setup the callback that will make QtQuick update and redraw if there
+ // is a new video frame. Use a queued connection: this makes sure the
+ // doUpdate() function is run on the GUI thread.
+ mpv_gl = (mpv_opengl_cb_context *)mpv_get_sub_api(mpv, MPV_SUB_API_OPENGL_CB);
+
+ if (!mpv_gl)
+ throw std::runtime_error("OpenGL not compiled in");
+
+ mpv_opengl_cb_set_update_callback(mpv_gl, MpvObject::on_update, (void *)this);
+#endif
mpv_set_wakeup_callback(mpv, wakeup, this);
@@ -130,7 +157,11 @@ MpvObject::~MpvObject()
{
if (mpv_gl) // only initialized if something got drawn
{
+#ifdef USE_OPENGL_CB
+ mpv_opengl_cb_set_update_callback(mpv_gl, nullptr, nullptr);
+#else
mpv_render_context_free(mpv_gl);
+#endif
}
mpv_terminate_destroy(mpv);
diff --git a/src/player/mpvobject.h b/src/player/mpvobject.h
index 0ec0b7a..eeaa250 100644
--- a/src/player/mpvobject.h
+++ b/src/player/mpvobject.h
@@ -6,8 +6,21 @@
#include <QtQuick/QQuickFramebufferObject>
+
#include <mpv/client.h>
+
+#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(1, 28)
+#define USE_OPENGL_CB
+#endif
+
+#ifdef USE_OPENGL_CB
+#include <mpv/opengl_cb.h>
+typedef mpv_opengl_cb_context mpv_context;
+#else
#include <mpv/render_gl.h>
+typedef mpv_render_context mpv_context;
+#endif
+
#include <mpv/qthelper.hpp>
class MpvRenderer;
@@ -17,7 +30,7 @@ class MpvObject : public QQuickFramebufferObject
Q_OBJECT
mpv_handle *mpv;
- mpv_render_context *mpv_gl;
+ mpv_context *mpv_gl;
std::vector<std::unique_ptr<QJSValue>> callbacks;
friend class MpvRenderer;
|
GitWeb