Changeset 168

Timestamp:

May 3, 2006, 9:34:43 PM (19 years ago)

Author:

vladest

Message:

Fixed crash when moving window with OSD
Changed About page in settings
Fixed Mozilla plugin crash when close window
Fixed slight desync introduced in 1.0GA
Optimized bswap in libdvdread

Location:

trunk

Files:

• gui/makefile (modified) (1 diff)
• gui/np/npwv.cpp (modified) (39 diffs)
• gui/np/npwv.rc (modified) (1 diff)
• gui/play.hpp (modified) (3 diffs)
• gui/showwin.hpp (modified) (7 diffs)
• gui/version.h (modified) (1 diff)
• gui/video2.cpp (modified) (1 diff)
• gui/video2.hpp (modified) (2 diffs)
• gui/wvguidlg.dlg (modified) (1 diff)
• libdvdread/Makefile (modified) (1 diff)
• libdvdread/bswap.h (modified) (2 diffs)
• libdvdread/ifo_print.c (modified) (3 diffs)
• video/vdecode.c (modified) (7 diffs)
• vout.c (modified) (3 diffs)
• vout.h (modified) (1 diff)
• yuv/yuv2rgb.c (modified) (1 diff)

trunk/gui/makefile ¶

@@ -128 +128 @@
    -@nmake clean
    -@cd gui
+
+rebuild:
+   -@cd ..
+   -@nmake clean
+   -@cd gui
+   -@nmake

trunk/gui/np/npwv.cpp ¶

@@ -12 +12 @@
 #include <stdlib.h>
 #include <process.h>
+#include <stdarg.h>
+#include <direct.h>
+#include <ctype.h>
+#include <string.h>
+#include <math.h>
+#include <errno.h>
+#include <time.h>
 
 #include "npapi.h"
@@ -19 +26 @@
 extern "C" void _CRT_term(void);
 
-//#define DEBUG
+#define DEBUG
+
+static char *months[] =
+{
+    "Jan",
+    "Feb",
+    "Mar",
+    "Apr",
+    "May",
+    "Jun",
+    "Jul",
+    "Aug",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Dec"
+};
+
+void myctime(time_t *tt_in, char *tt_out)
+{
+    struct tm tt1;
+
+    tt1 = *localtime(tt_in);
+    sprintf(tt_out,"%2d %.3s %.4d %.2d:%.2d:%.2d",
+            tt1.tm_mday,months[tt1.tm_mon],tt1.tm_year+1900,
+            tt1.tm_hour,tt1.tm_min,tt1.tm_sec);
+}
+
+void dprintf(const char *fmt,...)
+{
+    FILE *wvnp_log = NULL;
+    va_list arg_ptr;
+    time_t curtime;
+    char temp[100] = {0};
+
+#ifdef DEBUG
+    time(&curtime);
+    myctime(&curtime,temp);
+
+    wvnp_log = fopen("wvnp.log","a");
+
+    va_start(arg_ptr, fmt);
+    if (wvnp_log) fprintf(wvnp_log,"%s ",temp);
+    if (wvnp_log) vfprintf(wvnp_log, fmt, arg_ptr);
+    va_end(arg_ptr);
+    if (wvnp_log) fclose(wvnp_log);
+#endif
+    return;
+}
+
 //#undef DEBUG
 
 #define FID_PANE        255
+
+#define strcasecmp strcmpi /* VAC workaround */
 
 static char *newstrdup( const char *s )
@@ -75 +133 @@
     int             fToWV; // 0 - processing, 1 - success, 2 - error;
     char            *url;
+    char            *url_src;
     char            *errstr;
     int             tid;
@@ -80 +139 @@
     int             wvstarted;
     int             urlsent;
+    int width;
+    int height;
+    int loop_play;
 } PluginInstance;
 
@@ -169 +231 @@
     // dependant DLLs
 //    pmdicon = WinLoadPointer( HWND_DESKTOP , NULL/*_os2hmod*/ , 1 );
+    dprintf("NPP_Initialize\n");
     return NPERR_NO_ERROR;
 }
@@ -181 +244 @@
     //    This->fToWV = 1;
     //    DosSleep(32);
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf(f,"NPP_Shutdown\n");
-    fclose(f);
-#endif
+    dprintf("NPP_Shutdown\n");
 //    WinDestroyPointer( pmdicon );
     // do your one time uninitialization here, such as unloading dynamically
@@ -196 +255 @@
 //----------------------------------------------------------------------------
 NPError NP_LOADDS NPP_New(NPMIMEType pluginType,
-        NPP instance,
-        uint16 mode,
-        int16 argc,
-        char* argn[],
-        char* argv[],
-        NPSavedData* saved)
+                          NPP instance,
+                          uint16 mode,
+                          int16 argc,
+                          char* argn[],
+                          char* argv[],
+                          NPSavedData* saved)
 {
     int i;
 
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf(f,"NPP_New. Mime [%s]\n", pluginType);
-    fclose(f);
-#endif
+    dprintf("NPP_New. Mime [%s]\n", pluginType);
     for (i = 0; i < argc; i++) {
         if (strstr(argn[i],"flashvars") != NULL) /* we doesnt supports Flash */
@@ -218 +273 @@
             if (strstr(argv[i],"swf") != NULL) /* we doesnt supports Flash */
             {
-#ifdef DEBUG
-                f = fopen("wvnp.log","a");
-                fprintf(f,"Flash doesnt supported\n", pluginType);
-                fclose(f);
-#endif
+                dprintf("Flash doesnt supported\n", pluginType);
                 return NPERR_INVALID_PLUGIN_ERROR;
             }
@@ -229 +280 @@
 
     if (instance == NULL)
+    {
+        dprintf("NPP_New error. Invalid instance\n");
         return NPERR_INVALID_INSTANCE_ERROR;
+    }
 
     instance->pdata = NPN_MemAlloc(sizeof(PluginInstance));
@@ -259 +313 @@
 
     /* parse args */
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
     for (i = 0; i < argc; i++) {
-        fprintf (f,"  argument '%s'='%s'\n", argn[i], argv[i]);
-    }
-    fclose(f);
-#endif
-
-#if 0
-    if (!strcasecmp (argn[i], "loop")) {
-        if (!strcasecmp (argv[i], "true") || !strcasecmp (argv[i], "yes") ||
-            !strcmp (argv[i], "1")) {
-            this->loop_play = 1;
-        }
-    } else if (!strcasecmp (argn[i], "width")) {
-        this->width = atoi(argv[i]);
-    } else if (!strcasecmp (argn[i], "height")) {
-        this->height = atoi(argv[i]);
-    } else if (!strcasecmp (argn[i], "src")) {
-        this->url_src = strdup(argv[i]);
-    } else if (!strcasecmp (argn[i], "mrl")) {
-        snprintf(this->url,MAX_URL,argv[i]);
-        this->url[MAX_URL-1]='\0';
-    }
-}
-#endif
-
-return NPERR_NO_ERROR;
+        dprintf("  argument '%s'='%s'\n", argn[i], argv[i]);
+    }
+
+    for (i = 0; i < argc; i++)
+    {
+        if (!strcasecmp (argn[i], "loop")) {
+            if (!strcasecmp (argv[i], "true") || !strcasecmp (argv[i], "yes") ||
+                !strcmp (argv[i], "1")) {
+                This->loop_play = 1;
+            }
+        } else if (!strcasecmp (argn[i], "width")) {
+            This->width = atoi(argv[i]);
+        } else if (!strcasecmp (argn[i], "height")) {
+            This->height = atoi(argv[i]);
+        } else if (!strcasecmp (argn[i], "src")) {
+            This->url_src = strdup(argv[i]);
+        } else if (!strcasecmp (argn[i], "FileName")) {
+            This->url = strdup(argv[i]);
+        } else if (!strcasecmp (argn[i], "mrl")) {
+            This->url = strdup(argv[i]);
+        }
+    }
+    return NPERR_NO_ERROR;
 }
 
@@ -295 +345 @@
 NPError NP_LOADDS NPP_Destroy(NPP instance, NPSavedData** save)
 {
+
+    dprintf("NPP_Destroy(). instance: %x\n", instance);
     if (instance == NULL)
         return NPERR_INVALID_INSTANCE_ERROR;
@@ -306 +358 @@
     // recreated.
     //
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf (f,"NPP_Destroy()\n");
-    fclose(f);
-#endif
 
     if (This != NULL)
@@ -380 +427 @@
     SWP swp;
 
+    dprintf("NPP_SetWindow(). instance: %x, window: %x\n", instance, window);
     if (instance == NULL)
         return NPERR_INVALID_INSTANCE_ERROR;
@@ -386 +434 @@
 
     PluginInstance* This = (PluginInstance*) instance->pdata;
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf (f,"NPP_SetWindow()\n");
-    fclose(f);
-#endif
 
     //
@@ -457 +500 @@
 {
     char s[100] = {0};
+
+    dprintf("NPP_NewStream...Starting WV(). instance: %x\n", instance);
+
     if (instance == NULL)
         return NPERR_INVALID_INSTANCE_ERROR;
     PluginInstance* This = (PluginInstance*) instance->pdata;
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf (f,"NPP_NewStream...Starting WV()\n");
-    fclose(f);
-#endif
 
     // Need start WV...
     if (!startWV(This))
     {
-#ifdef DEBUG
-        f = fopen("wvnp.log","a");
-        fprintf (f,"cant start WV()\n");
-        fclose(f);
-#endif
+        dprintf("cant start WV()\n");
         This->errstr = newstrdup( "Can't start WarpVision..." );
         return NPERR_NO_ERROR;
@@ -518 +555 @@
             strcat( s , optNPWV );
         }
-#ifdef DEBUG
-        f = fopen("wvnp.log","a");
-        fprintf(f,"sending [%s] to WV\n",s);
-        fclose(f);
-#endif
+        dprintf("sending [%s] to WV\n",s);
     }
     else
     {
-#ifdef DEBUG
-        f = fopen("wvnp.log","a");
-        fprintf(f,"ERROR unsupported protocol in [%s]\n",This->url);
-        fclose(f);
-#endif
+        dprintf("ERROR unsupported protocol in [%s]\n",This->url);
         This->errstr = newstrdup( "Unsupported protocol." );
     }
@@ -566 +595 @@
 NPP_WriteReady(NPP instance, NPStream *stream)
 {
+    dprintf("NPP_WriteReady(). instance: %x\n", instance);
     if (instance != NULL)
         PluginInstance* This = (PluginInstance*) instance->pdata;
@@ -580 +610 @@
           int32 offset, int32 len, void *buffer)
 {
+    dprintf("NPP_Write(). instance: %x\n", instance);
+
     //return -1 to tell it I don't want data.
     return -1;
@@ -599 +631 @@
 NPP_DestroyStream(NPP instance, NPStream *stream, NPError reason)
 {
+    dprintf("NPP_DestroyStream(). instance: %x\n", instance);
+
     if (instance == NULL)
         return NPERR_INVALID_INSTANCE_ERROR;
@@ -613 +647 @@
 NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
 {
+    dprintf("NPP_StreamAsFile(). instance: %x\n", instance);
+
     if (instance == NULL)
         return;
@@ -629 +665 @@
 NPP_Print(NPP instance, NPPrint* printInfo)
 {
+    dprintf("NPP_Print(). instance: %x\n", instance);
+
     if (printInfo == NULL)   // trap invalid parm
         return;
@@ -684 +722 @@
 {
     NPBool eventHandled = FALSE;
+
+    dprintf("NPP_HandleEvent(). instance: %x\n", instance);
+
     if (instance == NULL)
         return eventHandled;
@@ -716 +757 @@
 NPP_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
 {
+    dprintf("URL Notyfy() [%s], reason: %i. instance: %x\n", url, reason, instance);
     if (instance != NULL)
         PluginInstance* This = (PluginInstance*) instance->pdata;
-#if 1
-    f = fopen("wvnp.log","a");
-    fprintf(f,"URL Notyfy() [%s], reason: %i\n", url, reason);
-    fclose(f);
-#endif
 
 }
@@ -733 +770 @@
 NPP_GetJavaClass(void)
 {
+    dprintf("NPP_GetJavaClass()\n");
     return((jref) 0);
 }
@@ -743 +781 @@
 NPP_GetValue(NPP instance, NPPVariable variable, void* value)
 {
+    dprintf("NPP_GetValue(). instance: %x\n", instance);
     if (instance != NULL)
         PluginInstance* This = (PluginInstance*) instance->pdata;
@@ -756 +795 @@
 NPP_SetValue(NPP instance, NPNVariable variable, void* value)
 {
+    dprintf("NPP_SetValue(). instance: %x\n", instance);
+
     if (instance != NULL)
         PluginInstance* This = (PluginInstance*) instance->pdata;
@@ -768 +809 @@
     PluginInstance *This = NULL;
 #if 0
-    f = fopen("wvnp.log","a");
-    fprintf(f,"fr win: msg: %X, mp1: %X mp2: %X\n",msg, mp1, mp2);
-    fclose(f);
+    dprintf("fr win: msg: %X, mp1: %X mp2: %X\n",msg, mp1, mp2);
 #endif
 
@@ -791 +830 @@
         return WinDefWindowProc(hWnd,Message,wParam,lParam);
 #if 0
-        f = fopen("wvnp.log","a");
-        fprintf(f,"clr win: msg: %X, mp1: %X mp2: %X\n",Message, wParam, lParam);
-        fclose(f);
+        dprintf("clr win: msg: %X, mp1: %X mp2: %X\n",Message, wParam, lParam);
 #endif
         if (This && !This->wvstarted)
@@ -873 +910 @@
         break;
     case WM_DESTROY:
-#ifdef DEBUG
-        f = fopen("wvnp.log","a");
-        fprintf(f,"got WM_DESTROY\n");
-        fclose(f);
-#endif
-        WinSetWindowULong(hWnd, QWL_USER, 0);
+        dprintf("got WM_DESTROY\n");
+        //WinSetWindowULong(hWnd, QWL_USER, 0);
         break;
     default:
@@ -897 +930 @@
     memcpy(&r,&rcl,sizeof(RECTL));
     WinMapWindowPoints (hwnd, HWND_DESKTOP, (PPOINTL)&r, 2);
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf (f,"urlsent: %i\n",This->urlsent);
-    fclose(f);
-#endif
+    dprintf("urlsent: %i\n",This->urlsent);
     if (This->urlsent)
     {
@@ -926 +955 @@
         This->fToWV = 0;
         This->errstr = newstrdup( "Can't create thread." );
-#ifdef DEBUG
-        f = fopen("wvnp.log","a");
-        fprintf (f,"Send to WV..cant start thread\n");
-        fclose(f);
-#endif
+        dprintf("Send to WV..cant start thread\n");
         WinInvalidateRect( This->hWnd , NULL, TRUE );
     }
@@ -946 +971 @@
     int i;
 
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf(f,"Pipe thread started\n");
-    fclose(f);
-#endif
+    dprintf("Pipe thread started\n");
     while ( threadstop == 0)
     {
@@ -979 +1000 @@
             if ( rc == NO_ERROR )
             {
-#ifdef DEBUG
-                f = fopen("wvnp.log","a");
-                fprintf(f,"sent to pipe %i bytes from [%s]\n",Written,pipeBuf);
-                fclose(f);
-#endif
+                dprintf("sent to pipe %i bytes from [%s]\n",Written,pipeBuf);
                 /* make sure, that url sent to avoid erasing url from buffer by wm_paint */
                 if (memicmp(pipeBuf,optUrl, 5) == 0) //
@@ -990 +1007 @@
                     /* now tell the window that we need to repaint and
                      resend /OUT */
-#ifdef DEBUG
-                    f = fopen("wvnp.log","a");
-                    fprintf(f,"call repaint\n");
-                    fclose(f);
-#endif
+                    dprintf("call repaint\n");
                     WinInvalidateRect(This->hWndCl, 0, TRUE);
                 }
@@ -1006 +1019 @@
                 This->errstr = newstrdup( errmsg );
                 delete errmsg;
-#ifdef DEBUG
-                f = fopen("wvnp.log","a");
-                fprintf(f,"ERROR %i sending to pipe [%s]\n",rc,pipeBuf);
-                fclose(f);
-#endif
+                dprintf("ERROR %i sending to pipe [%s]\n",rc,pipeBuf);
             }
             DosClose( PipeHandle );
@@ -1017 +1026 @@
         {
             This->wvstarted = 0;
-#ifdef DEBUG
-            f = fopen("wvnp.log","a");
-            fprintf(f,"ERROR %i opening pipe [%s]\n",rc,pipeName);
-            fclose(f);
-#endif
+            dprintf("ERROR %i opening pipe [%s]\n",rc,pipeName);
         }
 
@@ -1028 +1033 @@
 
     This->tid = -1;
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf(f,"Pipe thread closed\n");
-    fclose(f);
-#endif
+    dprintf("Pipe thread closed\n");
     _endthread();
 }
@@ -1055 +1056 @@
     {
         rc = DosWaitNPipe( pipeName , 10000 );
-#ifdef DEBUG
-        f = fopen("wvnp.log","a");
-        fprintf(f,"DosWaitNPipe rc=%i\n",rc);
-        fclose(f);
-#endif
+        dprintf("DosWaitNPipe rc=%i\n",rc);
         if ( rc == 0 )  return TRUE;
     }
@@ -1115 +1112 @@
     if ( happ == NULLHANDLE )
     {
-#ifdef DEBUG
-        f = fopen("wvnp.log","a");
-        fprintf(f,"WV at [%s] starting error: %x. \n", pmdExe, WinGetLastError(0));
-        fclose(f);
-#endif
-
+        dprintf("WV at [%s] starting error: %x. \n", pmdExe, WinGetLastError(0));
         return FALSE;
     }
 
-#ifdef DEBUG
-    f = fopen("wvnp.log","a");
-    fprintf(f,"WV started\n");
-    fclose(f);
-#endif
+    dprintf("WV started\n");
 #if 1
     int counter = 16;    // 16 x 250 = 4 ᥪ㭀ë

trunk/gui/np/npwv.rc ¶

@@ -6 +6 @@
 RCDATA NP_INFO_FileExtents     { "mov|mov|mp4|sdp|mov|avi|avi|mpg,mpeg|mp4|mpg,mpeg|mpv2,mp2ve|ram|rpm|ra|asf,asx|ogg|ogg|ogg|wmv|asf|asf,asx|wmv|wvx|wax|wma|asx|wmv|wav|wav|smil|nsv|asx|m3u|divx|divx\0" }
 RCDATA NP_INFO_FileOpenName    { "Quicktime|Quicktime|Quicktime|Quicktime - Session Description Protocol|Quicktime|AVI|AVI|MPEG|MPEG Video|MPEG|MPEG2|RealAudio|RealAudio|RealAudio|Windows Media|Ogg Vorbis Media|Ogg Vorbis Audio|Ogg Vorbis|WMV|MSNBCPlayer|MS ASF video|Windows Media|Windows Media|Windows Media|Windows Media|Windows Media|Windows Media|Microsoft wave file|Microsoft wave file|SMIL|Nullsoft Streaming Video|WMP|MPEG url|DivX Media Format|DivX Media Format\0" }
-//RCDATA NP_INFO_MIMEType        { "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv\0" }
-//RCDATA NP_INFO_FileExtents     { "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg\0" }
-//RCDATA NP_INFO_FileOpenName    { "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|WV plugin\0" }
 RCDATA NP_INFO_FileDescription { "WarpVision streaming plugin, <a href=""http://www.netlabs.org"">http://www.netlabs.org</a>" }
 RCDATA NP_INFO_ProductName     { "WarpVision" }

trunk/gui/play.hpp ¶

@@ -468 +468 @@
             {
                 audio_time = sh_audio->pts;
-#if 0
+#if 1
                 audio_time=d_audioM->pts;
                 audio_time+=(ds_tell_pts(d_audioM)-sh_audio->a_in_buffer_len)/
@@ -796 +796 @@
             showsubs = FALSE;
             sub_curr = NULL;
-            sub_curr_ogg = NULL;
+            vo_sub = NULL;
             if (OSDCommand > OSDPOS)
                 OSDCommand = OSDNONE;
@@ -2514 +2514 @@
         case DEMUXER_TYPE_ASF:
         case DEMUXER_TYPE_OGG:
+        case DEMUXER_TYPE_MATROSKA:
         case DEMUXER_TYPE_LAVF:
             sh_video->aspect = 1.0;

trunk/gui/showwin.hpp ¶

@@ -73 +73 @@
 extern RECTL OutWin;
 HWND mozHWND;
+volatile int window_moving = 0;
 
 int show_mouse(void)
@@ -1881 +1882 @@
             mbp = TRUE;
             if (fFullScreen) break; // dont track when fullscreen
+            window_moving = 1;
             return WinSendMsg(WinQueryWindow(hwnd,QW_PARENT), WM_TRACKFRAME, MPFROMSHORT(TF_MOVE), MPVOID);
         }
@@ -1886 +1888 @@
     case WM_BUTTON1MOTIONEND:
         {
+            window_moving = 0;
             mbp = FALSE;
             break;
@@ -2164 +2167 @@
     int briperc;
     char langtxt[60] = {0};
+
+    if (window_moving)
+    {
+        OSDStopTimer();
+        OSDEventClear();
+        return; /* no OSD while window moving */
+    }
+
     if (Ft2EnableFontEngine && conf.UseFt2Lib)
         Ft2EnableFontEngine(TRUE);
@@ -2218 +2229 @@
     if (Ft2EnableFontEngine)
         Ft2EnableFontEngine(FALSE);
-
 }
 
@@ -2593 +2603 @@
     if (!sub) return 1;
 
-    if (prev_sub == sub && !sub_ogg_changed) // still the same subtitle. Just put it into frame
+    if (prev_sub == sub && !vo_sub_changed) // still the same subtitle. Just put it into frame
     {
         if (SubOSD.Bits != NULL)
@@ -2801 +2811 @@
         DevCloseDC(hdct);
         prev_sub = sub;
-        sub_ogg_changed = 0;
+        vo_sub_changed = 0;
     }
     return 0;

trunk/gui/version.h ¶

@@ -1 @@
-#define VERSION "2 May 2006"
+#define VERSION "3 May 2006"

trunk/gui/video2.cpp ¶

@@ -1503 +1503 @@
                     }
 
-                    if (sub_curr_ogg && sub_curr_ogg->lines > 0)
-                    {
-                        sub_curr=sub_curr_ogg;
+                    if (vo_sub && vo_sub->lines > 0)
+                    {
+                        sub_curr=vo_sub;
                         OSDCommand = OSDSUBT;
                         DosAsyncTimer(OSD_TIMEOUT,(HSEM) OSDEvent, &htimerOSDEvent);

trunk/gui/video2.hpp ¶

@@ -376 +376 @@
 sub_data* subtitles=NULL;
 subtitle* sub_curr=NULL;
-extern subtitle* sub_curr_ogg;
-extern int sub_ogg_changed;
+extern subtitle* vo_sub;
+extern int vo_sub_changed;
 float sub_last_pts = -303;
 float zoomScale = 1.0f;
@@ -1174 +1174 @@
         showsubs = FALSE;
         sub_curr = NULL;
-        sub_curr_ogg = NULL;
+        vo_sub = NULL;
         if (OSDCommand > OSDPOS)
             OSDCommand = OSDNONE;

trunk/gui/wvguidlg.dlg ¶

@@ -123 +123 @@
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
                         PRESPARAMS PP_FONTNAMESIZE, "20.Helv"
-        CTEXT           "http://os2.kiev.ua", 402, 5, 51, 200, 8, DT_VCENTER
+        CTEXT           "http://warpvision.netlabs.org", 402, 5, 51, 200, 8, DT_VCENTER
         CTEXT           "An AVI (MPEG4,DivX), MPEG, DVD, VCD video player for OS/2", 403, 5, 64, 200, 8, DT_VCENTER | SS_AUTOSIZE
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00000000L
         CTEXT           "Build date: ", 1997, 5, 35, 200, 8, DT_VCENTER | DT_CENTER
         CTEXT           VERSION, 1998, 5, 25, 200, 8, DT_VCENTER | DT_CENTER
+        CTEXT           "(c) by netlabs.org", 1996, 5, 15, 200, 8, DT_VCENTER | DT_CENTER
         LTEXT           "Registered to: Unregistered", IDD_REGISTRATION, 5, 5, 400, 8
     END

trunk/libdvdread/Makefile ¶

@@ -1 +1 @@
 !include ..\Makefile.inc
 
-OBJ_C = dvd_input.obj dvd_reader.obj dvd_udf.obj ifo_read.obj \
+OBJ_C = dvd_input.obj dvd_reader.obj dvd_udf.obj ifo_read.obj ifo_print.obj \
         nav_read.obj nav_print.obj md5.obj
 

trunk/libdvdread/bswap.h ¶

@@ -24 +24 @@
 
 #if defined(WORDS_BIGENDIAN)
-/* All bigendian systems are fine, just ignore the swaps. */  
+/* All bigendian systems are fine, just ignore the swaps. */
 #define B2N_16(x) (void)(x)
 #define B2N_32(x) (void)(x)
 #define B2N_64(x) (void)(x)
 
-#else 
+#else
 
 #if defined(OS2)
 
-#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8)
-// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
-#define bswap_32(x) \
-     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
-static __inline uint64_t bswap_64(uint64_t x)
+inline static unsigned short bswap_16(unsigned short x)
 {
-    union { 
-        uint64_t ll;
-        uint32_t l[2]; 
-    } w, r;
-    w.ll = x;
-    r.l[0] = bswap_32 (w.l[1]);
-    r.l[1] = bswap_32 (w.l[0]);
-    return r.ll;
+    __asm("xchgb %b0,%h0" :
+          "=q" (x)        :
+          "0" (x));
+    return x;
+}
+#define B2N_16(x) x = bswap_16(x)
+
+inline static unsigned int bswap_32(unsigned int x)
+{
+    __asm(
+#if __CPU__ > 386
+          "bswap   %0":
+          "=r" (x)     :
+#else
+          "xchgb   %b0,%h0\n"
+          " rorl    $16,%0\n"
+          " xchgb   %b0,%h0":
+          "=q" (x)          :
+#endif
+          "0" (x));
+    return x;
+}
+#define B2N_32(x) x = bswap_32(x)
+
+inline static unsigned long long int bswap_64(unsigned long long int x)
+{
+    register union { __extension__ uint64_t __ll;
+        uint32_t __l[2]; } __x;
+    asm("xchgl    %0,%1":
+        "=r"(__x.__l[0]),"=r"(__x.__l[1]):
+        "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
+    return __x.__ll;
 }
 
@@ -72 +91 @@
 #define B2N_64(x) x = swap64(x)
 
-/* This is a slow but portable implementation, it has multiple evaluation 
+/* This is a slow but portable implementation, it has multiple evaluation
  * problems so beware.
- * FreeBSD and Solaris don't have <byteswap.h> or any other such 
- * functionality! 
+ * FreeBSD and Solaris don't have <byteswap.h> or any other such
+ * functionality!
  */
 

trunk/libdvdread/ifo_print.c ¶

@@ -1 @@
-/*
+/* 
  * Copyright (C) 2000, 2001, 2002, 2003
  *               Björn Englund <d4bjorn@dtek.chalmers.se>, 
@@ -764 +764 @@
   
   for(i = 0; i < 8; i++) {
-      if(pgc->audio_control[i].present) {
+      if(pgc->audio_control[i] & 0x8000) {
         printf("Audio stream %i control: %04x\n", 
                i, pgc->audio_control[i]);
@@ -771 +771 @@
   
   for(i = 0; i < 32; i++) {
-      if(pgc->subp_control[i].present) {
+      if(pgc->subp_control[i] & 0x80000000) {
           printf("Subpicture stream %2i control: %08x\n",
                  i, pgc->subp_control[i]);

trunk/video/vdecode.c ¶

@@ -897 +897 @@
                 decompress_win32_video(sh_video->codec, in_size, start, pp_buffer, (sh_video->ds->flags&1));
                 OSDBuffer = pp_buffer;
-                if (OSDCommand != OSDNONE)
-                    OSDMain();
+                conf.VideoFormat = formatConvert(PIX_FMT_YUV422);
                 avpicture_fill(&src_pic, pp_buffer,
                                PIX_FMT_YUV422, width, height);
                 avpicture_fill(&dst_pic, dive_buffer,
                                VOutCaps->Formats[0], width, height);
+                suby = src_pic.data[0];
+                subu = src_pic.data[1];
+                subv = src_pic.data[2];
+
+                if (OSDCommand != OSDNONE)
+                    OSDMain();
+
                 ret = img_convert(&dst_pic, VOutCaps->Formats[0],
                                   &src_pic, PIX_FMT_YUV422,
                                   width, height);
-                conf.VideoFormat = formatConvert(PIX_FMT_YUV422);
                 //printf("conv ret: %i\n", ret);
             }
@@ -1107 +1112 @@
                 y1 = y0+y;
 
-                suby[x1 + y1 * subwidth] =  COMPUTE_Y(r,g,b);
+                if (suby) suby[x1 + y1 * subwidth] =  COMPUTE_Y(r,g,b);
 
                 if (((x1 % 2) == 0) && ((y1 % 2) == 0))
                 {
-                    subu[x1/2 + subwidth/2 * y1/2] = COMPUTE_U(r,g,b);
-                    subv[x1/2 + subwidth/2 * y1/2] = COMPUTE_V(r,g,b);
+                    if (subu) subu[x1/2 + subwidth/2 * y1/2] = COMPUTE_U(r,g,b);
+                    if (subv) subv[x1/2 + subwidth/2 * y1/2] = COMPUTE_V(r,g,b);
                 }
 
@@ -1207 +1212 @@
                 y1 = y0+y;
 
-                suby[x1 + y1 * subwidth] =  COMPUTE_Y(r,g,b);
+                if (suby) suby[x1 + y1 * subwidth] =  COMPUTE_Y(r,g,b);
                 //                    printf("c\n");
-
                 if (((x1 % 2) == 0) && ((y1 % 2) == 0))
                 {
-                    subu[x1/2 + subwidth/2 * y1/2] = COMPUTE_U(r,g,b);
-                    subv[x1/2 + subwidth/2 * y1/2] = COMPUTE_V(r,g,b);
+                    if (subu) subu[x1/2 + subwidth/2 * y1/2] = COMPUTE_U(r,g,b);
+                    if (subv) subv[x1/2 + subwidth/2 * y1/2] = COMPUTE_V(r,g,b);
                 }
             }
@@ -1358 +1362 @@
         WidthRequested = dive_internal_bpl / video_header.format_bpp;
 
-    WidthRequested = (WidthRequested + 15) &~ 15;
+//    WidthRequested = (WidthRequested + 15) &~ 15;
 
     suby = py;
@@ -1416 +1420 @@
             ret = img_convert(&dst_conv, PIX_FMT_YUV420P,
                         (AVPicture *)&video_picture, video_context->pix_fmt,
-                              (width + 15) &~ 15, height);
+                              width, height);
             if (ret < 0)
                 printf("conv rc %i\n", ret);
@@ -1485 +1489 @@
             yuv2rgb((unsigned char *)dive_internal_buffer,
                     suby, subu, subv,
-                    (width + 15) &~ 15, height,
+                    width, height,
                     WidthRequested, stride0, stride1);
 #endif
@@ -1508 +1512 @@
                     yv12toyuy2(suby, subu, subv,
                                (unsigned char *)dive_internal_buffer,
-                               (width + 15) &~ 15, height,
+                               width, height,
                                stride0, stride1, WidthRequested * 2, bytes);
 

trunk/vout.c ¶

@@ -21 +21 @@
 #include "plugin.h"
 #include "plugins\ovplug.h"
+#include "libmpdemux\subreader.h"
 
 #define FMT_RGB16   1
@@ -44 +45 @@
 
 VideoOutPlugin *video_out_plugins = NULL;
+
+subtitle* vo_sub = NULL;
+int vo_sub_changed = 0;
 
 extern t_VOutCaps *VOutCaps; /* Video out plugin caps */
@@ -137 +141 @@
     }
 }
+/* for mplayer demuxer's compatible */
+int vo_osd_changed(int new_value)
+{
+    vo_sub_changed = 1;
+    return 0;
+}

trunk/vout.h ¶

@@ -22 +22 @@
 
 extern int CurrVideoOutPlug; // plugin index
-
+extern int vo_sub_changed;
 #endif

trunk/yuv/yuv2rgb.c ¶

@@ -190 +190 @@
     int x, y;
 
+//    printf("h: %i, w: %i, rgbstr: %i, y_str: %i, uv_str: %i\n",
+//          h_size, v_size, rgb_stride, y_stride, uv_stride);
     yuv2rgb_pxor();