RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

stream_file: uncrustify

Browse Source
This commit is contained in:
wm4 2013-08-22 18:08:46 +02:00
parent a9cb2dc1b8
commit 974250b60c
1 changed files with 144 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
stream/stream_file.c
View File

@ -38,13 +38,15 @@ struct priv {
bool close; bool close;
}; };
static int fill_buffer(stream_t *s, char* buffer, int max_len){ static int fill_buffer(stream_t *s, char *buffer, int max_len)
{
struct priv *p = s->priv; struct priv *p = s->priv;
int r = read(p->fd, buffer, max_len); int r = read(p->fd, buffer, max_len);
return (r <= 0) ? -1 : r; return (r <= 0) ? -1 : r;
} }
static int write_buffer(stream_t *s, char* buffer, int len) { static int write_buffer(stream_t *s, char *buffer, int len)
{
struct priv *p = s->priv; struct priv *p = s->priv;
int r; int r;
int wr = 0; int wr = 0;
@ -58,23 +60,28 @@ static int write_buffer(stream_t *s, char* buffer, int len) {
return len; return len;
} }
static int seek(stream_t *s,int64_t newpos) { static int seek(stream_t *s, int64_t newpos)
{
struct priv *p = s->priv; struct priv *p = s->priv;
s->pos = newpos; s->pos = newpos;
if(lseek(p->fd,s->pos,SEEK_SET)<0) { if (lseek(p->fd, s->pos, SEEK_SET) < 0)
return 0; return 0;
}
return 1; return 1;
} }
static int seek_forward(stream_t *s,int64_t newpos) { static int seek_forward(stream_t *s, int64_t newpos)
{
if (newpos < s->pos) { if (newpos < s->pos) {
mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); mp_msg(MSGT_STREAM, MSGL_INFO,
"Cannot seek backward in linear streams!\n");
return 0; return 0;
} }
while (s->pos < newpos) { while (s->pos < newpos) {
int len = s->fill_buffer(s, s->buffer, STREAM_BUFFER_SIZE); int len = s->fill_buffer(s, s->buffer, STREAM_BUFFER_SIZE);
if(len<=0){ s->buf_pos=s->buf_len=0; break; } // EOF if (len <= 0) { // EOF
s->buf_pos = s->buf_len = 0;
break;
}
s->buf_pos = 0; s->buf_pos = 0;
s->buf_len = len; s->buf_len = len;
s->pos += len; s->pos += len;
@ -82,7 +89,8 @@ static int seek_forward(stream_t *s,int64_t newpos) {
return 1; return 1;
} }
static int control(stream_t *s, int cmd, void *arg) { static int control(stream_t *s, int cmd, void *arg)
{
struct priv *p = s->priv; struct priv *p = s->priv;
switch (cmd) { switch (cmd) {
case STREAM_CTRL_GET_SIZE: { case STREAM_CTRL_GET_SIZE: {
@ -108,14 +116,15 @@ static void s_close(stream_t *s)
static int open_f(stream_t *stream, int mode) static int open_f(stream_t *stream, int mode)
{ {
int f; int fd;
mode_t m = 0;
int64_t len;
char *filename = stream->path; char *filename = stream->path;
struct priv *priv = talloc_ptrtype(stream, priv); struct priv *priv = talloc_ptrtype(stream, priv);
*priv = (struct priv) { .fd = -1 }; *priv = (struct priv) {
.fd = -1
};
stream->priv = priv; stream->priv = priv;
mode_t m = 0;
if (mode == STREAM_READ) if (mode == STREAM_READ)
m = O_RDONLY; m = O_RDONLY;
else if (mode == STREAM_WRITE) else if (mode == STREAM_WRITE)
@ -135,52 +144,51 @@ static int open_f(stream_t *stream, int mode)
filename++; filename++;
#endif #endif
m |= O_BINARY;
if (!strcmp(filename, "-")) { if (!strcmp(filename, "-")) {
if (mode == STREAM_READ) { if (mode == STREAM_READ) {
// read from stdin
mp_tmsg(MSGT_OPEN, MSGL_INFO, "Reading from stdin...\n"); mp_tmsg(MSGT_OPEN, MSGL_INFO, "Reading from stdin...\n");
f=0; // 0=stdin fd = 0;
#if HAVE_SETMODE #if HAVE_SETMODE
setmode(fileno(stdin), O_BINARY); setmode(fileno(stdin), O_BINARY);
#endif #endif
} else { } else {
mp_msg(MSGT_OPEN, MSGL_INFO, "Writing to stdout\n"); mp_msg(MSGT_OPEN, MSGL_INFO, "Writing to stdout\n");
f=1; fd = 1;
#if HAVE_SETMODE #if HAVE_SETMODE
setmode(fileno(stdout), O_BINARY); setmode(fileno(stdout), O_BINARY);
#endif #endif
} }
priv->fd = f; priv->fd = fd;
priv->close = false; priv->close = false;
} else { } else {
mode_t openmode = S_IRUSR | S_IWUSR; mode_t openmode = S_IRUSR | S_IWUSR;
#ifndef __MINGW32__ #ifndef __MINGW32__
openmode |= S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; openmode |= S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
#endif #endif
f=open(filename,m, openmode); fd = open(filename, m | O_BINARY, openmode);
if(f<0) { if (fd < 0) {
mp_tmsg(MSGT_OPEN, MSGL_ERR, "Cannot open file '%s': %s\n", filename, mp_tmsg(MSGT_OPEN, MSGL_ERR, "Cannot open file '%s': %s\n",
strerror(errno)); filename, strerror(errno));
return STREAM_ERROR; return STREAM_ERROR;
} }
#ifndef __MINGW32__ #ifndef __MINGW32__
struct stat st; struct stat st;
if (fstat(f, &st) == 0 && S_ISDIR(st.st_mode)) { if (fstat(fd, &st) == 0 && S_ISDIR(st.st_mode)) {
mp_tmsg(MSGT_OPEN,MSGL_ERR,"File is a directory: '%s'\n",filename); mp_tmsg(MSGT_OPEN, MSGL_ERR, "File is a directory: '%s'\n",
close(f); filename);
close(fd);
return STREAM_ERROR; return STREAM_ERROR;
} }
#endif #endif
priv->fd = f; priv->fd = fd;
priv->close = true; priv->close = true;
} }
len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET); int64_t len = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
#ifdef __MINGW32__ #ifdef __MINGW32__
// seeks on stdin incorrectly succeed on MinGW // seeks on stdin incorrectly succeed on MinGW
if(f==0) if (fd == 0)
len = -1; len = -1;
#endif #endif
stream->type = STREAMTYPE_FILE; stream->type = STREAMTYPE_FILE;
@ -192,7 +200,7 @@ static int open_f(stream_t *stream, int mode)
stream->end_pos = len; stream->end_pos = len;
} }
mp_msg(MSGT_OPEN,MSGL_V,"[file] File size is %"PRId64" bytes\n", (int64_t)len); mp_msg(MSGT_OPEN, MSGL_V, "[file] File size is %" PRId64 " bytes\n", len);
stream->fill_buffer = fill_buffer; stream->fill_buffer = fill_buffer;
stream->write_buffer = write_buffer; stream->write_buffer = write_buffer;