Skip to content

V
vlc-2-2
Commit 902cc2d4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Remove older iOS vout

parent f187b2ed
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 472 deletions
NEWS
View file @ 902cc2d4
Changes between 2.1.x and 2.2.0-git:
--------------------------------
Video Output:
* Direct rendering and filtering for VDPAU hardware acceleration
Removed modules:
* ios video output: use ios2
Changes between 2.0.x and 2.1.0:
--------------------------------
......
modules/LIST
View file @ 902cc2d4
......@@ -377,7 +377,6 @@ $Id$
* volume_neon: audio volume optimized for ARM NEON
* vorbis: a vorbis audio decoder/packetizer using the libvorbis library
* vout_ios2: iOS video provider using OpenGL ES 2
* vout_ios: iOS video output
* vout_macosx: Mac OS X OpenGL provider
* vout_sdl: video output module using the SDL library
* vsxu: audio visualization using Vovoid VSXu
......
modules/video_output/Modules.am
View file @ 902cc2d4
......@@ -7,7 +7,6 @@ SOURCES_directfb = directfb.c
SOURCES_vmem = vmem.c
SOURCES_yuv = yuv.c
SOURCES_vout_macosx = macosx.m opengl.h opengl.c
SOURCES_vout_ios = ios.m opengl.h opengl.c
SOURCES_vout_ios2 = ios2.m opengl.h opengl.c
SOURCES_android_surface = androidsurface.c
......
modules/video_output/ios.m deleted 100644 → 0
View file @ f187b2ed
/*****************************************************************************
* ios.m: iOS X OpenGLES provider
*****************************************************************************
* Copyright (C) 2010-2013 VLC Authors and VideoLAN
* $Id$
*
* Authors: Romain Goyet <romain.goyet at likid dot org>
* Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#import <UIKit/UIKit.h>
#import <QuartzCore/QuartzCore.h>
#import <dlfcn.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_opengl.h>
#include "opengl.h"
/**
* Forward declarations
*/
static int Open(vlc_object_t *);
static void Close(vlc_object_t *);
static picture_pool_t *Pool(vout_display_t *vd, unsigned requested_count);
static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture);
static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture);
static int Control (vout_display_t *vd, int query, va_list ap);
static void *OurGetProcAddress(vlc_gl_t *, const char *);
static int OpenglClean(vlc_gl_t *gl);
static void OpenglSwap(vlc_gl_t *gl);
/**
* Module declaration
*/
vlc_module_begin ()
/* Will be loaded even without interface module. see voutgl.m */
set_shortname("iOS")
set_description( N_("iOS OpenGL ES video output (requires UIView)"))
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT )
set_capability("vout display", 210)
set_callbacks(Open, Close)
add_shortcut("ios", "vout_ios")
vlc_module_end ()
@interface VLCOpenGLESVideoView : UIView
{
vout_display_t * _vd;
EAGLContext * _context;
GLuint _defaultFramebuffer;
GLuint _colorRenderbuffer;
BOOL _framebufferDirty;
}
- (id)initWithFrame:(CGRect)frame andVOutDisplay:(vout_display_t *)vd;
@property (readonly) EAGLContext * context;
@property (readonly) GLuint colorRenderbuffer;
- (void)setVoutDisplay:(vout_display_t *)vd;
- (void)cleanFramebuffer;
@end
struct vout_display_sys_t
{
VLCOpenGLESVideoView *glView;
UIView * container;
vlc_gl_t gl;
vout_display_opengl_t *vgl;
picture_pool_t *pool;
picture_t *current;
bool has_first_frame;
};
static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
{
VLC_UNUSED(gl);
return dlsym(RTLD_DEFAULT, name);
}
// Called from vout thread
static int Open(vlc_object_t *this)
{
vout_display_t *vd = (vout_display_t *)this;
vout_display_sys_t *sys = calloc(1, sizeof(*sys));
NSAutoreleasePool *nsPool = nil;
if (!sys)
return VLC_ENOMEM;
vd->sys = sys;
sys->pool = NULL;
sys->gl.sys = NULL;
/* Get the drawable object */
UIView * container = (UIView *)var_CreateGetAddress(vd, "drawable-nsobject");
if (![container isKindOfClass:[UIView class]]) {
msg_Dbg(vd, "Container isn't an UIView, passing over.");
goto error;
}
vout_display_DeleteWindow(vd, NULL);
/* This will be released in Close(), on
* main thread, after we are done using it. */
sys->container = [container retain];
/* Get our main view*/
nsPool = [[NSAutoreleasePool alloc] init];
msg_Dbg(vd, "Creating VLCOpenGLESVideoView");
sys->glView = [[VLCOpenGLESVideoView alloc] initWithFrame:[container bounds] andVOutDisplay:vd];
if (!sys->glView)
goto error;
/* We don't wait, that means that we'll have to be careful about releasing
* container.
* That's why we'll release on main thread in Close(). */
[container performSelectorOnMainThread:@selector(addSubview:) withObject:sys->glView waitUntilDone:NO];
[nsPool drain];
nsPool = nil;
/* Initialize common OpenGL video display */
sys->gl.lock = OpenglClean; // We don't do locking, but sometimes we need to cleanup the framebuffer
sys->gl.unlock = NULL;
sys->gl.swap = OpenglSwap;
sys->gl.getProcAddress = OurGetProcAddress;
sys->gl.sys = sys;
sys->vgl = vout_display_opengl_New(&vd->fmt, NULL, &sys->gl);
if (!sys->vgl)
{
sys->gl.sys = NULL;
goto error;
}
/* */
vout_display_info_t info = vd->info;
info.has_pictures_invalid = false;
/* Setup vout_display_t once everything is fine */
vd->info = info;
vd->pool = Pool;
vd->prepare = PictureRender;
vd->display = PictureDisplay;
vd->control = Control;
/* */
CGRect bounds = sys->glView.layer.bounds;
CGFloat scaleFactor = sys->glView.contentScaleFactor;
/* we need to multiply the bounds dimensions by the scaleFactor to be save for Retina Displays */
vout_display_SendEventFullscreen (vd, false);
vout_display_SendEventDisplaySize (vd, bounds.size.width * scaleFactor, bounds.size.height * scaleFactor, false);
return VLC_SUCCESS;
error:
[nsPool release];
Close(this);
return VLC_EGENERIC;
}
// Called from vout thread as well
void Close(vlc_object_t *this)
{
vout_display_t *vd = (vout_display_t *)this;
vout_display_sys_t *sys = vd->sys;
[sys->glView setVoutDisplay:nil];
var_Destroy(vd, "drawable-nsobject");
/* release on main thread as explained in Open() */
[(id)sys->container performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
[sys->glView performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:NO];
[sys->glView release];
if (sys->gl.sys != NULL)
vout_display_opengl_Delete(sys->vgl);
free (sys);
}
/*****************************************************************************
* vout display callbacks
*****************************************************************************/
static picture_pool_t *Pool(vout_display_t *vd, unsigned requested_count)
{
vout_display_sys_t *sys = vd->sys;
if (!sys->pool)
sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
assert(sys->pool);
return sys->pool;
}
static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
{
vout_display_sys_t *sys = vd->sys;
if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
vout_display_opengl_Prepare( sys->vgl, pic, subpicture );
}
}
static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
{
vout_display_sys_t *sys = vd->sys;
if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
vout_display_opengl_Display(sys->vgl, &vd->fmt );
}
picture_Release (pic);
sys->has_first_frame = true;
(void)subpicture;
}
static int Control (vout_display_t *vd, int query, va_list ap)
{
vout_display_sys_t *sys = vd->sys;
switch (query)
{
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
{
[sys->glView performSelectorOnMainThread:@selector(layoutSubviews) withObject:nil waitUntilDone:NO];
return VLC_SUCCESS;
}
case VOUT_DISPLAY_CHANGE_FULLSCREEN:
case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
{
return VLC_SUCCESS;
}
case VOUT_DISPLAY_HIDE_MOUSE:
return VLC_SUCCESS;
case VOUT_DISPLAY_GET_OPENGL:
{
vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
*gl = &sys->gl;
return VLC_SUCCESS;
}
case VOUT_DISPLAY_RESET_PICTURES:
assert (0);
default:
msg_Err (vd, "Unknown request in iOS vout display");
return VLC_EGENERIC;
}
}
/*****************************************************************************
* vout opengl callbacks
*****************************************************************************/
static int OpenglClean(vlc_gl_t *gl) {
vout_display_sys_t *sys = gl->sys;
[sys->glView cleanFramebuffer];
return 0;
}
static void OpenglSwap(vlc_gl_t *gl)
{
vout_display_sys_t *sys = gl->sys;
EAGLContext *context = [sys->glView context];
if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
[context presentRenderbuffer:GL_RENDERBUFFER];
}
}
/*****************************************************************************
* Our UIView object
* *ALL* OpenGL calls should happen in the render thread
*****************************************************************************/
@interface VLCOpenGLESVideoView (Private)
- (void)_createFramebuffer;
- (void)_updateViewportWithBackingWitdh:(GLuint)backingWidth andBackingHeight:(GLuint)backingHeight;
- (void)_destroyFramebuffer;
@end
@implementation VLCOpenGLESVideoView
@synthesize context=_context, colorRenderbuffer=_colorRenderbuffer;
#define VLCAssertMainThread() assert([[NSThread currentThread] isMainThread])
+ (Class)layerClass {
return [CAEAGLLayer class];
}
/**
* Gets called by the Open() method.
*/
- (id)initWithFrame:(CGRect)frame andVOutDisplay:(vout_display_t *)vd {
if (self = [super initWithFrame:frame]) {
_vd = vd;
CAEAGLLayer * eaglLayer = (CAEAGLLayer *)self.layer;
eaglLayer.opaque = TRUE;
eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat,
nil];
_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
NSAssert(_context && [EAGLContext setCurrentContext:_context], @"Creating context");
// This shouldn't need to be done on the main thread.
// Indeed, it works just fine from the render thread on iOS 3.2 to 4.1
// However, if you don't call it from the main thread, it doesn't work on iOS 4.2 beta 1
[self performSelectorOnMainThread:@selector(_createFramebuffer) withObject:nil waitUntilDone:YES];
_framebufferDirty = NO;
[self setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
}
return self;
}
- (void) dealloc
{
[_context release];
[super dealloc];
}
/**
* Gets called by the Close and Open methods.
* (Non main thread).
*/
- (void)setVoutDisplay:(vout_display_t *)aVd
{
@synchronized(self) {
_vd = aVd;
}
}
/**
* Method called by UIKit when we have been resized
*/
- (void)layoutSubviews {
// CAUTION : This is called from the main thread
_framebufferDirty = YES;
}
- (void)cleanFramebuffer {
if (_framebufferDirty) {
[self _destroyFramebuffer];
[self _createFramebuffer];
_framebufferDirty = NO;
}
}
/* we don't get the correct scale factor if we don't overwrite this method */
- (void) drawRect: (CGRect) rect
{
}
@end
@implementation VLCOpenGLESVideoView (Private)
- (void)_createFramebuffer {
msg_Dbg(_vd, "Creating framebuffer for layer %p with bounds (%.1f,%.1f,%.1f,%.1f)", self.layer, self.layer.bounds.origin.x, self.layer.bounds.origin.y, self.layer.bounds.size.width, self.layer.bounds.size.height);
[EAGLContext setCurrentContext:_context];
// Create default framebuffer object. The backing will be allocated for the current layer in -resizeFromLayer
glGenFramebuffers(1, &_defaultFramebuffer); // Generate one framebuffer, store it in _defaultFrameBuffer
glGenRenderbuffers(1, &_colorRenderbuffer);
glBindFramebuffer(GL_FRAMEBUFFER, _defaultFramebuffer);
glBindRenderbuffer(GL_RENDERBUFFER, _colorRenderbuffer);
// This call associates the storage for the current render buffer with the EAGLDrawable (our CAEAGLLayer)
// allowing us to draw into a buffer that will later be rendered to screen wherever the layer is (which corresponds with our view).
[_context renderbufferStorage:GL_RENDERBUFFER fromDrawable:(id<EAGLDrawable>)self.layer];
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, _colorRenderbuffer);
GLint backingWidth, backingHeight;
glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &backingWidth);
glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &backingHeight);
if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
msg_Err(_vd, "Failed to make complete framebuffer object %x", glCheckFramebufferStatus(GL_FRAMEBUFFER));
}
[self _updateViewportWithBackingWitdh:backingWidth andBackingHeight:backingHeight];
}
- (void)_updateViewportWithBackingWitdh:(GLuint)backingWidth andBackingHeight:(GLuint)backingHeight {
msg_Dbg(_vd, "Reshaping to %dx%d", backingWidth, backingHeight);
CGFloat width = (CGFloat)backingWidth;
CGFloat height = (CGFloat)backingHeight;
GLint x = width, y = height;
if (_vd) {
CGFloat videoHeight = _vd->source.i_visible_height;
CGFloat videoWidth = _vd->source.i_visible_width;
GLint sarNum = _vd->source.i_sar_num;
GLint sarDen = _vd->source.i_sar_den;
if (height * videoWidth * sarNum < width * videoHeight * sarDen)
{
x = (height * videoWidth * sarNum) / (videoHeight * sarDen);
y = height;
}
else
{
x = width;
y = (width * videoHeight * sarDen) / (videoWidth * sarNum);
}
@synchronized (self)
{
vout_display_cfg_t cfg_tmp = *(_vd->cfg);
cfg_tmp.display.width = width;
cfg_tmp.display.height = height;
vout_display_SendEventDisplaySize (_vd, width, height, false);
}
}
[EAGLContext setCurrentContext:_context];
glViewport((width - x) / 2, (height - y) / 2, x, y);
}
- (void)_destroyFramebuffer {
[EAGLContext setCurrentContext:_context];
glDeleteFramebuffers(1, &_defaultFramebuffer);
_defaultFramebuffer = 0;
glDeleteRenderbuffers(1, &_colorRenderbuffer);
_colorRenderbuffer = 0;
}
@end
po/POTFILES.in
View file @ 902cc2d4
......@@ -1140,7 +1140,6 @@ modules/video_output/egl.c
modules/video_output/fb.c
modules/video_output/gl.c
modules/video_output/glx.c
modules/video_output/ios.m
modules/video_output/ios2.m
modules/video_output/kva.c
modules/video_output/macosx.m
......
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