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);
 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 volatile int sound_level_1;
-typedef struct
-{
-    AVPicture      picture;
-    double         pts;
-    volatile int   ready;
+extern int64_t stream_duration;
-}vframe_t;
+extern volatile int sound_level_0;
     int i;
     for(i = 0; i < 4; i++)
+    {
-        frames[i].pts    = 0;
+        vst->vframe[i].pts   = 0;
-        frames[i].ready  = 0;
+        vst->vframe[i].ready = 0;
     };
     vst->vfx = 0;
     vst->dfx = 0;
     frames_count = 0;
 };
         printf("Cannot alloc video frame\n\r");
         return 0;
     };
-    for( i=0; i < 4; i++)
-    {
-        int ret;
-        ret = avpicture_alloc(&frames[i].picture, vst->vCtx->pix_fmt,
-                               vst->vCtx->width, vst->vCtx->height);
-        if ( ret != 0 )
-        {
-            printf("Cannot alloc video buffer\n\r");
-            return 0;
-        };
-        frames[i].pts    = 0;
-        frames[i].ready  = 0;
-    };
     create_thread(video_thread, vst, 1024*1024);
     delay(50);
     return 1;
     double     pts;
     int frameFinished;
     double current_clock;
-    if(frames[vst->dfx].ready != 0 )
+    if(vst->vframe[vst->dfx].ready != 0 )
         return -1;
     if( get_packet(&vst->q_video, &pkt) == 0 )
                 pts = 0;
             pts *= av_q2d(video_time_base);
+            dst_pic = &vst->vframe[vst->dfx].picture;
             dst_pic = &frames[vst->dfx].picture;
             if(vst->hwdec == 0)
-            av_image_copy(dst_pic->data, dst_pic->linesize,
+                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);
-                      (const uint8_t**)Frame->data,
+            else
-                      Frame->linesize, vst->vCtx->pix_fmt, vst->vCtx->width, vst->vCtx->height);
+                va_convert_picture(vst, vst->vCtx->width, vst->vCtx->height, dst_pic);
-            frames[vst->dfx].pts = pts*1000.0;
-            frames[vst->dfx].ready = 1;
+            vst->vframe[vst->dfx].pts = pts*1000.0;
             vst->vframe[vst->dfx].ready = 1;
             vst->dfx = (vst->dfx + 1) & 3;
     };
 #ifdef VERSION_A
-    if(frames[vst->vfx].ready == 1 )
+    if(vst->vframe[vst->vfx].ready == 1 )
+    {
         int sys_time;
         ctime = get_master_clock();
-        fdelay = (frames[vst->vfx].pts - ctime);
+        fdelay = (vst->vframe[vst->vfx].pts - ctime);
         //    return;
         };
 #if 0
         ctime = get_master_clock();
-        fdelay = (frames[vst->vfx].pts - ctime);
+        fdelay = (vst->vframe[vst->vfx].pts - ctime);
 //        while(fdelay > 0)
 //        {
 //            yield();
 //            ctime = get_master_clock();
 //            printf("systime %d pts %f time %f delay %f\n",
 //                    sys_time*10, frames[vfx].pts, ctime, fdelay);
         printf("pts %f time %f delay %f\n",
-                frames[vfx].pts, ctime, fdelay);
+                vst->vframe[vst->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[vst->vfx].picture);
+        main_render->draw(main_render, &vst->vframe[vst->vfx].picture);
         if(main_render->win->win_state != FULLSCREEN)
         {
-            prg->current = frames[vst->vfx].pts*1000;
+            prg->current = vst->vframe[vst->vfx].pts*1000;
 //        printf("current %f\n", prg->current);
             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[vst->vfx].ready = 0;
+        vst->vframe[vst->vfx].ready = 0;
         vst->vfx = (vst->vfx + 1) & 3;
+    }
     else delay(1);
 #else
-    if(frames[vfx].ready == 1 )
+    if(vst->vframe[vfx].ready == 1 )
+    {
         ctime = get_master_clock();
-        fdelay = (frames[vst->vfx].pts - ctime);
+        fdelay = (vst->vrame[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 = (vst->vfx+1) & 3;
-            if( frames[next_vfx].ready == 1 )
+            if( vst->vrame[next_vfx].ready == 1 )
             {
-                if(frames[next_vfx].pts <= ctime)
+                if(vst->vrame[next_vfx].pts <= ctime)
+                {
-                    frames[vst->vfx].ready = 0;                  // skip this frame
+                    vst->vrame[vst->vfx].ready = 0;                  // skip this frame
                     vst->vfx = (vst->vfx + 1) & 3;
                 }
                 else
+                {
-                    if( (frames[next_vfx].pts - ctime) <
+                    if( (vst->vrame[next_vfx].pts - ctime) <
                         ( ctime - frames[vst->vfx].pts) )
+                    {
-                        frames[vst->vfx].ready = 0;                  // skip this frame
+                        vst->vrame[vst->vfx].ready = 0;                  // skip this frame
                         vst->vfx = (vst->vfx + 1) & 3;
-                        fdelay = (frames[next_vfx].pts - ctime);
+                        fdelay = (vst->vrame[next_vfx].pts - ctime);
                     }
+                }
             };
         };
         if(fdelay > 10.0)
         {
            int val = fdelay;
            printf("pts %f time %f delay %d\n",
-                   frames[vst->vfx].pts, ctime, val);
+                   vst->vrame[vst->vfx].pts, ctime, val);
            delay(val/10);
         };
         ctime = get_master_clock();
-        fdelay = (frames[vst->vfx].pts - ctime);
+        fdelay = (vst->vrame[vst->vfx].pts - ctime);
     uint8_t  *bitmap_data;
     uint32_t  bitmap_pitch;
     uint8_t  *data[4];
     int       linesize[4];
     enum AVPixelFormat format;
     if(render->win->win_state == MINIMIZED ||
        render->win->win_state == ROLLED)
         return;
         dst_width  = render->rcvideo.r;
         dst_height = render->rcvideo.b;
     };
+	format = render->vst->hwdec == 0 ? render->ctx_format : AV_PIX_FMT_BGRA
     cvt_ctx = sws_getCachedContext(cvt_ctx,
-              render->ctx_width, render->ctx_height, render->ctx_format,
+              render->ctx_width, render->ctx_height, format,
               dst_width, dst_height, AV_PIX_FMT_BGRA,
               SWS_FAST_BILINEAR, NULL, NULL, NULL);
     if(cvt_ctx == NULL)
+    {
         printf("Cannot initialize the conversion context!\n");
         y = CAPTION_HEIGHT;
     if(player_state == PAUSE)
+    {
-         if(frames[vst->vfx].ready == 1 )
+         if(vst->vframe[vst->vfx].ready == 1 )
-            main_render->draw(main_render, &frames[vst->vfx].picture);
+            main_render->draw(main_render, &vst->vframe[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 6118 → 6121