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

 extern int64_t stream_duration;
 extern volatile int sound_level_0;
 extern volatile int sound_level_1;
-volatile int frames_count = 0;
-struct SwsContext *cvt_ctx = NULL;
 struct SwsContext *cvt_ctx = NULL;
-render_t   *main_render;
 AVRational video_time_base;
-AVFrame  *Frame;
+render_t   *main_render;
 void get_client_rect(rect_t *rc);
+    {
         vframe->pts   = 0;
         vframe->ready = 0;
+    }
     vst->frames_count = 0;
     mutex_unlock(&vst->input_lock);
     mutex_unlock(&vst->output_lock);
-    frames_count = 0;
-};
-int init_video(vst_t *vst)
-{
-    Frame = av_frame_alloc();
-    if ( Frame == NULL )
-    {
-        printf("Cannot alloc video frame\n\r");
-        return 0;
-    };
-    mutex_lock(&vst->decoder_lock);
-    create_thread(video_thread, vst, 1024*1024);
-    return 1;
 };
 static double  dts = 0.0;
 static vframe_t *get_input_frame(vst_t *vst)
                 };
             };
         };
     };
-    mutex_unlock(&vst->output_lock);
+    vst->frames_count++;
+    mutex_unlock(&vst->output_lock);
 };
 int decode_video(vst_t* vst)
+{
-    AVPacket   pkt;
     double     pts;
+    AVPacket   pkt;
     int frameFinished;
     if(vst->decoder_frame == NULL)
         vst->decoder_frame = get_input_frame(vst);
     if(vst->decoder_frame == NULL)
-        return 0;
+        return -1;
-    if( get_packet(&vst->q_video, &pkt) == 0 )
-        return 0;
     if( get_packet(&vst->q_video, &pkt) == 0 )
-    frameFinished = 0;
+        return 0;
     if(dts == 0)
-        dts = pkt.pts;
+    frameFinished = 0;
     mutex_lock(&vst->gpu_lock);
-    if(avcodec_decode_video2(vst->vCtx, Frame, &frameFinished, &pkt) <= 0)
+    if(avcodec_decode_video2(vst->vCtx, vst->Frame, &frameFinished, &pkt) <= 0)
         printf("video decoder error\n");
     if(frameFinished)
     {
         vframe_t  *vframe = vst->decoder_frame;;
         AVPicture *dst_pic;
         if(vst->hwdec)
             pts = pkt.pts;
         else
-            pts = av_frame_get_best_effort_timestamp(Frame);
+            pts = av_frame_get_best_effort_timestamp(vst->Frame);
-        pts*= av_q2d(video_time_base);
+        pts*= av_q2d(vst->video_time_base);
         dst_pic = &vframe->picture;
         dst_pic = &vframe->picture;
         if(vframe->is_hw_pic == 0)
-            av_image_copy(dst_pic->data, dst_pic->linesize,
+        if(vframe->is_hw_pic == 0)
-                          (const uint8_t**)Frame->data,
+            av_image_copy(dst_pic->data, dst_pic->linesize,
-                          Frame->linesize, vst->vCtx->pix_fmt, vst->vCtx->width, vst->vCtx->height);
+                          (const uint8_t**)vst->Frame->data,
-        else
-            va_create_planar(vst, vframe);
                           vst->Frame->linesize, vst->vCtx->pix_fmt, vst->vCtx->width, vst->vCtx->height);
-        vframe->pts = pts*1000.0;
+        else
-        vframe->pkt_pts = pkt.pts*av_q2d(video_time_base)*1000.0;
+            va_create_planar(vst, vframe);
         vframe->pkt_dts = dts*av_q2d(video_time_base)*1000.0;
-        vframe->ready = 1;
+        vframe->pts = pts*1000.0;
+    {
         delay(1);
         return;
+    }
-    else if (decoder_state == STOP && frames_count  == 0 &&
+    else if (decoder_state == STOP && vst->frames_count  == 0 &&
               player_state  != STOP)
+    {
         player_stop();
+    }
     else if(player_state != PLAY)
+    {
         int sys_time;
         vframe = list_first_entry(&vst->output_list, vframe_t, list);
         list_del(&vframe->list);
+        vst->frames_count--;
         mutex_unlock(&vst->output_lock);
         ctime = get_master_clock();
-        fdelay = (vframe->pkt_pts - ctime);
+        fdelay = (vframe->pts - ctime);
         if(fdelay > 15.0)
+        {
         main_render->draw(main_render, vframe);
         if(main_render->win->win_state != FULLSCREEN)
         {
-            prg->current = vframe->pkt_pts * 1000;
+            prg->current = vframe->pts * 1000;
             lvl->current = vframe->index & 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);
+            if(main_render->win->panel.layout)
                 send_message(&lvl->ctrl, MSG_PAINT, 0, 0);
+        }
         frames_count--;
         vframe->ready = 0;
-        mutex_lock(&vst->input_lock);
-        list_add_tail(&vframe->list, &vst->input_list);
-        mutex_unlock(&vst->input_lock);
         mutex_lock(&vst->input_lock);
         list_add_tail(&vframe->list, &vst->input_list);
         mutex_unlock(&vst->input_lock);
+    }
 extern char *movie_file;
 int video_thread(void *param)
+{
     vst_t *vst = param;

Subversion Repositories Kolibri OS

(root)/contrib/media/fplay/video.c – Rev 6135 → 6136