mplayer.hg: libvo/vo_corevideo.m comparison

comparison libvo/vo_corevideo.m @ 29564:4ae3d2d7946e

Use MPlayer's standard aspect handling functions in corevideo instead of reimplementing them incompletely.

author	reimar
date	Tue, 01 Sep 2009 09:36:04 +0000
parents	9c8f8e375823
children	b128ce47771d

comparison

equal deleted inserted replaced

-:0ba024eac67c
+:4ae3d2d7946e
 //vo
 static int isFullscreen;
 static int isOntop;
 static int isRootwin;
-extern float monitor_aspect;
-extern float movie_aspect;
-static float old_movie_aspect;
 extern int enable_mouse_movements;
 static float winAlpha = 1;
 static int int_pause = 0;
 			vo_draw_alpha_yuy2(w,h,src,srca,stride,image_data + (x0 + y0 * image_width) * 2,image_width*2);
 			break;
 	}
 }
-static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+static void update_screen_info(void)
 {
-	//init screen
 	screen_array = [NSScreen screens];
 	if(screen_id < (int)[screen_array count])
 	{
 		screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : 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;
 	}
-	screen_frame = [screen_handle frame];
+	screen_frame = ![mpGLView window] || screen_id >= 0 ? [screen_handle frame] : [[[mpGLView window] screen] frame];
 	vo_screenwidth = screen_frame.size.width;
 	vo_screenheight = screen_frame.size.height;
+	xinerama_x = xinerama_y = 0;
+	aspect_save_screenres(vo_screenwidth, vo_screenheight);
+}
+static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+{
+	config_movie_aspect((float)d_width/d_height);
+	vo_dwidth  = d_width  *= mpGLView->winSizeMult;
+	vo_dheight = d_height *= mpGLView->winSizeMult;
 	//misc mplayer setup
 	image_width = width;
 	image_height = height;
 	switch (image_format)
 		image_datas[0] = image_data;
 		if (vo_doublebuffering)
 			image_datas[1] = malloc(image_width*image_height*image_bytes);
 		image_page = 0;
-		monitor_aspect = (float)screen_frame.size.width/(float)screen_frame.size.height;
-		//set aspect
-		panscan_init();
-		aspect_save_orig(width,height);
-		aspect_save_prescale(d_width,d_height);
-		aspect_save_screenres(screen_frame.size.width, screen_frame.size.height);
-		aspect((int *)&d_width,(int *)&d_height,A_NOZOOM);
-		movie_aspect = (float)d_width/(float)d_height;
-		old_movie_aspect = movie_aspect;
 		vo_fs = flags & VOFLAG_FULLSCREEN;
 		//config OpenGL View
 		[mpGLView config];
 		[mpGLView reshape];
 	}
 	else
 	{
 		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;
 		// create shared memory
 		shm_fd = shm_open(buffer_name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
 		if (shm_fd == -1)
 		{
 		//connect to mplayerosx
 		mplayerosxProxy=[NSConnection rootProxyForConnectionWithRegisteredName:[NSString stringWithCString:buffer_name] host:nil];
 		if ([mplayerosxProxy conformsToProtocol:@protocol(MPlayerOSXVOProto)]) {
 			[mplayerosxProxy setProtocolForProxy:@protocol(MPlayerOSXVOProto)];
 			mplayerosxProto = (id <MPlayerOSXVOProto>)mplayerosxProxy;
-			[mplayerosxProto startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:(int)(movie_aspect*100)];
+			[mplayerosxProto startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:d_width*100/d_height];
 		}
 		else {
 			[mplayerosxProxy release];
 			mplayerosxProxy = nil;
 			mplayerosxProto = nil;
 		case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE;
 		case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE;
 		case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE;
 		case VOCTRL_GET_PANSCAN: return VO_TRUE;
 		case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE;
+		case VOCTRL_UPDATE_SCREENINFO: update_screen_info(); return VO_TRUE;
 	}
 	return VO_NOTIMPL;
 }
 //////////////////////////////////////////////////////////////////////////
 	NSRect frame;
 	CVReturn error = kCVReturnSuccess;
 	//config window
-	aspect((int *)&d_width, (int *)&d_height,A_NOZOOM);
+	d_width = vo_dwidth; d_height = vo_dheight;
 	frame = NSMakeRect(0, 0, d_width, d_height);
 	[window setContentSize: frame.size];
 	//create OpenGL Context
 	glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil];
 		if(isFullscreen) {
 			vo_fs = (!(vo_fs)); [self fullscreen:NO];
 		}
 		winSizeMult = 0.5;
-		frame.size.width = (d_width*winSizeMult);
+		frame.size.width = d_width*winSizeMult;
-		frame.size.height = ((d_width/movie_aspect)*winSizeMult);
+		frame.size.height = d_height*winSizeMult;
 		[window setContentSize: frame.size];
 		[self reshape];
 	}
 	if(sender == kNormalScreenCmd)
 	{
 			vo_fs = (!(vo_fs)); [self fullscreen:NO];
 		}
 		winSizeMult = 1;
 		frame.size.width = d_width;
-		frame.size.height = d_width/movie_aspect;
+		frame.size.height = d_height;
 		[window setContentSize: frame.size];
 		[self reshape];
 	}
 	if(sender == kDoubleScreenCmd)
 	{
 			vo_fs = (!(vo_fs)); [self fullscreen:NO];
 		}
 		winSizeMult = 2;
 		frame.size.width = d_width*winSizeMult;
-		frame.size.height = (d_width/movie_aspect)*winSizeMult;
+		frame.size.height = d_height*winSizeMult;
 		[window setContentSize: frame.size];
 		[self reshape];
 	}
 	if(sender == kFullScreenCmd)
 	{
 		[self panscan];
 	}
 	if(sender == kAspectOrgCmd)
-	{
+		change_movie_aspect(-1);
-		movie_aspect = old_movie_aspect;
-		if(isFullscreen)
-		{
-			[self reshape];
-		}
-		else
-		{
-			frame.size.width = d_width*winSizeMult;
-			frame.size.height = (d_width/movie_aspect)*winSizeMult;
-			[window setContentSize: frame.size];
-			[self reshape];
-		}
-	}
 	if(sender == kAspectFullCmd)
-	{
+		change_movie_aspect(4.0f/3.0f);
-		movie_aspect = 4.0f/3.0f;
-		if(isFullscreen)
-		{
-			[self reshape];
-		}
-		else
-		{
-			frame.size.width = d_width*winSizeMult;
-			frame.size.height = (d_width/movie_aspect)*winSizeMult;
-			[window setContentSize: frame.size];
-			[self reshape];
-		}
-	}
 	if(sender == kAspectWideCmd)
-	{
+		change_movie_aspect(16.0f/9.0f);
-		movie_aspect = 16.0f/9.0f;
-		if(isFullscreen)
-		{
-			[self reshape];
-		}
-		else
-		{
-			frame.size.width = d_width*winSizeMult;
-			frame.size.height = (d_width/movie_aspect)*winSizeMult;
-			[window setContentSize: frame.size];
-			[self reshape];
-		}
-	}
 }
 /*
 	Setup OpenGL
 */
 */
 - (void)reshape
 {
 	uint32_t d_width;
 	uint32_t d_height;
-	float aspectX;
-	float aspectY;
-	int padding = 0;
 	NSRect frame = [self frame];
+	vo_dwidth  = frame.size.width;
+	vo_dheight = frame.size.height;
 	glViewport(0, 0, frame.size.width, frame.size.height);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	glOrtho(0, frame.size.width, frame.size.height, 0, -1.0, 1.0);
 	glLoadIdentity();
 	//set texture frame
 	if(vo_keepaspect)
 	{
-		aspect( (int *)&d_width, (int *)&d_height, A_NOZOOM);
+		aspect( (int *)&d_width, (int *)&d_height, A_WINZOOM);
-		d_height = ((float)d_width/movie_aspect);
+		textureFrame = NSMakeRect((vo_dwidth - d_width) / 2, (vo_dheight - d_height) / 2, d_width, d_height);
-		aspectX = (float)((float)frame.size.width/(float)d_width);
-		aspectY = (float)((float)(frame.size.height)/(float)d_height);
-		if((d_height*aspectX)>(frame.size.height))
-		{
-			padding = (frame.size.width - d_width*aspectY)/2;
-			textureFrame = NSMakeRect(padding, 0, d_width*aspectY, d_height*aspectY);
-		}
-		else
-		{
-			padding = ((frame.size.height) - d_height*aspectX)/2;
-			textureFrame = NSMakeRect(0, padding, d_width*aspectX, d_height*aspectX);
-		}
 	}
 	else
 	{
 		textureFrame = frame;
 	}
-	vo_dwidth = textureFrame.size.width;
-	vo_dheight = textureFrame.size.height;
 }
 /*
 	Render frame
 */
 			CGDisplayHideCursor(kCGDirectMainDisplay);
 			mouseHide = YES;
 		}
 		old_frame = [window frame];	//save main window size & position
-		if(screen_id >= 0)
+		update_screen_info();
-			screen_frame = [screen_handle frame];
-		else {
-			screen_frame = [[window screen] frame];
-			vo_screenwidth = screen_frame.size.width;
-			vo_screenheight = screen_frame.size.height;
-		}
 		[window setFrame:screen_frame display:YES animate:animate]; //zoom-in window with nice useless sfx
 		old_view_frame = [self bounds];
 		//fix origin for multi screen setup

Mercurial > mplayer.hg

comparison libvo/vo_corevideo.m @ 29564:4ae3d2d7946e