diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-04 16:55:05 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-04 16:55:05 +0000 |
commit | 27bc918ffeb095a2e932e373fa718fbb3a3f36c7 (patch) | |
tree | fb6d67a337ad665432731d9708d20121240e7e3f /libvo | |
parent | e3ec5b1fd377254e19685ddcce0988efda8bffbf (diff) | |
download | mpv-27bc918ffeb095a2e932e373fa718fbb3a3f36c7.tar.bz2 mpv-27bc918ffeb095a2e932e373fa718fbb3a3f36c7.tar.xz |
Rename macosx video output driver to corevideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29252 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/video_out.c | 4 | ||||
-rw-r--r-- | libvo/vo_corevideo.h (renamed from libvo/vo_macosx.h) | 2 | ||||
-rw-r--r-- | libvo/vo_corevideo.m (renamed from libvo/vo_macosx.m) | 36 |
3 files changed, 21 insertions, 21 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 81f938b301..b7c0ed1f0a 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -128,7 +128,7 @@ extern vo_functions_t video_out_cvidix; extern vo_functions_t video_out_tdfx_vid; extern vo_functions_t video_out_xvr100; extern vo_functions_t video_out_tga; -extern vo_functions_t video_out_macosx; +extern vo_functions_t video_out_corevideo; extern vo_functions_t video_out_quartz; extern vo_functions_t video_out_pnm; extern vo_functions_t video_out_md5sum; @@ -151,7 +151,7 @@ const vo_functions_t* const video_out_drivers[] = &video_out_kva, #endif #ifdef CONFIG_COREVIDEO - &video_out_macosx, + &video_out_corevideo, #endif #ifdef CONFIG_QUARTZ &video_out_quartz, diff --git a/libvo/vo_macosx.h b/libvo/vo_corevideo.h index 1384d24040..44c2ad8a89 100644 --- a/libvo/vo_macosx.h +++ b/libvo/vo_corevideo.h @@ -1,5 +1,5 @@ /* - * MPlayer Mac OS X video output driver + * CoreVideo video output driver * * Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com> * diff --git a/libvo/vo_macosx.m b/libvo/vo_corevideo.m index 9f0fcc4bd1..71046fdb68 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_corevideo.m @@ -1,5 +1,5 @@ /* - * Mac OS X video output driver + * CoreVideo video output driver * Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com> * * This file is part of MPlayer. @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#import "vo_macosx.h" +#import "vo_corevideo.h" #include <sys/types.h> #include <sys/ipc.h> #include <sys/mman.h> @@ -96,12 +96,12 @@ static BOOL isLeopardOrLater; static vo_info_t info = { "Mac OS X Core Video", - "macosx", + "corevideo", "Nicolas Plourde <nicolas.plourde@gmail.com>", "" }; -LIBVO_EXTERN(macosx) +LIBVO_EXTERN(corevideo) static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { @@ -127,7 +127,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ } else { - mp_msg(MSGT_VO, MSGL_INFO, "[vo_macosx] Device ID %d does not exist, falling back to main device\n", screen_id); + mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id); screen_handle = [screen_array objectAtIndex:0]; screen_id = -1; } @@ -178,7 +178,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ } else { - mp_msg(MSGT_VO, MSGL_INFO, "[vo_macosx] writing output to a shared buffer " + mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] writing output to a shared buffer " "named \"%s\"\n",buffer_name); movie_aspect = (float)d_width/(float)d_height; @@ -188,7 +188,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ if (shm_fd == -1) { mp_msg(MSGT_VO, MSGL_FATAL, - "[vo_macosx] failed to open shared memory. Error: %s\n", strerror(errno)); + "[vo_corevideo] failed to open shared memory. Error: %s\n", strerror(errno)); return 1; } @@ -196,7 +196,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ if (ftruncate(shm_fd, image_width*image_height*image_bytes) == -1) { mp_msg(MSGT_VO, MSGL_FATAL, - "[vo_macosx] failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno)); + "[vo_corevideo] failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno)); shm_unlink(buffer_name); return 1; } @@ -207,7 +207,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ if (image_data == MAP_FAILED) { mp_msg(MSGT_VO, MSGL_FATAL, - "[vo_macosx] failed to map shared memory. Error: %s\n", strerror(errno)); + "[vo_corevideo] failed to map shared memory. Error: %s\n", strerror(errno)); shm_unlink(buffer_name); return 1; } @@ -303,10 +303,10 @@ static void uninit(void) mplayerosxProxy = nil; if (munmap(image_data, image_width*image_height*image_bytes) == -1) - mp_msg(MSGT_VO, MSGL_FATAL, "[vo_macosx] uninit: munmap failed. Error: %s\n", strerror(errno)); + mp_msg(MSGT_VO, MSGL_FATAL, "[vo_corevideo] uninit: munmap failed. Error: %s\n", strerror(errno)); if (shm_unlink(buffer_name) == -1) - mp_msg(MSGT_VO, MSGL_FATAL, "[vo_macosx] uninit: shm_unlink failed. Error: %s\n", strerror(errno)); + mp_msg(MSGT_VO, MSGL_FATAL, "[vo_corevideo] uninit: shm_unlink failed. Error: %s\n", strerror(errno)); } @@ -353,8 +353,8 @@ static int preinit(const char *arg) if (subopt_parse(arg, subopts) != 0) { mp_msg(MSGT_VO, MSGL_FATAL, - "\n-vo macosx command line help:\n" - "Example: mplayer -vo macosx:device_id=1:shared_buffer:buffer_name=mybuff\n" + "\n-vo corevideo command line help:\n" + "Example: mplayer -vo corevideo:device_id=1:shared_buffer:buffer_name=mybuff\n" "\nOptions:\n" " device_id=<0-...>\n" " Set screen device ID for fullscreen.\n" @@ -477,20 +477,20 @@ static int control(uint32_t request, void *data, ...) error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[0], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[0]); if(error != kCVReturnSuccess) - mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create Pixel Buffer(%d)\n", error); + mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create Pixel Buffer(%d)\n", error); if (vo_doublebuffering) { error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[1], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[1]); if(error != kCVReturnSuccess) - mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create Pixel Double Buffer(%d)\n", error); + mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create Pixel Double Buffer(%d)\n", error); } error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache); if(error != kCVReturnSuccess) - mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create OpenGL texture Cache(%d)\n", error); + mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture Cache(%d)\n", error); error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); if(error != kCVReturnSuccess) - mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create OpenGL texture(%d)\n", error); + mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture(%d)\n", error); //show window [window center]; @@ -838,7 +838,7 @@ static int control(uint32_t request, void *data, ...) CVOpenGLTextureRelease(texture); error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); if(error != kCVReturnSuccess) - mp_msg(MSGT_VO, MSGL_ERR,"[vo_macosx] Failed to create OpenGL texture(%d)\n", error); + mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture(%d)\n", error); CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft); } |