2010-01-30 22:26:47 +00:00
|
|
|
/*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
|
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// Time in seconds the main thread waits for the cache thread. On wakeups, the
|
|
|
|
// code checks for user requested aborts and also prints warnings that the
|
|
|
|
// cache is being slow.
|
|
|
|
#define CACHE_WAIT_TIME 0.5
|
|
|
|
|
2013-06-08 23:05:11 +00:00
|
|
|
// The time the cache sleeps in idle mode. This controls how often the cache
|
|
|
|
// retries reading from the stream after EOF has reached (in case the stream is
|
|
|
|
// actually readable again, for example if data has been appended to a file).
|
|
|
|
// Note that if this timeout is too low, the player will waste too much CPU
|
|
|
|
// when player is paused.
|
2013-05-25 13:03:30 +00:00
|
|
|
#define CACHE_IDLE_SLEEP_TIME 1.0
|
|
|
|
|
2013-06-08 23:05:11 +00:00
|
|
|
// Time in seconds the cache updates "cached" controls. Note that idle mode
|
|
|
|
// will block the cache from doing this, and this timeout is honored only if
|
|
|
|
// the cache is active.
|
2013-07-02 10:18:04 +00:00
|
|
|
#define CACHE_UPDATE_CONTROLS_TIME 2.0
|
2013-06-08 23:05:11 +00:00
|
|
|
|
2014-01-16 21:16:47 +00:00
|
|
|
// Time in seconds the cache prints a new message at all.
|
|
|
|
#define CACHE_NO_SPAM 5.0
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2001-12-25 11:20:58 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <unistd.h>
|
2010-01-23 10:50:50 +00:00
|
|
|
#include <errno.h>
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
#include <assert.h>
|
2013-05-25 13:03:30 +00:00
|
|
|
#include <pthread.h>
|
2013-06-16 20:29:23 +00:00
|
|
|
#include <time.h>
|
2013-07-08 17:26:45 +00:00
|
|
|
#include <sys/time.h>
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2012-08-15 20:23:02 +00:00
|
|
|
#include <libavutil/common.h>
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
2005-11-18 14:39:25 +00:00
|
|
|
#include "osdep/timer.h"
|
2013-11-17 15:42:57 +00:00
|
|
|
#include "osdep/threads.h"
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/msg.h"
|
2001-10-22 16:09:34 +00:00
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
#include "stream.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/common.h"
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
|
|
|
|
// Note: (struct priv*)(cache->priv)->cache == cache
|
|
|
|
struct priv {
|
|
|
|
pthread_t cache_thread;
|
|
|
|
bool cache_thread_running;
|
|
|
|
pthread_mutex_t mutex;
|
|
|
|
pthread_cond_t wakeup;
|
|
|
|
|
|
|
|
// Constants (as long as cache thread is running)
|
|
|
|
unsigned char *buffer; // base pointer of the allocated buffer memory
|
|
|
|
int64_t buffer_size; // size of the allocated buffer memory
|
|
|
|
int64_t back_size; // keep back_size amount of old bytes for backward seek
|
|
|
|
int64_t fill_limit; // we should fill buffer only if space>=fill_limit
|
|
|
|
int64_t seek_limit; // keep filling cache if distance is less that seek limit
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
struct byte_meta *bm; // additional per-byte metadata
|
2014-01-31 21:40:35 +00:00
|
|
|
bool seekable; // underlying stream is seekable
|
2013-05-25 13:03:30 +00:00
|
|
|
|
2013-12-21 19:36:45 +00:00
|
|
|
struct mp_log *log;
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// Owned by the main thread
|
|
|
|
stream_t *cache; // wrapper stream, used by demuxer etc.
|
2014-01-16 21:16:47 +00:00
|
|
|
double last_warn_time;
|
2013-05-25 13:03:30 +00:00
|
|
|
|
|
|
|
// Owned by the cache thread
|
|
|
|
stream_t *stream; // "real" stream, used to read from the source media
|
|
|
|
|
|
|
|
// All the following members are shared between the threads.
|
|
|
|
// You must lock the mutex to access them.
|
|
|
|
|
|
|
|
// Ringbuffer
|
|
|
|
int64_t min_filepos; // range of file that is cached in the buffer
|
|
|
|
int64_t max_filepos; // ... max_filepos being the last read position
|
|
|
|
bool eof; // true if max_filepos = EOF
|
|
|
|
int64_t offset; // buffer[offset] correponds to max_filepos
|
|
|
|
|
|
|
|
bool idle; // cache thread has stopped reading
|
2013-12-13 23:58:06 +00:00
|
|
|
int64_t reads; // number of actual read attempts performed
|
2013-05-25 13:03:30 +00:00
|
|
|
|
|
|
|
int64_t read_filepos; // client read position (mirrors cache->pos)
|
|
|
|
int control; // requested STREAM_CTRL_... or CACHE_CTRL_...
|
|
|
|
void *control_arg; // temporary for executing STREAM_CTRLs
|
|
|
|
int control_res;
|
|
|
|
bool control_flush;
|
|
|
|
|
|
|
|
// Cached STREAM_CTRLs
|
|
|
|
double stream_time_length;
|
|
|
|
double stream_start_time;
|
|
|
|
int64_t stream_size;
|
|
|
|
bool stream_manages_timeline;
|
2013-06-24 09:34:38 +00:00
|
|
|
unsigned int stream_num_chapters;
|
2013-05-25 13:03:30 +00:00
|
|
|
int stream_cache_idle;
|
|
|
|
int stream_cache_fill;
|
2013-07-02 10:18:04 +00:00
|
|
|
char **stream_metadata;
|
2013-05-25 13:03:30 +00:00
|
|
|
};
|
|
|
|
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
// Store additional per-byte metadata. Since per-byte would be way too
|
|
|
|
// inefficient, store it only for every BYTE_META_CHUNK_SIZE byte.
|
|
|
|
struct byte_meta {
|
|
|
|
float stream_pts;
|
|
|
|
};
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
enum {
|
2013-06-17 21:39:24 +00:00
|
|
|
BYTE_META_CHUNK_SIZE = 8 * 1024,
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
CACHE_INTERRUPTED = -1,
|
|
|
|
|
|
|
|
CACHE_CTRL_NONE = 0,
|
|
|
|
CACHE_CTRL_QUIT = -1,
|
|
|
|
CACHE_CTRL_PING = -2,
|
|
|
|
};
|
|
|
|
|
2013-06-16 20:52:49 +00:00
|
|
|
static int64_t mp_clipi64(int64_t val, int64_t min, int64_t max)
|
|
|
|
{
|
|
|
|
val = FFMIN(val, max);
|
|
|
|
val = FFMAX(val, min);
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// Used by the main thread to wakeup the cache thread, and to wait for the
|
|
|
|
// cache thread. The cache mutex has to be locked when calling this function.
|
2013-06-17 19:22:35 +00:00
|
|
|
// *retry_time should be set to 0 on the first call.
|
2013-05-25 13:03:30 +00:00
|
|
|
// Returns CACHE_INTERRUPTED if the caller is supposed to abort.
|
2013-06-17 19:22:35 +00:00
|
|
|
static int cache_wakeup_and_wait(struct priv *s, double *retry_time)
|
2013-05-25 13:03:30 +00:00
|
|
|
{
|
2013-06-08 23:05:11 +00:00
|
|
|
if (stream_check_interrupt(0))
|
|
|
|
return CACHE_INTERRUPTED;
|
2013-05-25 13:03:30 +00:00
|
|
|
|
2013-06-17 19:22:35 +00:00
|
|
|
double start = mp_time_sec();
|
2013-05-25 13:03:30 +00:00
|
|
|
|
2014-01-16 21:16:47 +00:00
|
|
|
if (!s->last_warn_time || start - s->last_warn_time >= CACHE_NO_SPAM) {
|
|
|
|
// Print a "more severe" warning after waiting 1 second and no new data
|
|
|
|
if ((*retry_time) >= 1.0) {
|
|
|
|
MP_ERR(s, "Cache keeps not responding.\n");
|
|
|
|
s->last_warn_time = start;
|
|
|
|
} else if (*retry_time > 0.1) {
|
|
|
|
MP_WARN(s, "Cache is not responding - slow/stuck network connection?\n");
|
|
|
|
s->last_warn_time = start;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
pthread_cond_signal(&s->wakeup);
|
2013-11-17 15:42:57 +00:00
|
|
|
mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME);
|
2013-06-08 23:05:11 +00:00
|
|
|
|
2013-06-17 19:22:35 +00:00
|
|
|
*retry_time += mp_time_sec() - start;
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
return 0;
|
2010-05-23 19:49:28 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// Runs in the cache thread
|
|
|
|
static void cache_drop_contents(struct priv *s)
|
2011-12-23 21:50:32 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
s->offset = s->min_filepos = s->max_filepos = s->read_filepos;
|
2013-06-17 21:39:24 +00:00
|
|
|
s->eof = false;
|
2011-12-23 21:50:32 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// Runs in the main thread
|
|
|
|
// mutex must be held, but is sometimes temporarily dropped
|
|
|
|
static int cache_read(struct priv *s, unsigned char *buf, int size)
|
2010-05-29 14:15:55 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
if (size <= 0)
|
|
|
|
return 0;
|
2001-10-21 22:13:12 +00:00
|
|
|
|
2013-06-17 19:22:35 +00:00
|
|
|
double retry = 0;
|
2013-12-13 23:58:06 +00:00
|
|
|
int64_t eof_retry = s->reads - 1; // try at least 1 read on EOF
|
2013-05-25 13:03:30 +00:00
|
|
|
while (s->read_filepos >= s->max_filepos ||
|
|
|
|
s->read_filepos < s->min_filepos)
|
|
|
|
{
|
2013-12-13 23:58:06 +00:00
|
|
|
if (s->eof && s->read_filepos >= s->max_filepos && s->reads >= eof_retry)
|
2013-05-25 13:03:30 +00:00
|
|
|
return 0;
|
2013-06-08 23:05:11 +00:00
|
|
|
if (cache_wakeup_and_wait(s, &retry) == CACHE_INTERRUPTED)
|
2013-05-25 13:03:30 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2001-10-21 22:13:12 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
int64_t newb = s->max_filepos - s->read_filepos; // new bytes in the buffer
|
2013-06-04 23:58:36 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
int64_t pos = s->read_filepos - s->offset; // file pos to buffer memory pos
|
|
|
|
if (pos < 0)
|
|
|
|
pos += s->buffer_size;
|
|
|
|
else if (pos >= s->buffer_size)
|
|
|
|
pos -= s->buffer_size;
|
2013-06-04 23:58:36 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
if (newb > s->buffer_size - pos)
|
|
|
|
newb = s->buffer_size - pos; // handle wrap...
|
2013-06-04 23:58:36 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
newb = FFMIN(newb, size);
|
2013-06-04 23:58:36 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
memcpy(buf, &s->buffer[pos], newb);
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
s->read_filepos += newb;
|
|
|
|
return newb;
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// Runs in the cache thread.
|
|
|
|
// Returns true if reading was attempted, and the mutex was shortly unlocked.
|
|
|
|
static bool cache_fill(struct priv *s)
|
2010-05-29 14:15:55 +00:00
|
|
|
{
|
2013-06-04 23:58:36 +00:00
|
|
|
int64_t read = s->read_filepos;
|
2013-05-25 13:03:30 +00:00
|
|
|
int len;
|
2013-06-04 23:58:36 +00:00
|
|
|
|
|
|
|
if (read < s->min_filepos || read > s->max_filepos) {
|
|
|
|
// seek...
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_DBG(s, "Out of boundaries... seeking to %" PRId64 " \n", read);
|
2013-06-04 23:58:36 +00:00
|
|
|
// drop cache contents only if seeking backward or too much fwd.
|
|
|
|
// This is also done for on-disk files, since it loses the backseek cache.
|
|
|
|
// That in turn can cause major bandwidth increase and performance
|
|
|
|
// issues with e.g. mov or badly interleaved files
|
|
|
|
if (read < s->min_filepos || read >= s->max_filepos + s->seek_limit) {
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_VERBOSE(s, "Dropping cache at pos %"PRId64", "
|
2013-05-25 13:03:30 +00:00
|
|
|
"cached range: %"PRId64"-%"PRId64".\n", read,
|
|
|
|
s->min_filepos, s->max_filepos);
|
|
|
|
cache_drop_contents(s);
|
|
|
|
stream_seek(s->stream, read);
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
|
|
|
}
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// number of buffer bytes which should be preserved in backwards direction
|
2013-06-16 20:52:49 +00:00
|
|
|
int64_t back = mp_clipi64(read - s->min_filepos, 0, s->back_size);
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// number of buffer bytes that are valid and can be read
|
|
|
|
int64_t newb = FFMAX(s->max_filepos - read, 0);
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// max. number of bytes that can be written (starting from max_filepos)
|
|
|
|
int64_t space = s->buffer_size - (newb + back);
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// offset into the buffer that maps to max_filepos
|
|
|
|
int pos = s->max_filepos - s->offset;
|
2013-06-04 23:58:36 +00:00
|
|
|
if (pos >= s->buffer_size)
|
2013-05-25 13:03:30 +00:00
|
|
|
pos -= s->buffer_size; // wrap-around
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-06-04 23:58:36 +00:00
|
|
|
if (space < s->fill_limit) {
|
2013-05-25 13:03:30 +00:00
|
|
|
s->idle = true;
|
2013-12-13 23:58:06 +00:00
|
|
|
s->reads++; // don't stuck main thread
|
2013-05-25 13:03:30 +00:00
|
|
|
return false;
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// limit to end of buffer (without wrapping)
|
|
|
|
if (pos + space >= s->buffer_size)
|
|
|
|
space = s->buffer_size - pos;
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// limit read size (or else would block and read the entire buffer in 1 call)
|
|
|
|
space = FFMIN(space, s->stream->read_chunk);
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-06-04 23:58:36 +00:00
|
|
|
// back+newb+space <= buffer_size
|
2013-05-25 13:03:30 +00:00
|
|
|
int64_t back2 = s->buffer_size - (space + newb); // max back size
|
2013-06-04 23:58:36 +00:00
|
|
|
if (s->min_filepos < (read - back2))
|
|
|
|
s->min_filepos = read - back2;
|
2013-05-25 13:03:30 +00:00
|
|
|
|
|
|
|
// The read call might take a long time and block, so drop the lock.
|
|
|
|
pthread_mutex_unlock(&s->mutex);
|
|
|
|
len = stream_read_partial(s->stream, &s->buffer[pos], space);
|
|
|
|
pthread_mutex_lock(&s->mutex);
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-06-17 21:39:24 +00:00
|
|
|
double pts;
|
|
|
|
if (stream_control(s->stream, STREAM_CTRL_GET_CURRENT_TIME, &pts) <= 0)
|
|
|
|
pts = MP_NOPTS_VALUE;
|
|
|
|
for (int64_t b_pos = pos; b_pos < pos + len + BYTE_META_CHUNK_SIZE;
|
|
|
|
b_pos += BYTE_META_CHUNK_SIZE)
|
|
|
|
{
|
|
|
|
s->bm[b_pos / BYTE_META_CHUNK_SIZE] = (struct byte_meta){.stream_pts = pts};
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
}
|
|
|
|
|
2013-06-04 23:58:36 +00:00
|
|
|
s->max_filepos += len;
|
2013-05-25 13:03:30 +00:00
|
|
|
if (pos + len == s->buffer_size)
|
2013-06-04 23:58:36 +00:00
|
|
|
s->offset += s->buffer_size; // wrap...
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-12-13 23:58:06 +00:00
|
|
|
s->eof = len <= 0;
|
2013-05-25 13:03:30 +00:00
|
|
|
s->idle = s->eof;
|
2013-12-13 23:58:06 +00:00
|
|
|
s->reads++;
|
|
|
|
if (s->eof)
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_VERBOSE(s, "EOF reached.\n");
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
pthread_cond_signal(&s->wakeup);
|
|
|
|
|
|
|
|
return true;
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
static void update_cached_controls(struct priv *s)
|
2013-06-04 23:58:36 +00:00
|
|
|
{
|
2013-06-24 09:34:38 +00:00
|
|
|
unsigned int ui;
|
2013-05-25 13:03:30 +00:00
|
|
|
double d;
|
2013-07-02 10:18:04 +00:00
|
|
|
char **m;
|
2013-05-25 13:03:30 +00:00
|
|
|
s->stream_time_length = 0;
|
|
|
|
if (stream_control(s->stream, STREAM_CTRL_GET_TIME_LENGTH, &d) == STREAM_OK)
|
|
|
|
s->stream_time_length = d;
|
|
|
|
s->stream_start_time = MP_NOPTS_VALUE;
|
|
|
|
if (stream_control(s->stream, STREAM_CTRL_GET_START_TIME, &d) == STREAM_OK)
|
|
|
|
s->stream_start_time = d;
|
|
|
|
s->stream_manages_timeline = false;
|
|
|
|
if (stream_control(s->stream, STREAM_CTRL_MANAGES_TIMELINE, NULL) == STREAM_OK)
|
|
|
|
s->stream_manages_timeline = true;
|
2013-06-24 09:34:38 +00:00
|
|
|
s->stream_num_chapters = 0;
|
|
|
|
if (stream_control(s->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &ui) == STREAM_OK)
|
|
|
|
s->stream_num_chapters = ui;
|
2013-07-02 10:18:04 +00:00
|
|
|
if (stream_control(s->stream, STREAM_CTRL_GET_METADATA, &m) == STREAM_OK) {
|
|
|
|
talloc_free(s->stream_metadata);
|
|
|
|
s->stream_metadata = talloc_steal(s, m);
|
|
|
|
}
|
2013-05-25 13:03:30 +00:00
|
|
|
stream_update_size(s->stream);
|
|
|
|
s->stream_size = s->stream->end_pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
// the core might call these every frame, so cache them...
|
|
|
|
static int cache_get_cached_control(stream_t *cache, int cmd, void *arg)
|
|
|
|
{
|
|
|
|
struct priv *s = cache->priv;
|
|
|
|
switch (cmd) {
|
|
|
|
case STREAM_CTRL_GET_CACHE_SIZE:
|
|
|
|
*(int64_t *)arg = s->buffer_size;
|
|
|
|
return STREAM_OK;
|
|
|
|
case STREAM_CTRL_GET_CACHE_FILL:
|
|
|
|
*(int64_t *)arg = s->max_filepos - s->read_filepos;
|
|
|
|
return STREAM_OK;
|
|
|
|
case STREAM_CTRL_GET_CACHE_IDLE:
|
|
|
|
*(int *)arg = s->idle;
|
|
|
|
return STREAM_OK;
|
|
|
|
case STREAM_CTRL_GET_TIME_LENGTH:
|
|
|
|
*(double *)arg = s->stream_time_length;
|
|
|
|
return s->stream_time_length ? STREAM_OK : STREAM_UNSUPPORTED;
|
2013-05-03 18:11:46 +00:00
|
|
|
case STREAM_CTRL_GET_START_TIME:
|
2013-05-25 13:03:30 +00:00
|
|
|
*(double *)arg = s->stream_start_time;
|
|
|
|
return s->stream_start_time !=
|
|
|
|
MP_NOPTS_VALUE ? STREAM_OK : STREAM_UNSUPPORTED;
|
2012-08-18 19:51:58 +00:00
|
|
|
case STREAM_CTRL_GET_SIZE:
|
2013-05-25 13:03:30 +00:00
|
|
|
*(int64_t *)arg = s->stream_size;
|
|
|
|
return STREAM_OK;
|
2013-05-03 17:52:28 +00:00
|
|
|
case STREAM_CTRL_MANAGES_TIMELINE:
|
2013-05-25 13:03:30 +00:00
|
|
|
return s->stream_manages_timeline ? STREAM_OK : STREAM_UNSUPPORTED;
|
2013-06-24 09:34:38 +00:00
|
|
|
case STREAM_CTRL_GET_NUM_CHAPTERS:
|
|
|
|
*(unsigned int *)arg = s->stream_num_chapters;
|
|
|
|
return STREAM_OK;
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
case STREAM_CTRL_GET_CURRENT_TIME: {
|
|
|
|
if (s->read_filepos >= s->min_filepos &&
|
2013-06-17 21:39:24 +00:00
|
|
|
s->read_filepos <= s->max_filepos &&
|
|
|
|
s->min_filepos < s->max_filepos)
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
{
|
2013-06-17 21:39:24 +00:00
|
|
|
int64_t fpos = FFMIN(s->read_filepos, s->max_filepos - 1);
|
|
|
|
int64_t pos = fpos - s->offset;
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
if (pos < 0)
|
|
|
|
pos += s->buffer_size;
|
|
|
|
else if (pos >= s->buffer_size)
|
|
|
|
pos -= s->buffer_size;
|
2013-06-17 21:39:24 +00:00
|
|
|
double pts = s->bm[pos / BYTE_META_CHUNK_SIZE].stream_pts;
|
|
|
|
*(double *)arg = pts;
|
|
|
|
return pts == MP_NOPTS_VALUE ? STREAM_UNSUPPORTED : STREAM_OK;
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
}
|
2013-06-17 21:39:24 +00:00
|
|
|
return STREAM_UNSUPPORTED;
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
}
|
2013-07-02 10:18:04 +00:00
|
|
|
case STREAM_CTRL_GET_METADATA: {
|
|
|
|
if (s->stream_metadata && s->stream_metadata[0]) {
|
|
|
|
char **m = talloc_new(NULL);
|
|
|
|
int num_m = 0;
|
|
|
|
for (int n = 0; s->stream_metadata[n]; n++) {
|
|
|
|
char *t = talloc_strdup(m, s->stream_metadata[n]);
|
|
|
|
MP_TARRAY_APPEND(NULL, m, num_m, t);
|
|
|
|
}
|
|
|
|
MP_TARRAY_APPEND(NULL, m, num_m, NULL);
|
|
|
|
MP_TARRAY_APPEND(NULL, m, num_m, NULL);
|
|
|
|
*(char ***)arg = m;
|
|
|
|
return STREAM_OK;
|
|
|
|
}
|
|
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
}
|
2013-12-13 23:59:26 +00:00
|
|
|
case STREAM_CTRL_RESUME_CACHE:
|
|
|
|
s->idle = s->eof = false;
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
|
|
|
return STREAM_OK;
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
2013-05-25 13:03:30 +00:00
|
|
|
return STREAM_ERROR;
|
2008-05-24 07:48:35 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
static bool control_needs_flush(int stream_ctrl)
|
2013-06-04 23:58:36 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
switch (stream_ctrl) {
|
|
|
|
case STREAM_CTRL_SEEK_TO_TIME:
|
|
|
|
case STREAM_CTRL_SEEK_TO_CHAPTER:
|
|
|
|
case STREAM_CTRL_SET_ANGLE:
|
Add prelimimary (basic, possibly broken) dvdnav support
This readds a more or less completely new dvdnav implementation, though
it's based on the code from before commit 41fbcee. Note that this is
rather basic, and might be broken or not quite usable in many cases.
Most importantly, navigation highlights are not correctly implemented.
This would require changes in the FFmpeg dvdsub decoder (to apply a
different internal CLUT), so supporting it is not really possible right
now. And in fact, I don't think I ever want to support it, because it's
a very small gain for a lot of work. Instead, mpv will display fake
highlights, which are an approximate bounding box around the real
highlights.
Some things like mouse input or switching audio/subtitles stream using
the dvdnav VM are not supported.
Might be quite fragile on transitions: if dvdnav initiates a transition,
and doesn't give us enough mpeg data to initialize video playback, the
player will just quit.
This is added only because some users seem to want it. I don't intend to
make mpv a good DVD player, so the very basic minimum will have to do.
How about you just convert your DVD to proper video files?
2013-12-12 00:44:28 +00:00
|
|
|
case STREAM_CTRL_SET_CURRENT_TITLE:
|
2013-05-25 13:03:30 +00:00
|
|
|
return true;
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
2013-05-25 13:03:30 +00:00
|
|
|
return false;
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
// Runs in the cache thread
|
|
|
|
static void cache_execute_control(struct priv *s)
|
2013-06-04 23:58:36 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
uint64_t old_pos = stream_tell(s->stream);
|
|
|
|
|
|
|
|
s->control_res = stream_control(s->stream, s->control, s->control_arg);
|
|
|
|
s->control_flush = false;
|
|
|
|
|
|
|
|
bool pos_changed = old_pos != stream_tell(s->stream);
|
|
|
|
bool ok = s->control_res == STREAM_OK;
|
|
|
|
if (pos_changed && !ok) {
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_ERR(s, "STREAM_CTRL changed stream pos but "
|
2013-05-25 13:03:30 +00:00
|
|
|
"returned error, this is not allowed!\n");
|
|
|
|
} else if (pos_changed || (ok && control_needs_flush(s->control))) {
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_VERBOSE(s, "Dropping cache due to control()\n");
|
2013-05-25 13:03:30 +00:00
|
|
|
s->read_filepos = stream_tell(s->stream);
|
|
|
|
s->control_flush = true;
|
|
|
|
cache_drop_contents(s);
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
2003-04-12 13:53:33 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
s->control = CACHE_CTRL_NONE;
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
static void *cache_thread(void *arg)
|
2013-06-04 23:58:36 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
struct priv *s = arg;
|
|
|
|
pthread_mutex_lock(&s->mutex);
|
|
|
|
update_cached_controls(s);
|
|
|
|
double last = mp_time_sec();
|
|
|
|
while (s->control != CACHE_CTRL_QUIT) {
|
2013-06-08 23:05:11 +00:00
|
|
|
if (mp_time_sec() - last > CACHE_UPDATE_CONTROLS_TIME) {
|
2013-05-25 13:03:30 +00:00
|
|
|
update_cached_controls(s);
|
|
|
|
last = mp_time_sec();
|
|
|
|
}
|
|
|
|
if (s->control > 0) {
|
|
|
|
cache_execute_control(s);
|
2012-12-01 23:22:54 +00:00
|
|
|
} else {
|
2013-05-25 13:03:30 +00:00
|
|
|
cache_fill(s);
|
|
|
|
}
|
|
|
|
if (s->control == CACHE_CTRL_PING) {
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
|
|
|
s->control = CACHE_CTRL_NONE;
|
2012-12-01 23:22:54 +00:00
|
|
|
}
|
2013-05-25 13:03:30 +00:00
|
|
|
if (s->idle && s->control == CACHE_CTRL_NONE)
|
2013-11-17 15:42:57 +00:00
|
|
|
mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_IDLE_SLEEP_TIME);
|
2013-05-25 13:03:30 +00:00
|
|
|
}
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
|
|
|
pthread_mutex_unlock(&s->mutex);
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_VERBOSE(s, "Cache exiting...\n");
|
2013-05-25 13:03:30 +00:00
|
|
|
return NULL;
|
2010-05-23 21:58:50 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
static int cache_fill_buffer(struct stream *cache, char *buffer, int max_len)
|
2013-06-04 23:58:36 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
struct priv *s = cache->priv;
|
|
|
|
assert(s->cache_thread_running);
|
|
|
|
|
|
|
|
pthread_mutex_lock(&s->mutex);
|
2013-06-04 23:58:36 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
if (cache->pos != s->read_filepos)
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_ERR(s, "!!! read_filepos differs !!! report this bug...\n");
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
int t = cache_read(s, buffer, max_len);
|
|
|
|
// wakeup the cache thread, possibly make it read more data ahead
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
|
|
|
pthread_mutex_unlock(&s->mutex);
|
|
|
|
return t;
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
static int cache_seek(stream_t *cache, int64_t pos)
|
2013-06-04 23:58:36 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
struct priv *s = cache->priv;
|
|
|
|
assert(s->cache_thread_running);
|
2014-01-31 21:40:35 +00:00
|
|
|
int r = 1;
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
pthread_mutex_lock(&s->mutex);
|
2009-07-06 23:26:13 +00:00
|
|
|
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_DBG(s, "request seek: %" PRId64 " <= to=%" PRId64
|
2013-12-13 23:58:06 +00:00
|
|
|
" (cur=%" PRId64 ") <= %" PRId64 " \n",
|
2013-06-04 23:58:36 +00:00
|
|
|
s->min_filepos, pos, s->read_filepos, s->max_filepos);
|
2001-10-21 22:13:12 +00:00
|
|
|
|
2014-01-31 21:40:35 +00:00
|
|
|
if (!s->seekable && pos > s->max_filepos) {
|
|
|
|
MP_ERR(s, "Attempting to seek past cached data in unseekable stream.\n");
|
|
|
|
r = 0;
|
|
|
|
} else if (!s->seekable && pos < s->min_filepos) {
|
|
|
|
MP_ERR(s, "Attempting to seek before cached data in unseekable stream.\n");
|
|
|
|
r = 0;
|
|
|
|
} else {
|
|
|
|
cache->pos = s->read_filepos = pos;
|
|
|
|
s->eof = false; // so that cache_read() will actually wait for new data
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
pthread_mutex_unlock(&s->mutex);
|
|
|
|
|
2014-01-31 21:40:35 +00:00
|
|
|
return r;
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
2008-05-24 07:48:35 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
static int cache_control(stream_t *cache, int cmd, void *arg)
|
2013-06-04 23:58:36 +00:00
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
struct priv *s = cache->priv;
|
|
|
|
int r = STREAM_ERROR;
|
|
|
|
|
|
|
|
assert(cmd > 0);
|
|
|
|
|
|
|
|
pthread_mutex_lock(&s->mutex);
|
|
|
|
|
|
|
|
r = cache_get_cached_control(cache, cmd, arg);
|
|
|
|
if (r != STREAM_ERROR)
|
|
|
|
goto done;
|
|
|
|
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_VERBOSE(s, "[cache] blocking for STREAM_CTRL %d\n", cmd);
|
2013-06-24 09:34:38 +00:00
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
s->control = cmd;
|
|
|
|
s->control_arg = arg;
|
2013-06-17 19:22:35 +00:00
|
|
|
double retry = 0;
|
2013-05-25 13:03:30 +00:00
|
|
|
while (s->control != CACHE_CTRL_NONE) {
|
2013-06-08 23:05:11 +00:00
|
|
|
if (cache_wakeup_and_wait(s, &retry) == CACHE_INTERRUPTED) {
|
2013-06-04 23:58:36 +00:00
|
|
|
s->eof = 1;
|
2013-05-25 13:03:30 +00:00
|
|
|
r = STREAM_UNSUPPORTED;
|
|
|
|
goto done;
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
|
|
|
}
|
2013-05-25 13:03:30 +00:00
|
|
|
r = s->control_res;
|
|
|
|
if (s->control_flush) {
|
|
|
|
cache->pos = s->read_filepos;
|
|
|
|
cache->eof = 0;
|
|
|
|
cache->buf_pos = cache->buf_len = 0;
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
2013-05-25 13:03:30 +00:00
|
|
|
|
|
|
|
done:
|
|
|
|
pthread_mutex_unlock(&s->mutex);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cache_uninit(stream_t *cache)
|
|
|
|
{
|
|
|
|
struct priv *s = cache->priv;
|
|
|
|
if (s->cache_thread_running) {
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_VERBOSE(s, "Terminating cache...\n");
|
2013-05-25 13:03:30 +00:00
|
|
|
pthread_mutex_lock(&s->mutex);
|
|
|
|
s->control = CACHE_CTRL_QUIT;
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
|
|
|
pthread_mutex_unlock(&s->mutex);
|
|
|
|
pthread_join(s->cache_thread, NULL);
|
2013-06-04 23:58:36 +00:00
|
|
|
}
|
2013-05-25 13:03:30 +00:00
|
|
|
pthread_mutex_destroy(&s->mutex);
|
|
|
|
pthread_cond_destroy(&s->wakeup);
|
|
|
|
free(s->buffer);
|
2013-07-02 10:17:06 +00:00
|
|
|
free(s->bm);
|
2013-05-25 13:03:30 +00:00
|
|
|
talloc_free(s);
|
2008-05-24 07:48:35 +00:00
|
|
|
}
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
|
|
|
|
// return 1 on success, 0 if the function was interrupted and -1 on error, or
|
|
|
|
// if the cache is disabled
|
|
|
|
int stream_cache_init(stream_t *cache, stream_t *stream, int64_t size,
|
|
|
|
int64_t min, int64_t seek_limit)
|
|
|
|
{
|
2013-05-25 13:03:30 +00:00
|
|
|
if (size < 1)
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
return -1;
|
2013-05-25 13:03:30 +00:00
|
|
|
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_INFO(cache, "Cache size set to %" PRId64 " KiB\n",
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
size / 1024);
|
|
|
|
|
|
|
|
if (size > SIZE_MAX) {
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_FATAL(cache, "Cache size larger than max. allocation size\n");
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
struct priv *s = talloc_zero(NULL, struct priv);
|
2013-12-21 19:36:45 +00:00
|
|
|
s->log = cache->log;
|
2013-05-25 13:03:30 +00:00
|
|
|
|
|
|
|
//64kb min_size
|
2013-06-17 21:39:24 +00:00
|
|
|
s->fill_limit = FFMAX(16 * 1024, BYTE_META_CHUNK_SIZE * 2);
|
|
|
|
s->buffer_size = FFMAX(size, s->fill_limit * 4);
|
2013-05-25 13:03:30 +00:00
|
|
|
s->back_size = s->buffer_size / 2;
|
|
|
|
|
|
|
|
s->buffer = malloc(s->buffer_size);
|
2013-06-17 21:39:24 +00:00
|
|
|
s->bm = malloc((s->buffer_size / BYTE_META_CHUNK_SIZE + 2) *
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
sizeof(struct byte_meta));
|
|
|
|
if (!s->buffer || !s->bm) {
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_ERR(s, "Failed to allocate cache buffer.\n");
|
cache: report more precise stream time
DVD and bluray packet streams carry (essentially) random timestamps,
which don't start at 0, can wrap, etc. libdvdread and libbluray provide
a linear timestamp additionally. This timestamp can be retrieved with
STREAM_CTRL_GET_CURRENT_TIME.
The problem is that this timestamp is bound to the current raw file
position, and the stream cache can be ahead of playback by an arbitrary
amount. This is a big problem for the user, because the displayed
playback time and actual time don't match (depending on cache size),
and relative seeking is broken completely.
Attempt to fix this by saving the linear timestamp all N bytes (where
N = BYTE_META_CHUNK_SIZE = 16 KB). This is a rather crappy hack, but
also very effective.
A proper solution would probably try to offset the playback time with
the packet PTS, but that would require at least knowing how the PTS can
wrap (e.g. how many bits is the PTS comprised of, and what are the
maximum and reset values). Another solution would be putting the cache
between libdvdread and the filesystem/DVD device, but that can't be done
currently. (Also isn't that the operating system's responsibility?)
2013-06-06 18:06:32 +00:00
|
|
|
free(s->buffer);
|
|
|
|
free(s->bm);
|
2013-05-25 13:03:30 +00:00
|
|
|
talloc_free(s);
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
return -1;
|
2013-05-25 13:03:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_init(&s->mutex, NULL);
|
|
|
|
pthread_cond_init(&s->wakeup, NULL);
|
|
|
|
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
cache->priv = s;
|
|
|
|
s->cache = cache;
|
2013-05-25 13:03:30 +00:00
|
|
|
s->stream = stream;
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
|
|
|
|
cache->seek = cache_seek;
|
|
|
|
cache->fill_buffer = cache_fill_buffer;
|
|
|
|
cache->control = cache_control;
|
|
|
|
cache->close = cache_uninit;
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
s->seek_limit = seek_limit;
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
//make sure that we won't wait from cache_fill
|
|
|
|
//more data than it is allowed to fill
|
|
|
|
if (s->seek_limit > s->buffer_size - s->fill_limit)
|
|
|
|
s->seek_limit = s->buffer_size - s->fill_limit;
|
|
|
|
if (min > s->buffer_size - s->fill_limit)
|
|
|
|
min = s->buffer_size - s->fill_limit;
|
|
|
|
|
2014-01-31 21:40:35 +00:00
|
|
|
s->seekable = (stream->flags & MP_STREAM_SEEK) == MP_STREAM_SEEK &&
|
|
|
|
stream->end_pos > 0;
|
|
|
|
|
2013-05-25 13:03:30 +00:00
|
|
|
if (pthread_create(&s->cache_thread, NULL, cache_thread, s) != 0) {
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_ERR(s, "Starting cache process/thread failed: %s.\n",
|
2013-05-25 13:03:30 +00:00
|
|
|
strerror(errno));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
s->cache_thread_running = true;
|
|
|
|
|
|
|
|
// wait until cache is filled at least prefill_init %
|
|
|
|
for (;;) {
|
2013-06-08 23:05:11 +00:00
|
|
|
if (stream_check_interrupt(0))
|
|
|
|
return 0;
|
2013-05-25 13:03:30 +00:00
|
|
|
int64_t fill;
|
|
|
|
int idle;
|
|
|
|
if (stream_control(s->cache, STREAM_CTRL_GET_CACHE_FILL, &fill) < 0)
|
|
|
|
break;
|
|
|
|
if (stream_control(s->cache, STREAM_CTRL_GET_CACHE_IDLE, &idle) < 0)
|
|
|
|
break;
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_INFO(s, "\rCache fill: %5.2f%% "
|
2013-05-25 13:03:30 +00:00
|
|
|
"(%" PRId64 " bytes) ", 100.0 * fill / s->buffer_size, fill);
|
|
|
|
if (fill >= min)
|
|
|
|
break;
|
|
|
|
if (idle)
|
|
|
|
break; // file is smaller than prefill size
|
2013-06-08 23:05:11 +00:00
|
|
|
// Wake up if the cache is done reading some data (or on timeout/abort)
|
|
|
|
pthread_mutex_lock(&s->mutex);
|
|
|
|
s->control = CACHE_CTRL_PING;
|
|
|
|
pthread_cond_signal(&s->wakeup);
|
2013-06-17 19:22:35 +00:00
|
|
|
cache_wakeup_and_wait(s, &(double){0});
|
2013-06-08 23:05:11 +00:00
|
|
|
pthread_mutex_unlock(&s->mutex);
|
2013-05-25 13:03:30 +00:00
|
|
|
}
|
2013-12-21 19:36:45 +00:00
|
|
|
MP_INFO(s, "\n");
|
2013-05-25 13:03:30 +00:00
|
|
|
return 1;
|
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
2013-05-24 16:49:09 +00:00
|
|
|
}
|