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

 astream_t astream;
+extern uint8_t *decoder_buffer;
+int resampler_size;
+volatile int sound_level_0;
-extern uint8_t *decoder_buffer;
+volatile int sound_level_1;
+volatile enum player_state player_state;
 volatile enum player_state decoder_state;
-extern volatile enum player_state player_state;
+volatile enum player_state sound_state;
     };
     mutex_unlock(&driver_lock);
-    printf("sound version 0x%x\n", version);
+//    printf("sound version 0x%x\n", version);
     if( (SOUND_VERSION>(version&0xFFFF)) ||
         (SOUND_VERSION<(version >> 16)))
     printf(errstr);
     return 0;
 };
+void set_audio_volume(int left, int right)
+{
+    SetVolume(hBuff, left, right);
+};
 static uint64_t samples_lost;
 static double  audio_delta;
     int         len;
     int         data_size=0;
     if( astream.count > AVCODEC_MAX_AUDIO_FRAME_SIZE*7)
-        return 1;
+        return -1;
     if( get_packet(qa, &pkt) == 0 )
         offset = evnt.offset;
         mutex_lock(&astream.lock);
+        {
+            if(astream.count < buffsize)
+            {
+                memset(astream.buffer+astream.count,
+, buffsize-astream.count);
+                astream.count = buffsize;
+            };
             SetBuffer(hbuff, astream.buffer, offset, buffsize);
+            samples_written+= buffsize/4;
             samples_written+= buffsize/4;
             astream.count -= buffsize;
             if(astream.count)
                 memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
             mutex_unlock(&astream.lock);
 #endif
 };
 int audio_thread(void *param)
+{
     SND_EVENT evnt;
         errstr = "Cannot create sound buffer\n\r";
         goto exit_whith_error;
     };
-    SetVolume(hBuff,-1000,-1000);
+    SetVolume(hBuff,-1875,-1875);
     if((err = GetBufferSize(hBuff, &buffsize)) != 0)
+    {
         errstr = "Cannot get buffer size\n\r";
         goto exit_whith_error;
     };
-    buffsize = buffsize/2;
-    samples = buffsize/4;
-    while( (astream.count < buffsize*2) &&
-               (player_state != CLOSED) )
-        yield();
-    mutex_lock(&astream.lock);
-    {
-        SetBuffer(hBuff, astream.buffer, 0, buffsize);
-        samples_written+= buffsize/4;
-        astream.count -= buffsize;
-        if(astream.count)
-            memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
+    resampler_size = buffsize = buffsize/2;
         mutex_unlock(&astream.lock);
-    };
+    samples = buffsize/4;
     while( player_state != CLOSED)
-    {
-        uint32_t  offset;
-        double    event_stamp, wait_stamp;
-        int       too_late = 0;
+    {
         uint32_t  offset;
-        if((player_state == PAUSE) ||
-           (player_state == PLAY_INIT) )
-        {
-            if( active )
-            {
-                StopBuffer(hBuff);
-                active = 0;
-            };
-            delay(1);
+        double    event_stamp, wait_stamp;
-            continue;
-        }
-        else if(player_state == REWIND)
-        {
-            if( active )
-            {
-                StopBuffer(hBuff);
-                active = 0;
-            };
-            mutex_lock(&astream.lock);
-            astream.count = 0;
-            mutex_unlock(&astream.lock);
-            delay(1);
-            continue;
-        }
+        int       too_late = 0;
-        else if(player_state == PAUSE_2_PLAY)
         switch(sound_state)
-//            SetTimeBase(hBuff, audio_base);
+        {
+            case PREPARE:
-            GetTimeStamp(hBuff, &last_time_stamp);
-//            printf("last_time_stamp %f\n", last_time_stamp);
+                mutex_lock(&astream.lock);
+                    if(astream.count < buffsize*2)
-            if((err = PlayBuffer(hBuff, 0)) !=0 )
+                    {
-            {
+                        memset(astream.buffer+astream.count,
-                errstr = "Cannot play buffer\n\r";
-                goto exit_whith_error;
-            };
+, buffsize*2-astream.count);
-            active = 1;
-            sync_audio(hBuff, buffsize);
+                        astream.count = buffsize*2;
-            player_state = PLAY;
+                    };
-            printf("render: set audio latency to %f\n", audio_delta);
+                    SetBuffer(hBuff, astream.buffer, 0, buffsize*2);
+                    astream.count -= buffsize*2;
-        else if(player_state == REWIND_2_PLAY)
+                    if(astream.count)
-        {
+                        memcpy(astream.buffer, astream.buffer+buffsize*2, astream.count);
-            while( (astream.count < buffsize*2) &&
+                mutex_unlock(&astream.lock);
                    (player_state != CLOSED) )
-            yield();
+                SetTimeBase(hBuff, audio_base);
-            SetTimeBase(hBuff, audio_base);
+            case PAUSE_2_PLAY:
-            GetTimeStamp(hBuff, &last_time_stamp);
+                GetTimeStamp(hBuff, &last_time_stamp);
-            printf("last audio time stamp %f\n", last_time_stamp);
+//                printf("last audio time stamp %f\n", last_time_stamp);
-            if((err = PlayBuffer(hBuff, 0)) !=0 )
+                if((err = PlayBuffer(hBuff, 0)) !=0 )
-            {
+                {
+                    errstr = "Cannot play buffer\n\r";
+                    goto exit_whith_error;
-                errstr = "Cannot play buffer\n\r";
+                };
-                goto exit_whith_error;
+                active = 1;
-            };
+                sync_audio(hBuff, buffsize);
-            active = 1;
+                sound_state = PLAY;
-                    evnt.stream, hBuff);
+                            evnt.stream, hBuff);
-            continue;
+                    continue;
-        };
+                };
-        GetTimeStamp(hBuff, &event_stamp);
-        offset = evnt.offset;
+                offset = evnt.offset;
-        while( (astream.count < buffsize) &&
+                mutex_lock(&astream.lock);
-               (player_state != CLOSED) )
+                if(astream.count < buffsize)
-        {
-            yield();
-            GetTimeStamp(hBuff, &wait_stamp);
+                {
-            if( (wait_stamp - event_stamp) >
+                    memset(astream.buffer+astream.count,
-                 samples*1500/sample_rate )
-            {
+, buffsize-astream.count);
-                samples_lost+= samples;
-                audio_delta = (double)samples_lost*1000/sample_rate;
-//                printf("audio delta %f\n", audio_delta);
-                too_late = 1;
-                break;
                     astream.count = buffsize;
-        };
+                };
                 SetBuffer(hBuff, astream.buffer, offset, buffsize);
-        if((too_late == 1) || (player_state == CLOSED))
+                {
+                    double  val = 0;
-        {
+                    int16_t *src = (int16_t*)astream.buffer;
+                    int samples = buffsize/2;
+                    int i;
+                    for(i = 0, val = 0; i < samples/2; i++, src++)
+                        if(val < abs(*src))
+                            val= abs(*src); // * *src;
+                    sound_level_0 = val; //sqrt(val / (samples/2));
+                    for(i = 0, val = 0; i < samples/2; i++, src++)
+                        if(val < abs(*src))
+                            val= abs(*src); // * *src;
+                    sound_level_1 = val; //sqrt(val / (samples/2));
             too_late = 0;
-            continue;
-        };
  //                   printf("%d\n", sound_level);
+                };
         mutex_lock(&astream.lock);
-        SetBuffer(hBuff, astream.buffer, offset, buffsize);
+                samples_written+= buffsize/4;
         samples_written+= buffsize/4;
-        astream.count -= buffsize;
+                astream.count -= buffsize;
+                if(astream.count)
+                    memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
+                mutex_unlock(&astream.lock);
+                break;
+            case PLAY_2_STOP:
+                if( active )
+                {
+                    ResetBuffer(hBuff, SND_RESET_ALL);
+                    audio_base = -1.0;
+                    active = 0;
+                }
+                sound_state = STOP;
+                break;
+            case PLAY_2_PAUSE:
+                if( active )
+                {
+                    StopBuffer(hBuff);
+                };
+                sound_state = PAUSE;
+            case PAUSE:
-        if(astream.count)
+            case STOP:
-            memcpy(astream.buffer, astream.buffer+buffsize, astream.count);
+                delay(1);
-        mutex_unlock(&astream.lock);
+        };

Subversion Repositories Kolibri OS

(root)/programs/media/Fplay/audio.c – Rev 2693 → 3068