Commit 254a5ee2 authored by David Fuhrmann's avatar David Fuhrmann

Added coreanimation opengl layer vout module

This module is used for video output with the windowed npapi plugin.

close #8506
parent 9fc66e69
...@@ -53,6 +53,7 @@ Muxers: ...@@ -53,6 +53,7 @@ Muxers:
Video Output: Video Output:
* Direct rendering and filtering for VDPAU hardware acceleration * Direct rendering and filtering for VDPAU hardware acceleration
* New CoreGraphics video output module for NPAPI plugins * New CoreGraphics video output module for NPAPI plugins
* New CoreAnimation OpenGL video output module for NPAPI plugins
* New OpenGL ES 2.0 through EGL video output module for Android * New OpenGL ES 2.0 through EGL video output module for Android
* New Android native window provider module * New Android native window provider module
* Direct rendering for MediaCodec Android hardware acceleration * Direct rendering for MediaCodec Android hardware acceleration
......
...@@ -59,6 +59,7 @@ $Id$ ...@@ -59,6 +59,7 @@ $Id$
* caca: color ASCII art video output using libcaca * caca: color ASCII art video output using libcaca
* caf: CAF demuxer * caf: CAF demuxer
* canvas: Automatically resize and padd a video * canvas: Automatically resize and padd a video
* caopengllayer: CoreAnimation OpenGL video output
* cc: CC 608/708 subtitles decoder * cc: CC 608/708 subtitles decoder
* cdda: input module to read audio CDs * cdda: input module to read audio CDs
* cdg: CD-G decoder * cdg: CD-G decoder
......
...@@ -22,6 +22,14 @@ libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL) ...@@ -22,6 +22,14 @@ libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL)
vout_LTLIBRARIES += libdecklinkoutput_plugin.la vout_LTLIBRARIES += libdecklinkoutput_plugin.la
endif endif
if HAVE_DARWIN
libcaopengllayer_plugin_la_SOURCES = caopengllayer.m opengl.c opengl.h
libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libcaopengllayer_plugin_la_LIBADD = $(GL_LIBS)
libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore
vout_LTLIBRARIES += libcaopengllayer_plugin.la
endif
### OpenGL ### ### OpenGL ###
# TODO: merge all three source files (?) # TODO: merge all three source files (?)
libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c
......
This diff is collapsed.
...@@ -1140,6 +1140,7 @@ modules/video_output/android/nativewindow.c ...@@ -1140,6 +1140,7 @@ modules/video_output/android/nativewindow.c
modules/video_output/android/opaque.c modules/video_output/android/opaque.c
modules/video_output/android/surface.c modules/video_output/android/surface.c
modules/video_output/caca.c modules/video_output/caca.c
modules/video_output/caopengllayer.m
modules/video_output/coregraphicslayer.m modules/video_output/coregraphicslayer.m
modules/video_output/decklink.cpp modules/video_output/decklink.cpp
modules/video_output/directfb.c modules/video_output/directfb.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment