Skip to content
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

Jump to bottom

Replace opengl-cb to render-gl #38

Merged
merged 4 commits into from
Jan 1, 2019
Merged

Replace opengl-cb to render-gl #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
478e6c4
Replace opengl-cb to render-gl
Oct 4, 2018
630db73
Add get_property_async
Oct 4, 2018
37d914a
Enable hwdec in example
Oct 4, 2018
2bcfe3f
Fix quotes
Kagami Jan 1, 2019
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
3 changes: 2 additions & 1 deletion example/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class Main extends React.PureComponent {
this.mpv = mpv;
const observe = mpv.observe.bind(mpv);
["pause", "time-pos", "duration", "eof-reached"].forEach(observe);
this.mpv.property("hwdec", "auto");
this.mpv.command("loadfile", path.join(__dirname, "tos.mkv"));
}
handlePropertyChange(name, value) {
Expand Down Expand Up @@ -103,7 +104,7 @@ class Main extends React.PureComponent {
/>
<div className="controls">
<button className="control" onClick={this.togglePause}>
{this.state.pause ? "▶" : "▮▮"}
{this.state.pause ? "▶" : "❚❚"}
</button>
<button className="control" onClick={this.handleStop}>■</button>
<input
Expand Down
43 changes: 28 additions & 15 deletions index.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <ppapi/lib/gl/gles2/gl2ext_ppapi.h>
#include <ppapi/utility/completion_callback_factory.h>
#include <mpv/client.h>
#include <mpv/opengl_cb.h>
#include <mpv/render_gl.h>

// Fix for MSVS.
#ifdef PostMessage
Expand Down Expand Up @@ -120,7 +120,7 @@ class MPVInstance : public pp::Instance {
virtual ~MPVInstance() {
if (mpv_gl_) {
glSetCurrentContextPPAPI(context_.pp_resource());
mpv_opengl_cb_uninit_gl(mpv_gl_);
mpv_render_context_free(mpv_gl_);
}
mpv_terminate_destroy(mpv_);
}
Expand Down Expand Up @@ -192,6 +192,9 @@ class MPVInstance : public pp::Instance {
} else if (type == "observe_property") {
std::string name = data.AsString();
mpv_observe_property(mpv_, 0, name.c_str(), MPV_FORMAT_NODE);
} else if (type == "get_property_async") {
std::string name = data.AsString();
mpv_get_property_async(mpv_, 0, name.c_str(), MPV_FORMAT_NODE);
}
}

Expand Down Expand Up @@ -225,7 +228,8 @@ class MPVInstance : public pp::Instance {
mpv_event* event = mpv_wait_event(mpv_, 0);
// printf("@@@ EVENT %d\n", event->event_id);
if (event->event_id == MPV_EVENT_NONE) break;
if (event->event_id == MPV_EVENT_PROPERTY_CHANGE) {
if (event->event_id == MPV_EVENT_PROPERTY_CHANGE ||
event->event_id == MPV_EVENT_GET_PROPERTY_REPLY) {
HandleMPVPropertyChange(static_cast<mpv_event_property*>(event->data));
}
}
Expand Down Expand Up @@ -300,17 +304,17 @@ class MPVInstance : public pp::Instance {
if (mpv_initialize(mpv_) < 0)
DIE("mpv init failed");

mpv_gl_ = static_cast<mpv_opengl_cb_context*>(
mpv_get_sub_api(mpv_, MPV_SUB_API_OPENGL_CB));
if (!mpv_gl_)
DIE("failed to create mpv GL API handle");

glSetCurrentContextPPAPI(context_.pp_resource());
if (mpv_opengl_cb_init_gl(mpv_gl_, NULL, GetProcAddressMPV, NULL) < 0)
DIE("failed to initialize mpv GL context");

if (mpv_set_option_string(mpv_, "vo", "opengl-cb") < 0)
DIE("failed to set VO");
mpv_opengl_init_params gl_init_params{GetProcAddressMPV, nullptr, nullptr};
mpv_render_param params[] = {
{MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
{MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
{MPV_RENDER_PARAM_INVALID, nullptr}
};

if (mpv_render_context_create(&mpv_gl_, mpv_, params) < 0)
DIE("failed to initialize mpv GL context");

// Some convenient defaults. Can be always changed on ready event.
mpv_set_option_string(mpv_, "stop-playback-on-init-failure", "no");
Expand All @@ -325,7 +329,7 @@ class MPVInstance : public pp::Instance {

void LoadMPV() {
mpv_set_wakeup_callback(mpv_, HandleMPVWakeup, this);
mpv_opengl_cb_set_update_callback(mpv_gl_, HandleMPVUpdate, this);
mpv_render_context_set_update_callback(mpv_gl_, HandleMPVUpdate, this);
PostData("ready", Var::Null());
}

Expand All @@ -344,7 +348,16 @@ class MPVInstance : public pp::Instance {
// XXX(Kagami): Race condition if another plugin sets different
// context in between calls?
glSetCurrentContextPPAPI(context_.pp_resource());
mpv_opengl_cb_draw(mpv_gl_, 0, width_, -height_);

mpv_opengl_fbo mpfbo{static_cast<int>(0), width_, height_, 0};
int flip_y{1};
mpv_render_param params[] = {
{MPV_RENDER_PARAM_OPENGL_FBO, &mpfbo},
{MPV_RENDER_PARAM_FLIP_Y, &flip_y},
{MPV_RENDER_PARAM_INVALID, nullptr}
};

mpv_render_context_render(mpv_gl_, params);
context_.SwapBuffers(
callback_factory_.NewCallback(&MPVInstance::PaintFinished));
}
Expand All @@ -358,7 +371,7 @@ class MPVInstance : public pp::Instance {
pp::CompletionCallbackFactory<MPVInstance> callback_factory_;
pp::Graphics3D context_;
mpv_handle* mpv_;
mpv_opengl_cb_context* mpv_gl_;
mpv_render_context* mpv_gl_;
int32_t width_;
int32_t height_;
bool gl_ready_;
Expand Down