RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

tv: if timestamp is unset, return NOPTS 

Well, not sure if this really improves anything, but at least it's less
of a WTF to the playback core than always returning the same timestamp
for every frame.
This commit is contained in:
wm4 2014-06-14 22:17:55 +02:00
parent dfd93a108c
commit 53d762e972
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stream/tvi_v4l2.c
View File

@ -56,6 +56,7 @@ known issues:
#include <libv4l2.h>
#endif
#include "common/msg.h"
#include "common/common.h"
#include "video/img_fourcc.h"
#include "audio/format.h"
#include "tv.h"
@ -1609,7 +1610,7 @@ static void *video_grabber(void *data)
}
} else {
if (priv->immediate_mode) {
priv->video_ringbuffer[priv->video_tail].timestamp = 0;
priv->video_ringbuffer[priv->video_tail].timestamp = -1;
} else {
// compensate for audio skew
// negative skew => there are more audio samples, increase interval
@ -1640,7 +1641,6 @@ static void *video_grabber(void *data)
#define MAX_LOOP 50
static double grab_video_frame(priv_t *priv, char *buffer, int len)
{
double interval;
int loop_cnt = 0;
if (priv->first) {
@ -1654,13 +1654,13 @@ static double grab_video_frame(priv_t *priv, char *buffer, int len)
}
pthread_mutex_lock(&priv->video_buffer_mutex);
interval = (double)priv->video_ringbuffer[priv->video_head].timestamp*1e-6;
long long interval = priv->video_ringbuffer[priv->video_head].timestamp;
memcpy(buffer, priv->video_ringbuffer[priv->video_head].data, len);
priv->video_cnt--;
priv->video_head = (priv->video_head+1)%priv->video_buffer_size_current;
pthread_mutex_unlock(&priv->video_buffer_mutex);
return interval;
return interval == -1 ? MP_NOPTS_VALUE : interval*1e-6;
}
static int get_video_framesize(priv_t *priv)