rtmp/hls/favideo: For live feeds, don't try to seek back to beginning…

… on skip-to-previous event
Buksa · May 15, 2014 · 22a670c · 22a670c
1 parent 02726de
commit 22a670c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/backend/hls/hls.c b/src/backend/hls/hls.c
@@ -1242,7 +1242,7 @@ hls_play(hls_t *h, media_pipe_t *mp, char *errbuf, size_t errlen,
  break;
  } else if(event_is_action(e, ACTION_SKIP_BACKWARD)) {
 
- if(mp->mp_seek_base < MP_SKIP_LIMIT)
+ if(mp->mp_seek_base < MP_SKIP_LIMIT || h->h_live)
  break;
  hls_seek(h, hd->hd_delta_ts, 0, 0, &mb);
 

diff --git a/src/backend/rtmp/rtmp.c b/src/backend/rtmp/rtmp.c
@@ -199,7 +199,7 @@ rtmp_process_event(rtmp_t *r, event_t *e, media_buf_t **mbp)
  return e;
 
  if(event_is_action(e, ACTION_SKIP_BACKWARD)) {
- if(mp->mp_seek_base < MP_SKIP_LIMIT) {
+ if(mp->mp_seek_base < MP_SKIP_LIMIT || !r->can_seek) {
  return e;
  }
  video_seek(r, mp, mbp, 0, "direct");

diff --git a/src/fileaccess/fa_video.c b/src/fileaccess/fa_video.c
@@ -413,7 +413,7 @@ video_player_loop(AVFormatContext *fctx, media_codec_t **cwvec,
  } else if(event_is_action(e, ACTION_SKIP_BACKWARD)) {
 
  // TODO: chapter support
- if(mp->mp_seek_base < MP_SKIP_LIMIT)
+ if(mp->mp_seek_base < MP_SKIP_LIMIT || !(mp->mp_flags & MP_CAN_SEEK))
  break;
  video_seek(fctx, mp, &mb, 0, "skip back");
  } else if(event_is_type(e, EVENT_EXIT) ||