[MPlayer-users] [BUG] live (gcc/g++) and libdvdnav

[Jonas Jermann]

Hi

Just some small ones:

1.  g++ doesn't accept the pentium3 optimations for me 
    (-march=pentium3) for me, i686 worked.

2.  gcc-3.1.1 with live failed at the end, 2.95.4 worked (see 
    live.log).

3.  Maybe dvdnav should be removed or patched (my patch shouldn't
    brake anything if it still works against cvs). There were
    already some user mails about it. And it seems that it's
    actually used by some users (maybe it shouldn't just be deleted).

I'm a bit lazy, sorry if I didn't provide more information (just 
wanted to report, should I such things btw?). Although some 
basic informations:

debian sid, mplayer cvs, gcc 3.1.1 and 2.95.4, pentium3 (mmx, 
sse), live from live.2002.06.07.tar.gz, ld 2.12.90.0.15

I hope I didn't forget anything essential....


Regards
    Jonas
-------------- next part --------------
--- mplayer.c	2002-08-06 17:51:23.000000000 +0200
+++ mplayer.c	2002-08-06 16:51:22.000000000 +0200
@@ -2692,7 +2692,24 @@
         break;
         }
       case DVDNAV_SPU_STREAM_CHANGE: {
-        dvdnav_stream_change_event_t * stream_change=(dvdnav_stream_change_event_t*)(dvdnav_event->details);
+#if DVDNAVVERSION > 012
+        dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t*)(dvdnav_event->details);
+
+        printf("DVDNAV Event: Nav SPU Stream Change: phys: %d/%d/%d logical: %d\n",
+                stream_change->physical_wide,
+                stream_change->physical_letterbox,
+                stream_change->physical_pan_scan,
+                stream_change->logical);
+
+        if (vo_spudec && dvdsub_id!=stream_change->physical_wide) {
+                mp_msg(MSGT_INPUT,MSGL_DBG2,"d_dvdsub->id change: was %d is now %d\n",
+                        d_dvdsub->id,stream_change->physical_wide);
+                // FIXME: need a better way to change SPU id
+                d_dvdsub->id=dvdsub_id=stream_change->physical_wide;
+                if (vo_spudec) spudec_reset(vo_spudec);
+        }
+#else
+        dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
 
         printf("DVDNAV Event: Nav SPU Stream Change: phys: %d logical: %d\n",
                 stream_change->physical,
@@ -2705,12 +2722,16 @@
                 d_dvdsub->id=dvdsub_id=stream_change->physical;
                 if (vo_spudec) spudec_reset(vo_spudec);
         }
-
+#endif
         break;
         }
       case DVDNAV_AUDIO_STREAM_CHANGE: {
         int aid_temp;
+#if DVDNAVVERSION > 012
+        dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t*)(dvdnav_event->details);
+#else
         dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
+#endif
 
         printf("DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n",
                 stream_change->physical,
--- configure	2002-08-06 17:52:15.000000000 +0200
+++ configure	2002-08-06 17:51:20.000000000 +0200
@@ -3083,6 +3083,10 @@
   else
    _ld_css="$_ld_css -ldvdnav"
   fi
+  if test -n "$_dvdnavconfig" ; then
+   _dvdnav_version=`$_dvdnavconfig --version | sed "s/\.//g"`
+   _def_dvdnav_version="#define DVDNAVVERSION $_dvdnav_version"
+  fi
   if test -n "$_dvdnavdir" ; then
    _inc_extra="$_inc_extra -I$_dvdnavdir"
   fi
@@ -4391,6 +4395,7 @@
 
 /* DVD navigation support using libdvdnav */
 $_def_dvdnav
+$_def_dvdnav_version
 
 /* Define this to enable MPEG 1/2 image postprocessing (requires a FAST CPU!) */
 #define MPEG12_POSTPROC 1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: live.log.gz
Type: application/octet-stream
Size: 9177 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-users/attachments/20020810/1e180290/attachment.obj>