WebSVN – Kolibri OS – Diff – /programs/media/Fplay/audio.c

 #include
 #include
 #include
-#include
+#include "../winlib/winlib.h"
 #include "sound.h"
 #include "fplay.h"
-astream_t astream;
-static SNDBUF hBuff;
+astream_t astream;
+extern uint8_t *decoder_buffer;
 extern uint8_t *decoder_buffer;
 extern volatile enum player_state player_state;
+extern volatile uint32_t driver_lock;
 extern volatile uint32_t status;
 static SNDBUF hBuff;
 extern volatile uint32_t driver_lock;
 static int snd_format;
 int sample_rate;
 };
 static uint64_t samples_lost;
 static double  audio_delta;
+static double  last_time_stamp;
-double get_master_clock()
+double get_master_clock(void)
+{
     double tstamp;
     return 1;
 };
+static void sync_audio(SNDBUF hbuff, int buffsize)
+{
+    SND_EVENT   evnt;
+    uint32_t    offset;
+    double      time_stamp;
+#ifdef BLACK_MAGIC_SOUND
+    while( player_state != CLOSED)
+    {
+        GetNotify(&evnt);
+        if(evnt.code != 0xFF000001)
+        {
+            printf("invalid event code %d\n\r", evnt.code);
+            continue;
+        }
+        if(evnt.stream != hbuff)
+        {
+            printf("invalid stream %x hBuff= %x\n\r",
+                    evnt.stream, hbuff);
+            continue;
+        }
+        GetTimeStamp(hbuff, &time_stamp);
+        audio_delta = time_stamp - last_time_stamp;
+        offset = evnt.offset;
+        mutex_lock(&astream.lock);
+        {
+            SetBuffer(hbuff, astream.buffer, offset, buffsize);
+            samples_written+= buffsize/4;
+            astream.count -= buffsize;
+            if(astream.count)
+                memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
+            mutex_unlock(&astream.lock);
+        };
+        break;
+    };
+#endif
+};
 int audio_thread(void *param)
+{
+    SND_EVENT evnt;
     SND_EVENT evnt;
     int       buffsize;
     int      samples;
     int       err;
+    char     *errstr;
-    char     *errstr;
+    int       active;
     samples = buffsize/4;
     while( (astream.count < buffsize*2) &&
-               (status != 0) )
+               (player_state != CLOSED) )
         yield();
     mutex_lock(&astream.lock);
+    {
         SetBuffer(hBuff, astream.buffer, 0, buffsize);
-        SetBuffer(hBuff, astream.buffer, 0, buffsize);
+        samples_written+= buffsize/4;
         astream.count -= buffsize;
         if(astream.count)
             memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
-        mutex_unlock(&astream.lock);
-    };
-    if((err = PlayBuffer(hBuff, 0)) !=0 )
-    {
-        errstr = "Cannot play buffer\n\r";
-        goto exit_whith_error;
-    };
+        mutex_unlock(&astream.lock);
-#ifdef BLACK_MAGIC_SOUND
+    };
+    while( player_state != CLOSED)
+    {
-    while( status != 0)
-    {
         uint32_t  offset;
         double    event_stamp, wait_stamp;
-        GetNotify(&evnt);
+        int       too_late = 0;
-        if(evnt.code != 0xFF000001)
-        {
-            printf("invalid event code %d\n\r", evnt.code);
             continue;
-        }
+        if(player_state == PAUSE)
+        {
+            if( active )
+            {
-        if(evnt.stream != hBuff)
+                StopBuffer(hBuff);
                 active = 0;
-            printf("invalid stream %x hBuff= %x\n\r",
-                    evnt.stream, hBuff);
+            }
-            continue;
-        }
-        GetTimeStamp(hBuff, &audio_delta);
-        samples_lost = audio_delta*sample_rate/1000;
             delay(1);
-        offset = evnt.offset;
+            continue;
+        }
-        mutex_lock(&astream.lock);
+        else if(player_state == PLAY_RESTART)
         {
-            SetBuffer(hBuff, astream.buffer, offset, buffsize);
+            GetTimeStamp(hBuff, &last_time_stamp);
-            astream.count -= buffsize;
+            if((err = PlayBuffer(hBuff, 0)) !=0 )
-            if(astream.count)
+            {
+                errstr = "Cannot play buffer\n\r";
+                goto exit_whith_error;
+            };
-                memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
+            active = 1;
-            mutex_unlock(&astream.lock);
-        };
-        break;
-    };
-#endif
-    printf("initial audio delta %f\n", audio_delta);
-    while( status != 0)
             sync_audio(hBuff, buffsize);
-        uint32_t  offset;
+            player_state = PLAY;
-        double    event_stamp, wait_stamp;
+            printf("audio delta %f\n", audio_delta);
         offset = evnt.offset;
         while( (astream.count < buffsize) &&
-               (status != 0) )
+               (player_state != CLOSED) )
+        {
             yield();
             GetTimeStamp(hBuff, &wait_stamp);
             if( (wait_stamp - event_stamp) >
                 break;
+            }
         };
-        if((too_late == 1) || (status == 0))
+        if((too_late == 1) || (player_state == CLOSED))
+        {
+            too_late = 0;
             continue;
+        };
         mutex_lock(&astream.lock);
+        SetBuffer(hBuff, astream.buffer, offset, buffsize);
-        SetBuffer(hBuff, astream.buffer, offset, buffsize);
+        samples_written+= buffsize/4;
         astream.count -= buffsize;
         if(astream.count)
             memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
         mutex_unlock(&astream.lock);

Subversion Repositories Kolibri OS

(root)/programs/media/Fplay/audio.c – Rev 2415 → 2427