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

 #include
 #include
 #include
 #include "system.h"
-#include
+#include "../winlib/winlib.h"
 #include "sound.h"
 #include "fplay.h"
 #define CAPTION_HEIGHT      24
+extern int res_pause_btn[];
+extern int res_pause_btn_pressed[];
+extern int res_play_btn[];
+extern int res_play_btn_pressed[];
 typedef struct
+{
     AVPicture      picture;
     double         pts;
+{
     AVPacket   pkt;
     double     pts;
     int frameFinished;
     double current_clock;
     if(frames[dfx].ready != 0 )
         return 1;
     if( get_packet(qv, &pkt) == 0 )
+        return 0;
+    current_clock = -80.0 + get_master_clock();
+    if( pkt.dts == AV_NOPTS_VALUE &&
+        Frame->reordered_opaque != AV_NOPTS_VALUE)
+    pts = Frame->reordered_opaque;
+        else if(pkt.dts != AV_NOPTS_VALUE)
+        pts= pkt.dts;
+    else
+        pts= 0;
+    pts *= av_q2d(video_time_base)*1000.0;
-        return 0;
+    if( pts > current_clock)
+    {
-    frameFinished = 0;
+        frameFinished = 0;
-    if(frameFinished)
+        if(frameFinished)
+        {
-        AVPicture *dst_pic;
+            AVPicture *dst_pic;
-        if( pkt.dts == AV_NOPTS_VALUE &&
+            if( pkt.dts == AV_NOPTS_VALUE &&
-            Frame->reordered_opaque != AV_NOPTS_VALUE)
+                Frame->reordered_opaque != AV_NOPTS_VALUE)
-        pts = Frame->reordered_opaque;
+            pts = Frame->reordered_opaque;
-        else if(pkt.dts != AV_NOPTS_VALUE)
+            else if(pkt.dts != AV_NOPTS_VALUE)
-        dfx++;
+            dfx++;
-        dfx&= 3;
+            dfx&= 3;
-    };
+        };
+    };
     av_free_packet(&pkt);
     return 1;
 }
-extern volatile uint32_t status;
+extern volatile enum player_state player_state;
-rect_t     win_rect;
+//rect_t     win_rect;
         case MSG_DRAW_CLIENT:
             render_draw_client(main_render);
             break;
+        case MSG_LBTNDOWN:
+            if(player_state == PAUSE)
+            {
+                win->panel.play_btn->img_default = res_play_btn;
+                win->panel.play_btn->img_hilite  = res_play_btn;
+                win->panel.play_btn->img_pressed = res_play_btn_pressed;
+                send_message(win->panel.play_btn, MSG_PAINT, 0, 0);
+                player_state = PLAY_RESTART;
+            }
+            else if(player_state == PLAY)
+            {
+                win->panel.play_btn->img_default = res_pause_btn;
+                win->panel.play_btn->img_hilite  = res_pause_btn;
+                win->panel.play_btn->img_pressed = res_pause_btn_pressed;
+                send_message(win->panel.play_btn, MSG_PAINT, 0, 0);
+                player_state = PAUSE;
+            }
+            break;
         case MSG_COMMAND:
             switch((short)arg1)
             {
+                case ID_PLAY:
+                    if(player_state == PAUSE)
+                    {
+                        win->panel.play_btn->img_default = res_play_btn;
+                        win->panel.play_btn->img_hilite  = res_play_btn;
+                        win->panel.play_btn->img_pressed  = res_play_btn_pressed;
+                        player_state = PLAY_RESTART;
+                    }
+                    else if(player_state == PLAY)
+                    {
+                        win->panel.play_btn->img_default  = res_pause_btn;
+                        win->panel.play_btn->img_hilite   = res_pause_btn;
+                        win->panel.play_btn->img_pressed = res_pause_btn_pressed;
+                        player_state = PAUSE;
+                    }
+                    break;
-                case ID_CLOSE:
+                default:
-                    exit(0);
+                    break;
             };
             break;
         default:
             def_window_proc(ctrl,msg,arg1,arg2);
     };
     return 0;
 };
 void render_time(render_t *render)
+{
+    double ctime;            /*    milliseconds    */
-{
+    double fdelay;           /*    milliseconds    */
     double ctime;
-    double fdelay;
+//again:
+    if(player_state == CLOSED)
+    {
+        render->win->win_command = WIN_CLOSED;
+        return;
+    }
-    if(status == 0)
+    else if(player_state != PLAY)
+    {
-        render->win->win_command = WIN_CLOSED;
+        yield();
         return;
     };
     if(frames[vfx].ready == 1 )
     {
-        ctime = get_master_clock();
-        fdelay = (frames[vfx].pts - ctime);
-//            printf("pts %f time %f delay %f\n",
-//                    frames[vfx].pts, ctime, fdelay);
         ctime = get_master_clock();
-        if(fdelay < 0.0 )
-        {
-            int  next_vfx;
-            fdelay = 0;
-            next_vfx = (vfx+1) & 3;
-            if( frames[next_vfx].ready == 1 )
-            {
-                if(frames[next_vfx].pts <= ctime)
-                {
-                    frames[vfx].ready = 0;                  // skip this frame
-                    vfx++;
+        fdelay = (frames[vfx].pts - ctime);
-                    vfx&= 3;
-                }
-                else
-                {
-                    if( (frames[next_vfx].pts - ctime) <
-                        ( ctime - frames[vfx].pts) )
-                    {
-                        frames[vfx].ready = 0;                  // skip this frame
-                        vfx++;
-                        vfx&= 3;
-                        fdelay = (frames[next_vfx].pts - ctime);
-                    }
-                }
-            };
+//        printf("pts %f time %f delay %f\n",
-        };
+ //               frames[vfx].pts, ctime, fdelay);
-        if(fdelay > 10.0)
+        if(fdelay > 20.0)
+        {
-           // delay( (uint32_t)(fdelay/10.0));
+            delay(2);
-            yield();
-            return;
+//            yield();
+            return;
+        };
+        main_render->draw(main_render, &frames[vfx].picture);
+        frames[vfx].ready = 0;
+        vfx++;
-        };
+        vfx&= 3;
+    }
-        main_render->draw(main_render, &frames[vfx].picture);
+    else yield();
         frames[vfx].ready = 0;
         vfx++;
         vfx&= 3;
-    };
 extern char *movie_file;
 int video_thread(void *param)
 {
     window_t    *MainWindow;
     init_winlib();
                 render->bitmap[i].height = render->ctx_height;
                 if( create_bitmap(&render->bitmap[i]) != 0 )
+                {
-                    status = 0;
+                    player_state = CLOSED;
 /*
  *  Epic fail. Need  exit_thread() here
+ *
 */
                     return 0;
     uint8_t  state;
     right  = win->w;
-    bottom = win->h-CAPTION_HEIGHT;
+    bottom = win->h-CAPTION_HEIGHT-75;
     render->win_state  = win->win_state;
         new_h = 64*render->ctx_height/render->ctx_width;
     };
     render->win_width  = win->w;
-    render->win_height = win->h-CAPTION_HEIGHT;
+    render->win_height = win->h-CAPTION_HEIGHT-75;
     render_set_size(render, new_w, new_h);
 };
 void draw_hw_picture(render_t *render, AVPicture *picture)
     uint8_t    *data[4];
     int      linesize[4];
     int ret;
+    if(render->win_state == MINIMIZED ||
-    if(render->win_state == ROLLED)
+       render->win_state == ROLLED)
         return;
     if(render->caps & HW_TEX_BLIT)
+    {
     blit_bitmap(bitmap, render->rcvideo.l,
                  CAPTION_HEIGHT+render->rcvideo.t,
                  render->rcvideo.r, render->rcvideo.b);
+    render->last_bitmap = bitmap;
 //    printf("blit_bitmap\n");
     blit_bitmap(&render->bitmap[0], render->rcvideo.l,
                 render->rcvideo.t+CAPTION_HEIGHT,
                 render->rcvideo.r, render->rcvideo.b);
+    render->last_bitmap = &render->bitmap[0];
+}
 void render_draw_client(render_t *render)
+{
     if(render->win_state == MINIMIZED ||
        render->win_state == ROLLED)
+        return;
+    if(player_state == PAUSE)
+    {
+        main_render->draw(main_render, &frames[vfx].picture);
-        return;
+    };
     if(render->layout & HAS_TOP)
         draw_bar(0, CAPTION_HEIGHT, render->win_width,
                  render->rctop.b, 0);
                  render->win_width, render->rcbottom.b, 0);
+}

Subversion Repositories Kolibri OS

(root)/programs/media/Fplay/video.c – Rev 2421 → 2427