/*****************************************************************************
* vout_beos.cpp: beos video output display method
*****************************************************************************
- * Copyright (C) 2000 VideoLAN
+ * Copyright (C) 2000, 2001 VideoLAN
+ * $Id: vout_beos.cpp,v 1.43 2002/02/27 03:47:56 sam Exp $
*
- * Authors:
- * Jean-Marc Dressler
+ * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
+ * Samuel Hocevar <sam@zoy.org>
+ * Tony Castley <tcastley@mail.powerup.com.au>
+ * Richard Shepherd <richard@rshepherd.demon.co.uk>
*
* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* free() */
#include <stdio.h>
#include <string.h> /* strerror() */
-#include <kernel/OS.h>
-#include <View.h>
-#include <Application.h>
+#include <InterfaceKit.h>
#include <DirectWindow.h>
-#include <Locker.h>
-#include <malloc.h>
-#include <string.h>
+#include <Application.h>
+#include <Bitmap.h>
extern "C"
{
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "plugins.h"
+#include <videolan/vlc.h>
#include "video.h"
#include "video_output.h"
-#include "intf_msg.h"
-#include "interface.h" /* XXX maybe to remove if beos_window.h is splitted */
-
-#include "main.h"
+#include "interface.h"
}
-#include "beos_window.h"
+#include "VideoWindow.h"
-#define WIDTH 128
-#define HEIGHT 64
-#define BITS_PER_PLANE 16
+#define BITS_PER_PLANE 16
#define BYTES_PER_PIXEL 2
/*****************************************************************************
- * vout_sys_t: dummy video output method descriptor
+ * vout_sys_t: BeOS video output method descriptor
*****************************************************************************
* This structure is part of the video output thread descriptor.
- * It describes the dummy specific properties of an output thread.
+ * It describes the BeOS specific properties of an output thread.
*****************************************************************************/
-
typedef struct vout_sys_s
{
- VideoWindow * p_window;
-
- byte_t * pp_buffer[2];
- s32 i_width;
- s32 i_height;
+ VideoWindow * p_window;
+
+ s32 i_width;
+ s32 i_height;
+
+ u8 *pp_buffer[2];
+ int i_index;
+
} vout_sys_t;
/*****************************************************************************
* beos_GetAppWindow : retrieve a BWindow pointer from the window name
*****************************************************************************/
-
BWindow *beos_GetAppWindow(char *name)
{
int32 index;
window = be_app->WindowAt(index);
if (window == NULL)
break;
- if (window->LockWithTimeout(200000) == B_OK)
+ if (window->LockWithTimeout(20000) == B_OK)
{
if (strcmp(window->Name(), name) == 0)
{
return window;
}
+/****************************************************************************
+ * DrawingThread : thread that really does the drawing
+ ****************************************************************************/
+int32 Draw(void *data)
+{
+ //rudolf: sync init:
+ BScreen *screen;
+ display_mode disp_mode;
+ static uint32 refresh, oldrefresh = 0;
+
+ screen = new BScreen();
+ screen-> GetMode(&disp_mode);
+ refresh =
+ (disp_mode.timing.pixel_clock * 1000)/((disp_mode.timing.h_total)*
+ (disp_mode.timing.v_total));
+ if (!(refresh == oldrefresh))
+ {
+ intf_WarnMsg( 1, "vout info: new refreshrate is %ld:Hz", refresh );
+ oldrefresh = refresh;
+ if (refresh < 61 )
+ {
+ intf_WarnMsg( 1, "vout info: enabling retrace sync" );
+ }
+ else
+ {
+ intf_WarnMsg( 1, "vout info: disabling retrace sync" );
+ }
+ }
+
+ VideoWindow* p_win;
+ p_win = (VideoWindow *) data;
+ if ( p_win-> voutWindow-> LockLooper() )
+ {
+ //rudolf: sync:
+ if (refresh < 61)
+ {
+ screen-> WaitForRetrace(22000);//set timeout for < 45 Hz...
+ }
+
+ p_win-> view-> DrawBitmap( p_win-> bitmap[p_win-> i_buffer],
+ p_win-> bitmap[p_win-> i_buffer]-> Bounds(),
+ p_win-> voutWindow-> Bounds() );
+ p_win-> voutWindow-> UnlockLooper();
+ }
+ return B_OK;
+}
+
/*****************************************************************************
- * DrawingThread : thread that really does the drawing
+ * bitmapWindow : This is the bitmap window output
*****************************************************************************/
+bitmapWindow::bitmapWindow(BRect frame, VideoWindow *theOwner)
+ : BWindow( frame, NULL, B_TITLED_WINDOW,
+ B_OUTLINE_RESIZE | B_NOT_CLOSABLE | B_NOT_MINIMIZABLE )
+{
+ is_zoomed = false;
+ origRect = frame;
+ owner = theOwner;
+ SetTitle(VOUT_TITLE " (BBitmap output)");
+}
+
+bitmapWindow::~bitmapWindow()
+{
+}
-int32 DrawingThread(void *data)
+void bitmapWindow::FrameResized( float width, float height )
{
- uint32 i, j, y;
- uint64 *pp, *qq;
- uint8 *p, *q;
- uint32 byte_width;
- uint32 height, bytes_per_line;
- clipping_rect *clip;
-
- VideoWindow *w;
- w = (VideoWindow*) data;
+ if (is_zoomed)
+ {
+ return;
+ }
+ float width_scale;
+ float height_scale;
+
+ width_scale = width / origRect.Width();
+ height_scale = height / origRect.Height();
- while(!w->fConnectionDisabled)
+ /* if the width is proportionally smaller */
+ if (width_scale <= height_scale)
{
- w->locker->Lock();
- if( w->fConnected )
- {
- if( w->fDirty && (!w->fReady || w->i_screen_depth != w->p_vout->i_screen_depth) )
- {
- bytes_per_line = w->fRowBytes;
- for( i=0 ; i < w->fNumClipRects ; i++ )
- {
- clip = &(w->fClipList[i]);
- height = clip->bottom - clip->top +1;
- byte_width = w->i_bytes_per_pixel * ((clip->right - clip->left)+1);
- p = w->fBits + clip->top*w->fRowBytes + clip->left * w->i_bytes_per_pixel;
- for( y=0 ; y < height ; )
- {
- pp = (uint64*) p;
- for( j=0 ; j < byte_width/64 ; j++ )
- {
- *pp++ = 0;
- *pp++ = 0;
- *pp++ = 0;
- *pp++ = 0;
- *pp++ = 0;
- *pp++ = 0;
- *pp++ = 0;
- *pp++ = 0;
- }
- memset( pp , 0, byte_width & 63 );
- y++;
- p += bytes_per_line;
- }
- }
- }
- else if( w->fDirty )
- {
- bytes_per_line = w->fRowBytes;
- for( i=0 ; i < w->fNumClipRects ; i++ )
- {
- clip = &(w->fClipList[i]);
- height = clip->bottom - clip->top +1;
- byte_width = w->i_bytes_per_pixel * ((clip->right - clip->left)+1);
- p = w->fBits + clip->top * bytes_per_line + clip->left * w->i_bytes_per_pixel;
- q = w->p_vout->p_sys->pp_buffer[ !w->p_vout->i_buffer_index ] +
- clip->top * w->p_vout->i_bytes_per_line + clip->left *
- w->p_vout->i_bytes_per_pixel;
- for( y=0 ; y < height ; )
- {
- pp = (uint64*) p;
- qq = (uint64*) q;
- for( j=0 ; j < byte_width/64 ; j++ )
- {
- *pp++ = *qq++;
- *pp++ = *qq++;
- *pp++ = *qq++;
- *pp++ = *qq++;
- *pp++ = *qq++;
- *pp++ = *qq++;
- *pp++ = *qq++;
- *pp++ = *qq++;
- }
- memcpy( pp , qq, byte_width & 63 );
- y++;
- p += bytes_per_line;
- q += w->p_vout->p_sys->i_width * w->p_vout->i_bytes_per_pixel;
- }
- }
- }
- w->fDirty = false;
- }
- w->locker->Unlock();
- snooze( 20000 );
+ ResizeTo(width, origRect.Height() * width_scale);
+ }
+ else /* if the height is proportionally smaller */
+ {
+ ResizeTo(origRect.Width() * height_scale, height);
}
- return B_OK;
}
-/*****************************************************************************
- * VideoWindow constructor and destructor
- *****************************************************************************/
-
-VideoWindow::VideoWindow(BRect frame, const char *name, vout_thread_t *p_video_output )
- : BDirectWindow(frame, name, B_TITLED_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE)
+void bitmapWindow::Zoom(BPoint origin, float width, float height )
{
- BView * view;
-
- fReady = false;
- fConnected = false;
- fConnectionDisabled = false;
- locker = new BLocker();
- fClipList = NULL;
- fNumClipRects = 0;
- p_vout = p_video_output;
-
- view = new BView(Bounds(), "", B_FOLLOW_ALL, B_WILL_DRAW);
- view->SetViewColor(B_TRANSPARENT_32_BIT);
- AddChild(view);
-/*
- if(!SupportsWindowMode())
+ if(is_zoomed)
{
- SetFullScreen(true);
+ MoveTo(origRect.left, origRect.top);
+ ResizeTo(origRect.IntegerWidth(), origRect.IntegerHeight());
+ be_app->ShowCursor();
}
-*/
- fDirty = false;
- fDrawThreadID = spawn_thread(DrawingThread, "drawing_thread",
- B_DISPLAY_PRIORITY, (void*) this);
- resume_thread(fDrawThreadID);
- Show();
+ else
+ {
+ BScreen *screen;
+ screen = new BScreen(this);
+ BRect rect = screen->Frame();
+ delete screen;
+ MoveTo(0,0);
+ ResizeTo(rect.IntegerWidth(), rect.IntegerHeight());
+ be_app->HideCursor();
+ }
+ is_zoomed = !is_zoomed;
}
-VideoWindow::~VideoWindow()
+/*****************************************************************************
+ * directWindow : This is the bitmap window output
+ *****************************************************************************/
+directWindow::directWindow(BRect frame, VideoWindow *theOwner)
+ : BDirectWindow( frame, NULL, B_TITLED_WINDOW,
+ B_OUTLINE_RESIZE | B_NOT_CLOSABLE | B_NOT_MINIMIZABLE )
{
- int32 result;
-
- fConnectionDisabled = true;
- Hide();
- Sync();
- wait_for_thread(fDrawThreadID, &result);
- free(fClipList);
- delete locker;
+ is_zoomed = false;
+ origRect = frame;
+ owner = theOwner;
+ SetTitle(VOUT_TITLE " (DirectWindow output)");
}
-/*****************************************************************************
- * VideoWindow::DirectConnected
- *****************************************************************************/
+directWindow::~directWindow()
+{
+}
-void VideoWindow::DirectConnected(direct_buffer_info *info)
+void directWindow::DirectConnected(direct_buffer_info *info)
{
- unsigned int i;
+}
- if(!fConnected && fConnectionDisabled)
+void directWindow::FrameResized( float width, float height )
+{
+ if (is_zoomed)
{
return;
}
- locker->Lock();
+ float width_scale;
+ float height_scale;
- switch(info->buffer_state & B_DIRECT_MODE_MASK)
+ width_scale = width / origRect.Width();
+ height_scale = height / origRect.Height();
+
+ /* if the width is proportionally smaller */
+ if (width_scale <= height_scale)
{
- case B_DIRECT_START:
- fConnected = true;
- case B_DIRECT_MODIFY:
- fBits = (uint8*)((char*)info->bits +
- (info->window_bounds.top) * info->bytes_per_row +
- (info->window_bounds.left) * (info->bits_per_pixel>>3));;
-
- i_bytes_per_pixel = info->bits_per_pixel >> 3;
- i_screen_depth = info->bits_per_pixel;
-
- fRowBytes = info->bytes_per_row;
- fFormat = info->pixel_format;
- fBounds = info->window_bounds;
- fDirty = true;
-
- if(fClipList)
- {
- free(fClipList);
- fClipList = NULL;
- }
- fNumClipRects = info->clip_list_count;
- fClipList = (clipping_rect*) malloc(fNumClipRects*sizeof(clipping_rect));
- for( i=0 ; i<info->clip_list_count ; i++ )
- {
- fClipList[i].top = info->clip_list[i].top - info->window_bounds.top;
- fClipList[i].left = info->clip_list[i].left - info->window_bounds.left;
- fClipList[i].bottom = info->clip_list[i].bottom - info->window_bounds.top;
- fClipList[i].right = info->clip_list[i].right - info->window_bounds.left;
- }
- break;
- case B_DIRECT_STOP:
- fConnected = false;
- break;
+ ResizeTo(width, origRect.Height() * width_scale);
+ }
+ else /* if the height is proportionally smaller */
+ {
+ ResizeTo(origRect.Width() * height_scale, height);
+ }
+}
+
+void directWindow::Zoom(BPoint origin, float width, float height )
+{
+ if(is_zoomed)
+ {
+ SetFullScreen(false);
+ MoveTo(origRect.left, origRect.top);
+ ResizeTo(origRect.IntegerWidth(), origRect.IntegerHeight());
+ be_app->ShowCursor();
}
- locker->Unlock();
+ else
+ {
+ SetFullScreen(true);
+ BScreen *screen;
+ screen = new BScreen(this);
+ BRect rect = screen->Frame();
+ delete screen;
+ MoveTo(0,0);
+ ResizeTo(rect.IntegerWidth(), rect.IntegerHeight());
+ be_app->HideCursor();
+ }
+ is_zoomed = !is_zoomed;
}
/*****************************************************************************
- * VideoWindow::MessageReceived
+ * VideoWindow constructor and destructor
*****************************************************************************/
-
-void VideoWindow::MessageReceived( BMessage * p_message )
+VideoWindow::VideoWindow( int width, int height,
+ vout_thread_t *p_video_output )
{
- BWindow * p_win;
+ if ( BDirectWindow::SupportsWindowMode() )
+ {
+ voutWindow = new directWindow( BRect( 80, 50,
+ 80 + width, 50 + height ), this );
+ }
+ else
+ {
+ voutWindow = new bitmapWindow( BRect( 80, 50,
+ 80 + width, 50 + height ), this );
+ }
+
+ /* set the VideoWindow variables */
+ teardownwindow = false;
- switch( p_message->what )
+ /* create the view to do the display */
+ view = new VLCView( voutWindow->Bounds() );
+ voutWindow->AddChild(view);
+
+ /* Bitmap mode overlay not available, set the system to 32bits
+ * and let BeOS do all the work */
+ bitmap[0] = new BBitmap( voutWindow->Bounds(), B_RGB32);
+ bitmap[1] = new BBitmap( voutWindow->Bounds(), B_RGB32);
+ memset(bitmap[0]->Bits(), 0, bitmap[0]->BitsLength());
+ memset(bitmap[1]->Bits(), 0, bitmap[1]->BitsLength());
+
+ i_width = bitmap[0]->Bounds().IntegerWidth();
+ i_height = bitmap[0]->Bounds().IntegerHeight();
+
+ voutWindow->Show();
+}
+
+VideoWindow::~VideoWindow()
+{
+ int32 result;
+
+ voutWindow->Hide();
+ voutWindow->Sync();
+ voutWindow->Lock();
+ voutWindow->Quit();
+ teardownwindow = true;
+ wait_for_thread(fDrawThreadID, &result);
+ delete bitmap[0];
+ delete bitmap[1];
+}
+
+void VideoWindow::resizeIfRequired( int newWidth, int newHeight )
+{
+ if (( newWidth != i_width + 1) &&
+ ( newHeight != i_height + 1) &&
+ ( newWidth != 0 ))
{
- case B_KEY_DOWN:
- // post the message to the interface window which will handle it
- p_win = beos_GetAppWindow( "interface" );
- if( p_win != NULL )
+ if ( voutWindow->Lock() )
{
- p_win->PostMessage( p_message );
+ view->ClearViewBitmap();
+ i_width = newWidth - 1;
+ i_height = newHeight -1;
+ voutWindow->ResizeTo((float) i_width, (float) i_height);
+ voutWindow->Unlock();
}
- break;
-
- default:
- BWindow::MessageReceived( p_message );
- break;
}
}
+void VideoWindow::drawBuffer(int bufferIndex)
+{
+ status_t status;
+
+ i_buffer = bufferIndex;
+
+ fDrawThreadID = spawn_thread(Draw, "drawing_thread",
+ B_DISPLAY_PRIORITY, (void*) this);
+ wait_for_thread(fDrawThreadID, &status);
+}
+
/*****************************************************************************
- * VideoWindow::QuitRequested
+ * VLCView::VLCView
*****************************************************************************/
+VLCView::VLCView(BRect bounds) : BView(bounds, "", B_FOLLOW_ALL, B_WILL_DRAW)
+{
+ SetViewColor(B_TRANSPARENT_32_BIT);
+}
+
+/*****************************************************************************
+ * VLCView::~VLCView
+ *****************************************************************************/
+VLCView::~VLCView()
+{
+}
-bool VideoWindow::QuitRequested()
+/*****************************************************************************
+ * VLCVIew::~VLCView
+ *****************************************************************************/
+void VLCView::MouseDown(BPoint point)
{
- return( true );
+ BWindow *win = Window();
+ win->Zoom();
}
extern "C"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int BeosOpenDisplay ( vout_thread_t *p_vout );
-static void BeosCloseDisplay ( vout_thread_t *p_vout );
+static int vout_Create ( vout_thread_t * );
+static int vout_Init ( vout_thread_t * );
+static void vout_End ( vout_thread_t * );
+static void vout_Destroy ( vout_thread_t * );
+static int vout_Manage ( vout_thread_t * );
+static void vout_Display ( vout_thread_t *, picture_t * );
+static void vout_Render ( vout_thread_t *, picture_t * );
+
+static int BeosOpenDisplay ( vout_thread_t *p_vout );
+static void BeosCloseDisplay( vout_thread_t *p_vout );
+
+/*****************************************************************************
+ * Functions exported as capabilities. They are declared as static so that
+ * we don't pollute the namespace too much.
+ *****************************************************************************/
+void _M( vout_getfunctions )( function_list_t * p_function_list )
+{
+ p_function_list->functions.vout.pf_create = vout_Create;
+ p_function_list->functions.vout.pf_init = vout_Init;
+ p_function_list->functions.vout.pf_end = vout_End;
+ p_function_list->functions.vout.pf_destroy = vout_Destroy;
+ p_function_list->functions.vout.pf_manage = vout_Manage;
+ p_function_list->functions.vout.pf_display = vout_Display;
+ p_function_list->functions.vout.pf_render = vout_Render;
+}
/*****************************************************************************
- * vout_BeCreate: allocates dummy video thread output method
+ * vout_Create: allocates BeOS video thread output method
*****************************************************************************
- * This function allocates and initializes a dummy vout method.
+ * This function allocates and initializes a BeOS vout method.
*****************************************************************************/
-int vout_BeCreate( vout_thread_t *p_vout, char *psz_display,
- int i_root_window, void *p_data )
+int vout_Create( vout_thread_t *p_vout )
{
/* Allocate structure */
p_vout->p_sys = (vout_sys_t*) malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
{
- intf_ErrMsg( "error: %s\n", strerror(ENOMEM) );
+ intf_ErrMsg( "error: %s", strerror(ENOMEM) );
return( 1 );
}
-
- /* Set video window's size */
- p_vout->i_width = main_GetIntVariable( VOUT_WIDTH_VAR, VOUT_WIDTH_DEFAULT );
- p_vout->i_height = main_GetIntVariable( VOUT_HEIGHT_VAR, VOUT_HEIGHT_DEFAULT );
- /* Open and initialize device */
- if( BeosOpenDisplay( p_vout ) )
+ if( p_vout->render.i_height * p_vout->render.i_aspect
+ >= p_vout->render.i_width * VOUT_ASPECT_FACTOR )
{
- intf_ErrMsg("vout error: can't open display\n");
- free( p_vout->p_sys );
- return( 1 );
+ p_vout->p_sys->i_width = p_vout->render.i_height
+ * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
+ p_vout->p_sys->i_height = p_vout->render.i_height;
+ }
+ else
+ {
+ p_vout->p_sys->i_width = p_vout->render.i_width;
+ p_vout->p_sys->i_height = p_vout->render.i_width
+ * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect;
}
return( 0 );
}
/*****************************************************************************
- * vout_BeInit: initialize dummy video thread output method
+ * vout_Init: initialize BeOS video thread output method
*****************************************************************************/
-int vout_BeInit( vout_thread_t *p_vout )
+int vout_Init( vout_thread_t *p_vout )
{
- VideoWindow * p_win = p_vout->p_sys->p_window;
- u32 i_page_size;
+ int i_index;
+ picture_t *p_pic;
- p_win->locker->Lock();
+ I_OUTPUTPICTURES = 0;
- i_page_size = p_vout->i_width * p_vout->i_height * p_vout->i_bytes_per_pixel;
-
- p_vout->p_sys->i_width = p_vout->i_width;
- p_vout->p_sys->i_height = p_vout->i_height;
+ /* Open and initialize device */
+ if( BeosOpenDisplay( p_vout ) )
+ {
+ intf_ErrMsg("vout error: can't open display");
+ return 0;
+ }
+
+ p_vout->output.i_width = p_vout->p_sys->i_width;
+ p_vout->output.i_height = p_vout->p_sys->i_height;
+ p_vout->output.i_aspect = p_vout->p_sys->i_width
+ * VOUT_ASPECT_FACTOR / p_vout->p_sys->i_height;
+ p_vout->output.i_chroma = FOURCC_RV32;
- /* Allocate memory for the 2 display buffers */
- p_vout->p_sys->pp_buffer[0] = (byte_t*) malloc( i_page_size );
- p_vout->p_sys->pp_buffer[1] = (byte_t*) malloc( i_page_size );
- if( p_vout->p_sys->pp_buffer[0] == NULL || p_vout->p_sys->pp_buffer[0] == NULL )
+ p_pic = NULL;
+
+ /* Find an empty picture slot */
+ for( i_index = 0 ; i_index < VOUT_MAX_PICTURES ; i_index++ )
{
- intf_ErrMsg("vout error: can't allocate video memory (%s)\n", strerror(errno) );
- if( p_vout->p_sys->pp_buffer[0] != NULL ) free( p_vout->p_sys->pp_buffer[0] );
- if( p_vout->p_sys->pp_buffer[1] != NULL ) free( p_vout->p_sys->pp_buffer[1] );
- p_win->locker->Unlock();
- return( 1 );
+ if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE )
+ {
+ p_pic = p_vout->p_picture + i_index;
+ break;
+ }
+ }
+
+ if( p_pic == NULL )
+ {
+ return 0;
}
- /* Set and initialize buffers */
- vout_SetBuffers( p_vout, p_vout->p_sys->pp_buffer[0],
- p_vout->p_sys->pp_buffer[1] );
+ p_vout->p_sys->i_index = 0;
+ p_pic->p->p_pixels = p_vout->p_sys->pp_buffer[0];
+ p_pic->p->i_pixel_bytes = 4;
+ p_pic->p->i_lines = p_vout->p_sys->i_height;
+ p_pic->p->b_margin = 0;
+ p_pic->p->i_pitch = 4 * p_vout->p_sys->i_width;
+
+ p_pic->p->i_red_mask = 0x00ff0000;
+ p_pic->p->i_green_mask = 0x0000ff00;
+ p_pic->p->i_blue_mask = 0x000000ff;
+
+ p_pic->i_planes = 1;
+
+ p_pic->i_status = DESTROYED_PICTURE;
+ p_pic->i_type = DIRECT_PICTURE;
+
+ PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic;
+
+ I_OUTPUTPICTURES++;
- p_win->locker->Unlock();
return( 0 );
}
/*****************************************************************************
- * vout_BeEnd: terminate dummy video thread output method
+ * vout_End: terminate BeOS video thread output method
*****************************************************************************/
-void vout_BeEnd( vout_thread_t *p_vout )
+void vout_End( vout_thread_t *p_vout )
{
- VideoWindow * p_win = p_vout->p_sys->p_window;
-
- p_win->Lock();
-
- free( p_vout->p_sys->pp_buffer[0] );
- free( p_vout->p_sys->pp_buffer[1] );
-
- p_win->fReady = false;
- p_win->Unlock();
+ BeosCloseDisplay( p_vout );
}
/*****************************************************************************
- * vout_BeDestroy: destroy dummy video thread output method
+ * vout_Destroy: destroy BeOS video thread output method
*****************************************************************************
* Terminate an output method created by DummyCreateOutputMethod
*****************************************************************************/
-void vout_BeDestroy( vout_thread_t *p_vout )
+void vout_Destroy( vout_thread_t *p_vout )
{
- BeosCloseDisplay( p_vout );
-
free( p_vout->p_sys );
}
/*****************************************************************************
- * vout_BeManage: handle dummy events
+ * vout_Manage: handle BeOS events
*****************************************************************************
* This function should be called regularly by video output thread. It manages
* console events. It returns a non null value on error.
*****************************************************************************/
-int vout_BeManage( vout_thread_t *p_vout )
+int vout_Manage( vout_thread_t *p_vout )
{
- if( p_vout->i_changes & VOUT_SIZE_CHANGE )
- {
- intf_DbgMsg("resizing window\n");
- p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
-
- /* Resize window */
- p_vout->p_sys->p_window->ResizeTo( p_vout->i_width, p_vout->i_height );
-
- /* Destroy XImages to change their size */
- vout_SysEnd( p_vout );
-
- /* Recreate XImages. If SysInit failed, the thread can't go on. */
- if( vout_SysInit( p_vout ) )
- {
- intf_ErrMsg("error: can't resize display\n");
- return( 1 );
- }
-
- /* Tell the video output thread that it will need to rebuild YUV
- * tables. This is needed since convertion buffer size may have changed */
- p_vout->i_changes |= VOUT_YUV_CHANGE;
- intf_Msg("Video display resized (%dx%d)\n", p_vout->i_width, p_vout->i_height);
- }
+// VideoWindow * p_win = p_vout->p_sys->p_window;
+
+// p_win->resizeIfRequired(p_vout->p_sys->pp_buffer[p_vout->p_sys->i_index].i_pic_width,
+// p_vout->p_sys->pp_buffer[p_vout->p_sys->i_index].i_pic_height);
+
return( 0 );
}
/*****************************************************************************
- * vout_BeDisplay: displays previously rendered output
+ * vout_Render: render previously calculated output
+ *****************************************************************************/
+void vout_Render( vout_thread_t *p_vout, picture_t *p_pic )
+{
+ ;
+}
+
+/*****************************************************************************
+ * vout_Display: displays previously rendered output
*****************************************************************************
- * This function send the currently rendered image to dummy image, waits until
+ * This function send the currently rendered image to BeOS image, waits until
* it is displayed and switch the two rendering buffers, preparing next frame.
*****************************************************************************/
-void vout_BeDisplay( vout_thread_t *p_vout )
+void vout_Display( vout_thread_t *p_vout, picture_t *p_pic )
{
VideoWindow * p_win = p_vout->p_sys->p_window;
-
- p_win->locker->Lock();
- p_vout->i_buffer_index = ++p_vout->i_buffer_index & 1;
- p_win->fReady = true;
- p_win->fDirty = true;
- p_win->locker->Unlock();
+
+ /* draw buffer if required */
+ if (!p_win->teardownwindow)
+ {
+ p_win->drawBuffer(p_vout->p_sys->i_index);
+ }
+ /* change buffer */
+ p_vout->p_sys->i_index = ++p_vout->p_sys->i_index & 1;
+ p_pic->p->p_pixels = p_vout->p_sys->pp_buffer[p_vout->p_sys->i_index];
}
/* following functions are local */
/*****************************************************************************
- * BeosOpenDisplay: open and initialize dummy device
- *****************************************************************************
- * XXX?? The framebuffer mode is only provided as a fast and efficient way to
- * display video, providing the card is configured and the mode ok. It is
- * not portable, and is not supposed to work with many cards. Use at your
- * own risk !
+ * BeosOpenDisplay: open and initialize BeOS device
*****************************************************************************/
-
static int BeosOpenDisplay( vout_thread_t *p_vout )
{
- /* Create the DirectDraw video window */
- p_vout->p_sys->p_window =
- new VideoWindow( BRect( 100, 100, 100+p_vout->i_width, 100+p_vout->i_height ), "VideoLAN", p_vout );
- if( p_vout->p_sys->p_window == 0 )
+ p_vout->p_sys->p_window = new VideoWindow( p_vout->p_sys->i_width - 1,
+ p_vout->p_sys->i_height - 1,
+ p_vout );
+
+ if( p_vout->p_sys->p_window == NULL )
{
- free( p_vout->p_sys );
- intf_ErrMsg( "error: cannot allocate memory for VideoWindow\n" );
+ intf_ErrMsg( "error: cannot allocate memory for VideoWindow" );
return( 1 );
}
- VideoWindow * p_win = p_vout->p_sys->p_window;
- /* Wait until DirectConnected has been called */
- while( !p_win->fConnected )
- snooze( 50000 );
+ p_vout->p_sys->i_width = p_vout->p_sys->p_window->i_width + 1;
+ p_vout->p_sys->i_height = p_vout->p_sys->p_window->i_height + 1;
- p_vout->i_screen_depth = p_win->i_screen_depth;
- p_vout->i_bytes_per_pixel = p_win->i_bytes_per_pixel;
- p_vout->i_bytes_per_line = p_vout->i_width*p_win->i_bytes_per_pixel;
-
- switch( p_vout->i_screen_depth )
- {
- case 8:
- intf_ErrMsg( "vout error: 8 bit mode not fully supported\n" );
- break;
- case 15:
- p_vout->i_red_mask = 0x7c00;
- p_vout->i_green_mask = 0x03e0;
- p_vout->i_blue_mask = 0x001f;
- break;
- case 16:
- p_vout->i_red_mask = 0xf800;
- p_vout->i_green_mask = 0x07e0;
- p_vout->i_blue_mask = 0x001f;
- break;
- case 24:
- case 32:
- default:
- p_vout->i_red_mask = 0xff0000;
- p_vout->i_green_mask = 0x00ff00;
- p_vout->i_blue_mask = 0x0000ff;
- break;
- }
+ p_vout->p_sys->pp_buffer[0] = (u8*)p_vout->p_sys->p_window->bitmap[0]->Bits();
+ p_vout->p_sys->pp_buffer[1] = (u8*)p_vout->p_sys->p_window->bitmap[1]->Bits();
return( 0 );
}
/*****************************************************************************
- * BeosDisplay: close and reset dummy device
+ * BeosDisplay: close and reset BeOS device
*****************************************************************************
* Returns all resources allocated by BeosOpenDisplay and restore the original
* state of the device.
static void BeosCloseDisplay( vout_thread_t *p_vout )
{
/* Destroy the video window */
- p_vout->p_sys->p_window->Lock();
- p_vout->p_sys->p_window->Quit();
+ delete p_vout->p_sys->p_window;
}
} /* extern "C" */
projects / vlc / blobdiff