glw: Stop clock driving subtitles when paused

Otherwise subtitles will disappear shortly after video is paused. Fixed ticket #463
stallman · Apr 20, 2011 · c176cb0 · c176cb0
1 parent eca677e
commit c176cb0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/ui/glw/glw_video_common.c b/src/ui/glw/glw_video_common.c
@@ -233,7 +233,8 @@ glw_video_newframe(glw_t *w, int flags)
 
  pts = gv->gv_cfg_cur.gvc_engine->gve_newframe(gv, vd, flags);
 
- glw_video_overlay_layout(gv, pts, vd);
+ if(pts != AV_NOPTS_VALUE)
+ glw_video_overlay_layout(gv, pts, vd);
 }
 
 

diff --git a/src/ui/glw/glw_video_opengl.c b/src/ui/glw/glw_video_opengl.c
@@ -382,8 +382,6 @@ yuvp_newframe(glw_video_t *gv, video_decoder_t *vd, int flags)
  gv->gv_sa = NULL;
  }
 
- pts = AV_NOPTS_VALUE;
-
  } else {
 
  /* There are frames available that we are going to display,
@@ -394,7 +392,8 @@ yuvp_newframe(glw_video_t *gv, video_decoder_t *vd, int flags)
 
  /* */
  sb = TAILQ_NEXT(sa, gvs_link);
- pts = gv_compute_blend(gv, sa, sb, output_duration);
+ if(!vd->vd_hold)
+ pts = gv_compute_blend(gv, sa, sb, output_duration);
  epoch = sa->gvs_epoch;
 
  if(!vd->vd_hold || sb != NULL) {

diff --git a/src/ui/glw/glw_video_rsx.c b/src/ui/glw/glw_video_rsx.c
@@ -309,7 +309,7 @@ yuvp_newframe(glw_video_t *gv, video_decoder_t *vd, int flags)
  glw_video_surface_t *sa, *sb, *s;
  media_pipe_t *mp = gv->gv_mp;
  int output_duration;
- int64_t pts = 0;
+ int64_t pts = AV_NOPTS_VALUE;
  int frame_duration = gv->w.glw_root->gr_frameduration;
  int epoch = 0;
 
@@ -331,8 +331,6 @@ yuvp_newframe(glw_video_t *gv, video_decoder_t *vd, int flags)
  gv->gv_sa = NULL;
  }
 
- pts = AV_NOPTS_VALUE;
-
  } else {
 
  /* There are frames available that we are going to display,
@@ -343,7 +341,8 @@ yuvp_newframe(glw_video_t *gv, video_decoder_t *vd, int flags)
 
  /* */
  sb = TAILQ_NEXT(sa, gvs_link);
- pts = gv_compute_blend(gv, sa, sb, output_duration);
+ if(!vd->vd_hold)
+ pts = gv_compute_blend(gv, sa, sb, output_duration);
  epoch = sa->gvs_epoch;
 
  if(!vd->vd_hold || sb != NULL) {