WebSVN – Kolibri OS – Diff – /contrib/media/fplay/video.c

 #include "winlib/winlib.h"
 #include "fplay.h"
-int fplay_blit_bitmap(bitmap_t *bitmap, int dst_x, int dst_y,int w, int h);
-void draw_va_picture(render_t *render, AVPicture *picture);
+int fplay_blit_bitmap(bitmap_t *bitmap, int dst_x, int dst_y,int w, int h);
 extern int res_pause_btn[];
 volatile int      frames_count = 0;
 struct SwsContext *cvt_ctx = NULL;
-int vfx    = 0;
 int dfx    = 0;
 render_t   *main_render;
 AVFrame  *Frame;
 void get_client_rect(rect_t *rc);
-void flush_video()
+void flush_video(vst_t *vst)
+{
     int i;
     for(i = 0; i < 4; i++)
+    {
         frames[i].pts    = 0;
+        frames[i].ready  = 0;
+    };
-        frames[i].ready  = 0;
+    vst->vfx = 0;
-    };
-    frames_count = 0;
-    vfx    = 0;
+    vst->dfx = 0;
-    dfx    = 0;
+    frames_count = 0;
 };
     double     pts;
     int frameFinished;
     double current_clock;
-    if(frames[dfx].ready != 0 )
+    if(frames[vst->dfx].ready != 0 )
         return -1;
     if( get_packet(&vst->q_video, &pkt) == 0 )
-                pts= 0;
+                pts = 0;
             pts *= av_q2d(video_time_base);
-            dst_pic = &frames[dfx].picture;
+            dst_pic = &frames[vst->dfx].picture;
             av_image_copy(dst_pic->data, dst_pic->linesize,
                       (const uint8_t**)Frame->data,
                       Frame->linesize, vst->vCtx->pix_fmt, vst->vCtx->width, vst->vCtx->height);
-            frames[dfx].pts = pts*1000.0;
             frames[vst->dfx].pts = pts*1000.0;
             frames[dfx].ready = 1;
             frames[vst->dfx].ready = 1;
             dfx++;
 void render_time(render_t *render)
+{
-    progress_t  *prg = main_render->win->panel.prg;
+    progress_t *prg = main_render->win->panel.prg;
-    level_t     *lvl = main_render->win->panel.lvl;
+    level_t    *lvl = main_render->win->panel.lvl;
+    vst_t      *vst = main_render->vst;
     double      ctime;            /*    milliseconds    */
     double      fdelay;           /*    milliseconds    */
     };
 #ifdef VERSION_A
-    if(frames[vfx].ready == 1 )
+    if(frames[vst->vfx].ready == 1 )
+    {
         int sys_time;
         ctime = get_master_clock();
-        fdelay = (frames[vfx].pts - ctime);
+        fdelay = (frames[vst->vfx].pts - ctime);
         //    return;
         };
 #if 0
         ctime = get_master_clock();
-        fdelay = (frames[vfx].pts - ctime);
+        fdelay = (frames[vst->vfx].pts - ctime);
 //        while(fdelay > 0)
 //        {
 //            yield();
 //            ctime = get_master_clock();
                 frames[vfx].pts, ctime, fdelay);
         printf("video cache %d audio cache %d\n", q_video.size/1024, q_audio.size/1024);
 #endif
-        main_render->draw(main_render, &frames[vfx].picture);
+        main_render->draw(main_render, &frames[vst->vfx].picture);
         if(main_render->win->win_state != FULLSCREEN)
+        {
-            prg->current = frames[vfx].pts*1000;
+            prg->current = frames[vst->vfx].pts*1000;
 //        printf("current %f\n", prg->current);
-            lvl->current = vfx & 1 ? sound_level_1 : sound_level_0;
+            lvl->current = vst->vfx & 1 ? sound_level_1 : sound_level_0;
             send_message(&prg->ctrl, PRG_PROGRESS, 0, 0);
             if(main_render->win->panel.layout)
                 send_message(&lvl->ctrl, MSG_PAINT, 0, 0);
         }
-        frames_count--;
-        frames[vfx].ready = 0;
+        frames_count--;
-        vfx++;
+        frames[vst->vfx].ready = 0;
-        vfx&= 3;
+        vst->vfx = (vst->vfx + 1) & 3;
+    }
     else delay(1);
 #else
     if(frames[vfx].ready == 1 )
+    {
         ctime = get_master_clock();
-        fdelay = (frames[vfx].pts - ctime);
+        fdelay = (frames[vst->vfx].pts - ctime);
 //            printf("pts %f time %f delay %f\n",
 //                    frames[vfx].pts, ctime, fdelay);
         if(fdelay < 0.0 )
+        {
             int  next_vfx;
-            fdelay = 0;
-            next_vfx = (vfx+1) & 3;
+            fdelay = 0;
-            if( frames[next_vfx].ready == 1 )
+            next_vfx = (vst->vfx+1) & 3;
             if( frames[next_vfx].ready == 1 )
                 if(frames[next_vfx].pts <= ctime)
                 if(frames[next_vfx].pts <= ctime)
-                    frames[vfx].ready = 0;                  // skip this frame
+                {
-                    vfx++;
+                    frames[vst->vfx].ready = 0;                  // skip this frame
-                    vfx&= 3;
+                    vst->vfx = (vst->vfx + 1) & 3;
-                }
-                else
+                }
                 else
                     if( (frames[next_vfx].pts - ctime) <
-                        ( ctime - frames[vfx].pts) )
+                    if( (frames[next_vfx].pts - ctime) <
                         ( ctime - frames[vst->vfx].pts) )
                         frames[vfx].ready = 0;                  // skip this frame
-                        vfx++;
+                        frames[vst->vfx].ready = 0;                  // skip this frame
-                        vfx&= 3;
+                        vst->vfx = (vst->vfx + 1) & 3;
                         fdelay = (frames[next_vfx].pts - ctime);
+                    }
                 }
             };
         };
         if(fdelay > 10.0)
+        {
            int val = fdelay;
            printf("pts %f time %f delay %d\n",
-                   frames[vfx].pts, ctime, val);
+                   frames[vst->vfx].pts, ctime, val);
            delay(val/10);
         };
-        ctime = get_master_clock();
-        fdelay = (frames[vfx].pts - ctime);
+        ctime = get_master_clock();
         fdelay = (frames[vst->vfx].pts - ctime);
         printf("pts %f time %f delay %f\n",
-                frames[vfx].pts, ctime, fdelay);
+        printf("pts %f time %f delay %f\n",
+}
 void render_draw_client(render_t *render)
+{
+    vst_t *vst = render->vst;
     int y;
     if(render->win_state == MINIMIZED ||
        render->win_state == ROLLED )
         y = CAPTION_HEIGHT;
     if(player_state == PAUSE)
+    {
-         if(frames[vfx].ready == 1 )
+         if(frames[vst->vfx].ready == 1 )
-            main_render->draw(main_render, &frames[vfx].picture);
+            main_render->draw(main_render, &frames[vst->vfx].picture);
          else
             draw_bar(0, y, render->win_width,
                  render->rcvideo.b, 0);
+    }
     else if( player_state == STOP )

Subversion Repositories Kolibri OS

(root)/contrib/media/fplay/video.c – Rev 6117 → 6118