[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-multimedia
Subject:    Re: works!
From:       Carsten Pfeiffer <carpdjih () cetus ! zrz ! TU-Berlin ! DE>
Date:       2000-06-25 19:22:57
[Download RAW message or body]

On Sun, Jun 25, 2000 at 02:53:16PM +0200, Martin Vogt wrote:

Hi,

> Mandrake 7.2 ?

no, SuSE 6.4.
 
> And you can even play many instances of it the same time :-)

Yeah, I was going to write that in the email as well (worked perfectly),
but you guys already know this :)
  
> Yes, please make a diff.

Attached.

> ac3dec and mpeg2dec from the livid cvs is a moving target.
> I hope some day they have found a usable API and keep it stable.

Oh well, APIs... :}

> Yes, I have the same problem. I don`t know where the problem is.
> artsd unloads the plugin (viewable in the debug output)
> but the call dispatcher.run() never returns.

Exactly. 
 
Cheers,
Carsten Pfeiffer
-- 
http://www.geocities.com/SiliconValley/1632/

["mpeglib.diff" (text/plain)]

diff -u -r -N mpeglib-0.3.0-pre6/lib/ac3/ac3Plugin.cpp \
                mpeglib-0.3.0-pre6.orig/lib/ac3/ac3Plugin.cpp
--- mpeglib-0.3.0-pre6/lib/ac3/ac3Plugin.cpp	Tue Jun 20 13:07:29 2000
+++ mpeglib-0.3.0-pre6.orig/lib/ac3/ac3Plugin.cpp	Fri Jun 23 13:51:58 2000
@@ -113,7 +113,7 @@
     case _STREAM_STATE_PLAY :
       bytes_read = input->read(buf,BLOCK_SIZE);
       if (bytes_read ==BLOCK_SIZE) {
-	ac3_decode_data(buf,buf + BLOCK_SIZE);
+	ac3_decode_data((uint_8*)buf,(uint_8*)(buf + BLOCK_SIZE));
       }
 
       break;
diff -u -r -N mpeglib-0.3.0-pre6/lib/mpeg2/mpeg2Plugin.cpp \
                mpeglib-0.3.0-pre6.orig/lib/mpeg2/mpeg2Plugin.cpp
--- mpeglib-0.3.0-pre6/lib/mpeg2/mpeg2Plugin.cpp	Tue Jun 20 13:07:58 2000
+++ mpeglib-0.3.0-pre6.orig/lib/mpeg2/mpeg2Plugin.cpp	Fri Jun 23 13:54:10 2000
@@ -27,8 +27,8 @@
 static unsigned char* yuv;
 static unsigned char* cr;
 static unsigned char* cb;
-static yuvpos;
-static cxpos;
+static int yuvpos;
+static int cxpos;
 
 #warning "we have display redirect"
 
@@ -147,7 +147,7 @@
       break;
     case _STREAM_STATE_PLAY :
       input->read(buf,BUFFER_SIZE);
-      mpeg2_decode_data(buf, buf+BUFFER_SIZE);
+      mpeg2_decode_data((uint_8*)buf, (uint_8*)(buf+BUFFER_SIZE));
       break;
     case _STREAM_STATE_WAIT_FOR_END:
       // exit while loop
diff -u -r -N mpeglib-0.3.0-pre6/lib/mpegplay/mpegExtension.cpp \
                mpeglib-0.3.0-pre6.orig/lib/mpegplay/mpegExtension.cpp
--- mpeglib-0.3.0-pre6/lib/mpegplay/mpegExtension.cpp	Sun Jun 18 14:23:25 2000
+++ mpeglib-0.3.0-pre6.orig/lib/mpegplay/mpegExtension.cpp	Fri Jun 23 13:46:10 2000
@@ -35,7 +35,7 @@
 }
 
 
-int MpegExtension::processExtensionData(MpegVideoStream* mpegVideoStream) {
+bool MpegExtension::processExtensionData(MpegVideoStream* mpegVideoStream) {
 
   /* Goto next start code. */
   mpegVideoStream->next_start_code();
@@ -171,7 +171,7 @@
   return dataPtr;
 }
 
-int MpegExtension::processExtBuffer(struct MpegVideoStream* mpegVideoStream){
+char * MpegExtension::processExtBuffer(struct MpegVideoStream* mpegVideoStream){
   unsigned int size, marker;
   char *dataPtr;
   unsigned int data=1;
@@ -215,7 +215,7 @@
   delete dataPtr;
   dataPtr=NULL;
   /* Return pointer to extra bit info buffer. */
-  return dataPtr; 
+  return dataPtr;
 }
 
 
diff -u -r -N mpeglib-0.3.0-pre6/lib/mpegplay/mpegExtension.h \
                mpeglib-0.3.0-pre6.orig/lib/mpegplay/mpegExtension.h
--- mpeglib-0.3.0-pre6/lib/mpegplay/mpegExtension.h	Sun Jun 18 14:18:13 2000
+++ mpeglib-0.3.0-pre6.orig/lib/mpegplay/mpegExtension.h	Fri Jun 23 13:47:37 2000
@@ -35,9 +35,9 @@
   inline char* getUserData() { return userData;}
   inline char* getExtraBit() { return extraBit;}
 
-  int processExtensionData(struct MpegVideoStream* mpegVideoStream);
+  bool processExtensionData(struct MpegVideoStream* mpegVideoStream);
   int processExtra_bit_info(struct MpegVideoStream* mpegVideoStream);
-  int processExtBuffer(struct MpegVideoStream* mpegVideoStream);
+  char* processExtBuffer(struct MpegVideoStream* mpegVideoStream);
   char* get_ext_data(struct MpegVideoStream* mpegVideoStream);
  
  private:


_______________________________________________
Kde-multimedia mailing list
Kde-multimedia@master.kde.org
http://master.kde.org/mailman/listinfo/kde-multimedia


[prev in list] [next in list] [prev in thread] [next in thread]