From 879c7a101b36674a952791d2f97cc38782052435 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Jul 2013 22:12:31 +0200
Subject: demux: assume correct-pts mode by default

All demuxers make a reasonable effort to set packet timestamps, and thus
support correct-pts mode. This commit also implicitly switches
demux_rawvideo to correct-pts mode.

We still allow demuxers to disable correct-pts mode in theory.
---
 demux/demux.h           | 2 +-
 demux/demux_lavf.c      | 2 --
 demux/demux_mf.c        | 3 ---
 demux/demux_mkv.c       | 2 --
 demux/demux_subreader.c | 2 --
 5 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'demux')

diff --git a/demux/demux.h b/demux/demux.h
index 3f193fa72e..85ee738137 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -63,7 +63,7 @@ enum timestamp_type {
 #define DEMUXER_CTRL_RESYNC 13
 #define DEMUXER_CTRL_SWITCH_VIDEO 14
 #define DEMUXER_CTRL_IDENTIFY_PROGRAM 15
-#define DEMUXER_CTRL_CORRECT_PTS 16
+#define DEMUXER_CTRL_CORRECT_PTS 16 // int* (write 1 for ok, 0 for no)
 
 #define SEEK_ABSOLUTE (1 << 0)
 #define SEEK_FACTOR   (1 << 1)
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index e788b5b77c..82ca2e24d0 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -778,8 +778,6 @@ static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
     lavf_priv_t *priv = demuxer->priv;
 
     switch (cmd) {
-    case DEMUXER_CTRL_CORRECT_PTS:
-        return DEMUXER_CTRL_OK;
     case DEMUXER_CTRL_GET_TIME_LENGTH:
         if (priv->seek_by_bytes) {
             /* Our bitrate estimate may be better than would be used in
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 5c92476c82..7c4b83692d 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -235,9 +235,6 @@ static int demux_control_mf(demuxer_t *demuxer, int cmd, void *arg) {
       *((double *)arg) = (double)mf->nr_of_files / mf->sh->fps;
       return DEMUXER_CTRL_OK;
 
-    case DEMUXER_CTRL_CORRECT_PTS:
-      return DEMUXER_CTRL_OK;
-
     default:
       return DEMUXER_CTRL_NOTIMPL;
   }
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 3fb57423a8..69ace3b4db 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2704,8 +2704,6 @@ static int demux_mkv_control(demuxer_t *demuxer, int cmd, void *arg)
     mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
 
     switch (cmd) {
-    case DEMUXER_CTRL_CORRECT_PTS:
-        return DEMUXER_CTRL_OK;
     case DEMUXER_CTRL_GET_TIME_LENGTH:
         if (mkv_d->duration == 0)
             return DEMUXER_CTRL_DONTKNOW;
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index 084d7857d9..9f7af4e365 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -1380,8 +1380,6 @@ static int d_control(struct demuxer *demuxer, int cmd, void *arg)
 {
     struct priv *p = demuxer->priv;
     switch (cmd) {
-    case DEMUXER_CTRL_CORRECT_PTS:
-        return DEMUXER_CTRL_OK;
     case DEMUXER_CTRL_GET_TIME_LENGTH:
         *((double *) arg) = demux_packet_list_duration(p->pkts, p->num_pkts);
         return DEMUXER_CTRL_OK;
-- 
cgit v1.2.3