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

 #include "system.h"
 #include "../winlib/winlib.h"
 #include "sound.h"
 #include "fplay.h"
 #include
-#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[];
+extern int64_t stream_duration;
 extern volatile int sound_level_0;
-extern int64_t stream_duration;
+extern volatile int sound_level_1;
 typedef struct
+{
     AVPicture      picture;
     double         pts;
+    volatile int   ready;
-    volatile int   ready;
+}vframe_t;
 }vframe_t;
 vframe_t           frames[4];
+    {
         frames[i].pts    = 0;
         frames[i].ready  = 0;
     };
-    vfx    = 0;
+    frames_count = 0;
+    vfx    = 0;
     dfx    = 0;
 };
 int init_video(AVCodecContext *ctx)
     width = ctx->width;
     height = ctx->height;
-    printf("w = %d  h = %d\n\r", width, height);
+    printf("w = %d  h = %d\n\r", ctx->width, ctx->height);
 //    __asm__ __volatile__("int3");
-    main_render = create_render(ctx->width, ctx->height,
-                           ctx->pix_fmt, HW_BIT_BLIT|HW_TEX_BLIT);
 //    render = create_render(ctx->width, ctx->height,
-//                           ctx->pix_fmt, 0);
+    main_render = create_render(ctx->width, ctx->height,
-//
+                           ctx->pix_fmt, HW_BIT_BLIT|HW_TEX_BLIT);
     if( main_render == NULL)
+    {
     int frameFinished;
     double current_clock;
     if(frames[dfx].ready != 0 )
-        return 1;
+        return -1;
     if( get_packet(qv, &pkt) == 0 )
+        return 0;
         return 0;
 /*
     current_clock = -90.0 + get_master_clock();
         pts= 0;
     pts *= av_q2d(video_time_base)*1000.0;
 */
     if( 1 /*pts > current_clock*/)
+    {
         frameFinished = 0;
             frames[dfx].ready = 1;
             dfx++;
+            dfx&= 3;
-            dfx&= 3;
+            frames_count++;
         };
     };
     av_free_packet(&pkt);
     return 1;
+}
+extern volatile enum player_state player_state;
 extern volatile enum player_state decoder_state;
 extern volatile enum player_state sound_state;
+//rect_t     win_rect;
+extern int64_t rewind_pos;
+static void player_stop()
+{
+    window_t  *win;
+    win = main_render->win;
+    rewind_pos = 0;
+    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;
+    win->panel.prg->current             = rewind_pos;
+    send_message(&win->panel.ctrl, MSG_PAINT, 0, 0);
+    player_state = STOP;
+    decoder_state = PLAY_2_STOP;
+    sound_state = PLAY_2_STOP;
-extern volatile enum player_state player_state;
+    render_draw_client(main_render);
-//rect_t     win_rect;
+//    printf("stop player\n");
-extern int64_t rewind_pos;
+};
             render_draw_client(main_render);
             break;
         case MSG_LBTNDOWN:
             if(player_state == PAUSE)
+            {
                 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);
+                send_message(&win->panel.play_btn->ctrl, MSG_PAINT, 0, 0);
+                player_state = PLAY;
-                player_state = PAUSE_2_PLAY;
+                sound_state  = PAUSE_2_PLAY;
+            }
             else if(player_state == PLAY)
+            {
                 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);
+                send_message(&win->panel.play_btn->ctrl, MSG_PAINT, 0, 0);
+                player_state = PAUSE;
-                player_state = PAUSE;
+                sound_state  = PLAY_2_PAUSE;
+            }
             break;
+                    {
                         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_2_PLAY;
+                        player_state = PLAY;
+                        sound_state = PAUSE_2_PLAY;
                     }
                     else if(player_state == PLAY)
+                    {
                         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 = PAUSE;
                         sound_state  = PLAY_2_PAUSE;
+                    }
-                    break;
+                    else if(player_state == STOP)
+                    {
+                        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;
+                        rewind_pos = 0;
+                        send_message(&win->panel.ctrl, MSG_PAINT, 0, 0);
+                        player_state = PLAY;
+                        decoder_state = PREPARE;
+                    }
+                    break;
+                case ID_STOP:
+                    player_stop();
+                    break;
-                case 101:  //ID_PROGRESS:
+                case ID_PROGRESS:
                     if(player_state != REWIND)
+                    {
                         progress_t *prg = (progress_t*)arg2;
-                        rewind_pos = (int64_t)prg->pos *
-                              (prg->max - prg->min)/prg->ctrl.w;
+                        rewind_pos = (prg->max - prg->min)*prg->pos/prg->ctrl.w;
+//                        printf("progress action pos: %d time: %f\n", prg->pos, (double)rewind_pos);
+                        player_state  = REWIND;
+                        decoder_state = REWIND;
+                        sound_state   = PLAY_2_STOP;
-//                        printf("progress action %f\n", (double)rewind_pos);
+                        if(rewind_pos < prg->current)
+                        {
+                            prg->current  = rewind_pos;
+                            rewind_pos = -rewind_pos;
+                        }
+                        else
+                            prg->current  = rewind_pos;
+                        win->panel.play_btn->img_default  = res_pause_btn;
-                        player_state = REWIND;
+                        win->panel.play_btn->img_hilite   = res_pause_btn;
-                        main_render->win->panel.prg->current = rewind_pos;
+                        win->panel.play_btn->img_pressed  = res_pause_btn_pressed;
-                        send_message(&main_render->win->panel.ctrl, MSG_PAINT, 0, 0);
+                        send_message(&prg->ctrl, MSG_PAINT, 0, 0);
+                    };
+                    break;
+                case ID_VOL_CTRL:
+                {
+                    slider_t *sld = (slider_t*)arg2;
+                    int      peak;
+                    int      level;
+                    peak = sld->min + sld->pos * (sld->max - sld->min)/(96);
+//                    level = (log2(peak+16384)*10000.0)/15 - 10000;
+                    level =  peak;
+//                    printf("level %d\n", level);
+                    set_audio_volume(level, level);
+                    send_message(&sld->ctrl, MSG_PAINT, 0, 0);
-                    };
+                    win->panel.lvl->vol = level;
                     break;
                 default:
 #define VERSION_A          1
 void render_time(render_t *render)
+{
+    progress_t  *prg = main_render->win->panel.prg;
+    level_t     *lvl = main_render->win->panel.lvl;
-    double ctime;            /*    milliseconds    */
+    double      ctime;            /*    milliseconds    */
-    double fdelay;           /*    milliseconds    */
+    double      fdelay;           /*    milliseconds    */
 //again:
     if(player_state == CLOSED)
+    {
+        render->win->win_command = WIN_CLOSED;
+        return;
+    }
+    else if(player_state == REWIND)
+    {
+        yield();
+        return;
+    }
+    else if (decoder_state == STOP && frames_count  == 0 &&
+              player_state  != STOP)
         render->win->win_command = WIN_CLOSED;
-        return;
+        player_stop();
+    }
     else if(player_state != PLAY)
+    {
+        yield();
-        yield();
+        return;
-        return;
+    };
     };
 //            printf("systime %d pts %f time %f delay %f\n",
 //                    sys_time*10, frames[vfx].pts, ctime, fdelay);
         main_render->draw(main_render, &frames[vfx].picture);
-        main_render->win->panel.prg->current = frames[vfx].pts*1000;
+        prg->current = frames[vfx].pts*1000;
+//        printf("current %f\n", prg->current);
+        lvl->current = vfx & 1 ? sound_level_1 : sound_level_0;
+        send_message(&prg->ctrl, PRG_PROGRESS, 0, 0);
+        if(main_render->win->panel.layout)
-        send_message(&render->win->panel.prg->ctrl, MSG_PAINT, 0, 0);
+            send_message(&lvl->ctrl, MSG_PAINT, 0, 0);
+        frames_count--;
         frames[vfx].ready = 0;
         vfx++;
         vfx&= 3;
+    }
     else yield();
+}
 extern char *movie_file;
 int video_thread(void *param)
+{
     window_t    *MainWindow;
     init_winlib();
     MainWindow = create_window(movie_file,0,
-,10,width,height+29+55,MainWindowProc);
+,10,width,height+CAPTION_HEIGHT+PANEL_HEIGHT,MainWindowProc);
     MainWindow->panel.prg->max = stream_duration;
 //    printf("MainWindow %x\n", MainWindow);
     main_render->win = MainWindow;
     main_render->win = MainWindow;
     show_window(MainWindow, NORMAL);
     render->rcvideo.t = 0;
     render->rcvideo.r = width;
     render->rcvideo.b = height;
+//    printf("render width %d height %d\n",width, height);
     if( render->win_height > height )
+    {
         int yoffs;
         yoffs = (render->win_height-height)/2;
         if(yoffs)
     uint32_t right, bottom, new_w, new_h;
     uint32_t s, sw, sh;
     uint8_t  state;
     right  = win->w;
-    bottom = win->h-CAPTION_HEIGHT-55;
+    bottom = win->h-CAPTION_HEIGHT-PANEL_HEIGHT;
+ //   printf("window width %d height %d\n",
+ //                   right, bottom);
     render->win_state  = win->win_state;
     if(render->win_state == MINIMIZED)
     new_w = bottom*render->ctx_width/render->ctx_height;
     new_h = right*render->ctx_height/render->ctx_width;
-//    printf("new_w %d new_h %d\n", new_w, new_h);
-    s  = right * bottom;
-    sw = right * new_h;
-    sh = bottom * new_w;
-    if( abs(s-sw) > abs(s-sh))
-        new_h = bottom;
+    if(new_w > right)
     else
+        new_w = right;
-        new_w = right;
+        new_h = right*render->ctx_height/render->ctx_width;
+    };
-    if(new_w < 64)
+    if(new_h > bottom)
     {
-        new_w = 64;
+        new_h = bottom;
-        new_h = 64*render->ctx_height/render->ctx_width;
+        new_w = bottom*render->ctx_width/render->ctx_height;
     };
     render->win_width  = win->w;
-    render->win_height = win->h-CAPTION_HEIGHT-55;
+    render->win_height = win->h-CAPTION_HEIGHT-PANEL_HEIGHT;
     render_set_size(render, new_w, new_h);
 };
         dst_height = render->ctx_height;
+    }
     else
+    {
-        dst_width  = render->win_width;
+        dst_width  = render->rcvideo.r;
-        dst_height = render->win_height;
+        dst_height = render->rcvideo.b;
     };
     cvt_ctx = sws_getCachedContext(cvt_ctx,
               render->ctx_width, render->ctx_height, render->ctx_format,
               dst_width, dst_height, PIX_FMT_BGRA,
     ret = lock_bitmap(bitmap);
     if( ret != 0)
+    {
-        printf("Cannot lock the bitmap!\n");
+        printf("Cannot lock bitmap!\n");
         return ;
+    }
 //    printf("sws_getCachedContext\n");
     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");
-    render->target++;
+//    render->target++;
-    render->target&= 3;
+//    render->target&= 3;
+}
     if(render->win_state == MINIMIZED ||
        render->win_state == ROLLED)
         return;
-    if((player_state == PAUSE) ||
+    if(player_state == PAUSE)
-       (player_state == PLAY_INIT) )
+    {
          if(frames[vfx].ready == 1 )
             main_render->draw(main_render, &frames[vfx].picture);
          else
             draw_bar(0, CAPTION_HEIGHT, render->win_width,
                  render->rcvideo.b, 0);
+    }
+    else if( player_state == STOP )
+    {
+        draw_bar(0, CAPTION_HEIGHT, render->win_width,
+                 render->rcvideo.b, 0);
     };
     if(render->layout & HAS_TOP)
         draw_bar(0, CAPTION_HEIGHT, render->win_width,

Subversion Repositories Kolibri OS

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