diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-29 18:09:07 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-29 18:09:07 +0000 |
commit | 3e8f2815c19703f5cb6f75db2910234d499d9676 (patch) | |
tree | 70ace5156257d53354cfc26e14186b77e8b81815 /vobsub.c | |
parent | d47cd2aa67ecd4bbab2b72719623cbfa71af5dc9 (diff) | |
download | mpv-3e8f2815c19703f5cb6f75db2910234d499d9676.tar.bz2 mpv-3e8f2815c19703f5cb6f75db2910234d499d9676.tar.xz |
cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30136 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vobsub.c')
-rw-r--r-- | vobsub.c | 1754 |
1 files changed, 853 insertions, 901 deletions
@@ -39,171 +39,167 @@ typedef struct { unsigned long size; unsigned long pos; } rar_stream_t; -static rar_stream_t * -rar_open(const char *const filename, const char *const mode) + +static rar_stream_t *rar_open(const char *const filename, + const char *const mode) { rar_stream_t *stream; /* unrar_exec can only read */ if (strcmp("r", mode) && strcmp("rb", mode)) { - errno = EINVAL; - return NULL; + errno = EINVAL; + return NULL; } stream = malloc(sizeof(rar_stream_t)); if (stream == NULL) - return NULL; + return NULL; /* first try normal access */ stream->file = fopen(filename, mode); if (stream->file == NULL) { - char *rar_filename; - const char *p; - int rc; - /* Guess the RAR archive filename */ - rar_filename = NULL; - p = strrchr(filename, '.'); - if (p) { - ptrdiff_t l = p - filename; - rar_filename = malloc(l + 5); - if (rar_filename == NULL) { - free(stream); - return NULL; - } - strncpy(rar_filename, filename, l); - strcpy(rar_filename + l, ".rar"); - } - else { - rar_filename = malloc(strlen(filename) + 5); - if (rar_filename == NULL) { - free(stream); - return NULL; - } - strcpy(rar_filename, filename); - strcat(rar_filename, ".rar"); - } - /* get rid of the path if there is any */ - if ((p = strrchr(filename, '/')) == NULL) { - p = filename; - } else { - p++; - } - rc = unrar_exec_get(&stream->data, &stream->size, p, rar_filename); - if (!rc) { - /* There is no matching filename in the archive. However, sometimes - * the files we are looking for have been given arbitrary names in the archive. - * Let's look for a file with an exact match in the extension only. */ - int i, num_files, name_len; - ArchiveList_struct *list, *lp; - num_files = unrar_exec_list(rar_filename, &list); - if (num_files > 0) { - char *demanded_ext; - demanded_ext = strrchr (p, '.'); - if (demanded_ext) { - int demanded_ext_len = strlen (demanded_ext); - for (i=0, lp=list; i<num_files; i++, lp=lp->next) { - name_len = strlen (lp->item.Name); - if (name_len >= demanded_ext_len && !strcasecmp (lp->item.Name + name_len - demanded_ext_len, demanded_ext)) { - rc = unrar_exec_get(&stream->data, &stream->size, + char *rar_filename; + const char *p; + int rc; + /* Guess the RAR archive filename */ + rar_filename = NULL; + p = strrchr(filename, '.'); + if (p) { + ptrdiff_t l = p - filename; + rar_filename = malloc(l + 5); + if (rar_filename == NULL) { + free(stream); + return NULL; + } + strncpy(rar_filename, filename, l); + strcpy(rar_filename + l, ".rar"); + } else { + rar_filename = malloc(strlen(filename) + 5); + if (rar_filename == NULL) { + free(stream); + return NULL; + } + strcpy(rar_filename, filename); + strcat(rar_filename, ".rar"); + } + /* get rid of the path if there is any */ + if ((p = strrchr(filename, '/')) == NULL) { + p = filename; + } else { + p++; + } + rc = unrar_exec_get(&stream->data, &stream->size, p, rar_filename); + if (!rc) { + /* There is no matching filename in the archive. However, sometimes + * the files we are looking for have been given arbitrary names in the archive. + * Let's look for a file with an exact match in the extension only. */ + int i, num_files, name_len; + ArchiveList_struct *list, *lp; + num_files = unrar_exec_list(rar_filename, &list); + if (num_files > 0) { + char *demanded_ext; + demanded_ext = strrchr (p, '.'); + if (demanded_ext) { + int demanded_ext_len = strlen (demanded_ext); + for (i = 0, lp = list; i < num_files; i++, lp = lp->next) { + name_len = strlen (lp->item.Name); + if (name_len >= demanded_ext_len && !strcasecmp (lp->item.Name + name_len - demanded_ext_len, demanded_ext)) { + rc = unrar_exec_get(&stream->data, &stream->size, lp->item.Name, rar_filename); - if (rc) break; - } - } - } - unrar_exec_freelist(list); - } - if (!rc) { - free(rar_filename); - free(stream); - return NULL; - } - } - - free(rar_filename); - stream->pos = 0; + if (rc) + break; + } + } + } + unrar_exec_freelist(list); + } + if (!rc) { + free(rar_filename); + free(stream); + return NULL; + } + } + + free(rar_filename); + stream->pos = 0; } return stream; } -static int -rar_close(rar_stream_t *stream) +static int rar_close(rar_stream_t *stream) { if (stream->file) - return fclose(stream->file); + return fclose(stream->file); free(stream->data); return 0; } -static int -rar_eof(rar_stream_t *stream) +static int rar_eof(rar_stream_t *stream) { if (stream->file) - return feof(stream->file); + return feof(stream->file); return stream->pos >= stream->size; } -static long -rar_tell(rar_stream_t *stream) +static long rar_tell(rar_stream_t *stream) { if (stream->file) - return ftell(stream->file); + return ftell(stream->file); return stream->pos; } -static int -rar_seek(rar_stream_t *stream, long offset, int whence) +static int rar_seek(rar_stream_t *stream, long offset, int whence) { if (stream->file) - return fseek(stream->file, offset, whence); + return fseek(stream->file, offset, whence); switch (whence) { case SEEK_SET: - if (offset < 0) { - errno = EINVAL; - return -1; - } - stream->pos = offset; - break; + if (offset < 0) { + errno = EINVAL; + return -1; + } + stream->pos = offset; + break; case SEEK_CUR: - if (offset < 0 && stream->pos < (unsigned long) -offset) { - errno = EINVAL; - return -1; - } - stream->pos += offset; - break; + if (offset < 0 && stream->pos < (unsigned long) -offset) { + errno = EINVAL; + return -1; + } + stream->pos += offset; + break; case SEEK_END: - if (offset < 0 && stream->size < (unsigned long) -offset) { - errno = EINVAL; - return -1; - } - stream->pos = stream->size + offset; - break; + if (offset < 0 && stream->size < (unsigned long) -offset) { + errno = EINVAL; + return -1; + } + stream->pos = stream->size + offset; + break; default: - errno = EINVAL; - return -1; + errno = EINVAL; + return -1; } return 0; } -static int -rar_getc(rar_stream_t *stream) +static int rar_getc(rar_stream_t *stream) { if (stream->file) - return getc(stream->file); + return getc(stream->file); if (rar_eof(stream)) - return EOF; + return EOF; return stream->data[stream->pos++]; } -static size_t -rar_read(void *ptr, size_t size, size_t nmemb, rar_stream_t *stream) +static size_t rar_read(void *ptr, size_t size, size_t nmemb, + rar_stream_t *stream) { size_t res; unsigned long remain; if (stream->file) - return fread(ptr, size, nmemb, stream->file); + return fread(ptr, size, nmemb, stream->file); if (rar_eof(stream)) - return 0; + return 0; res = size * nmemb; remain = stream->size - stream->pos; if (res > remain) - res = remain / size * size; + res = remain / size * size; memcpy(ptr, stream->data + stream->pos, res); stream->pos += res; res /= size; @@ -212,53 +208,51 @@ rar_read(void *ptr, size_t size, size_t nmemb, rar_stream_t *stream) #else typedef FILE rar_stream_t; -#define rar_open fopen -#define rar_close fclose -#define rar_eof feof -#define rar_tell ftell -#define rar_seek fseek -#define rar_getc getc -#define rar_read fread +#define rar_open fopen +#define rar_close fclose +#define rar_eof feof +#define rar_tell ftell +#define rar_seek fseek +#define rar_getc getc +#define rar_read fread #endif /**********************************************************************/ -static ssize_t -vobsub_getline(char **lineptr, size_t *n, rar_stream_t *stream) +static ssize_t vobsub_getline(char **lineptr, size_t *n, rar_stream_t *stream) { size_t res = 0; int c; if (*lineptr == NULL) { - *lineptr = malloc(4096); - if (*lineptr) - *n = 4096; - } - else if (*n == 0) { - char *tmp = realloc(*lineptr, 4096); - if (tmp) { - *lineptr = tmp; - *n = 4096; - } + *lineptr = malloc(4096); + if (*lineptr) + *n = 4096; + } else if (*n == 0) { + char *tmp = realloc(*lineptr, 4096); + if (tmp) { + *lineptr = tmp; + *n = 4096; + } } if (*lineptr == NULL || *n == 0) - return -1; + return -1; for (c = rar_getc(stream); c != EOF; c = rar_getc(stream)) { - if (res + 1 >= *n) { - char *tmp = realloc(*lineptr, *n * 2); - if (tmp == NULL) - return -1; - *lineptr = tmp; - *n *= 2; - } - (*lineptr)[res++] = c; - if (c == '\n') { - (*lineptr)[res] = 0; - return res; - } + if (res + 1 >= *n) { + char *tmp = realloc(*lineptr, *n * 2); + if (tmp == NULL) + return -1; + *lineptr = tmp; + *n *= 2; + } + (*lineptr)[res++] = c; + if (c == '\n') { + (*lineptr)[res] = 0; + return res; + } } if (res == 0) - return -1; + return -1; (*lineptr)[res] = 0; return res; } @@ -276,51 +270,46 @@ typedef struct { unsigned int packet_size; } mpeg_t; -static mpeg_t * -mpeg_open(const char *filename) +static mpeg_t *mpeg_open(const char *filename) { mpeg_t *res = malloc(sizeof(mpeg_t)); int err = res == NULL; if (!err) { - res->pts = 0; - res->aid = -1; - res->packet = NULL; - res->packet_size = 0; - res->packet_reserve = 0; - res->stream = rar_open(filename, "rb"); - err = res->stream == NULL; - if (err) - perror("fopen Vobsub file failed"); - if (err) - free(res); + res->pts = 0; + res->aid = -1; + res->packet = NULL; + res->packet_size = 0; + res->packet_reserve = 0; + res->stream = rar_open(filename, "rb"); + err = res->stream == NULL; + if (err) + perror("fopen Vobsub file failed"); + if (err) + free(res); } return err ? NULL : res; } -static void -mpeg_free(mpeg_t *mpeg) +static void mpeg_free(mpeg_t *mpeg) { if (mpeg->packet) - free(mpeg->packet); + free(mpeg->packet); if (mpeg->stream) - rar_close(mpeg->stream); + rar_close(mpeg->stream); free(mpeg); } -static int -mpeg_eof(mpeg_t *mpeg) +static int mpeg_eof(mpeg_t *mpeg) { return rar_eof(mpeg->stream); } -static off_t -mpeg_tell(mpeg_t *mpeg) +static off_t mpeg_tell(mpeg_t *mpeg) { return rar_tell(mpeg->stream); } -static int -mpeg_run(mpeg_t *mpeg) +static int mpeg_run(mpeg_t *mpeg) { unsigned int len, idx, version; int c; @@ -331,145 +320,137 @@ mpeg_run(mpeg_t *mpeg) mpeg->aid = -1; mpeg->packet_size = 0; if (rar_read(buf, 4, 1, mpeg->stream) != 1) - return -1; + return -1; while (memcmp(buf, wanted, sizeof(wanted)) != 0) { - c = rar_getc(mpeg->stream); - if (c < 0) - return -1; - memmove(buf, buf + 1, 3); - buf[3] = c; + c = rar_getc(mpeg->stream); + if (c < 0) + return -1; + memmove(buf, buf + 1, 3); + buf[3] = c; } switch (buf[3]) { - case 0xb9: /* System End Code */ - break; - case 0xba: /* Packet start code */ - c = rar_getc(mpeg->stream); - if (c < 0) - return -1; - if ((c & 0xc0) == 0x40) - version = 4; - else if ((c & 0xf0) == 0x20) - version = 2; - else { - mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Unsupported MPEG version: 0x%02x\n", c); - return -1; - } - if (version == 4) { - if (rar_seek(mpeg->stream, 9, SEEK_CUR)) - return -1; - } - else if (version == 2) { - if (rar_seek(mpeg->stream, 7, SEEK_CUR)) - return -1; - } - else - abort(); - break; - case 0xbd: /* packet */ - if (rar_read(buf, 2, 1, mpeg->stream) != 1) - return -1; - len = buf[0] << 8 | buf[1]; - idx = mpeg_tell(mpeg); - c = rar_getc(mpeg->stream); - if (c < 0) - return -1; - if ((c & 0xC0) == 0x40) { /* skip STD scale & size */ - if (rar_getc(mpeg->stream) < 0) - return -1; - c = rar_getc(mpeg->stream); - if (c < 0) - return -1; - } - if ((c & 0xf0) == 0x20) { /* System-1 stream timestamp */ - /* Do we need this? */ - abort(); - } - else if ((c & 0xf0) == 0x30) { - /* Do we need this? */ - abort(); - } - else if ((c & 0xc0) == 0x80) { /* System-2 (.VOB) stream */ - unsigned int pts_flags, hdrlen, dataidx; - c = rar_getc(mpeg->stream); - if (c < 0) - return -1; - pts_flags = c; - c = rar_getc(mpeg->stream); - if (c < 0) - return -1; - hdrlen = c; - dataidx = mpeg_tell(mpeg) + hdrlen; - if (dataidx > idx + len) { - mp_msg(MSGT_VOBSUB,MSGL_ERR, "Invalid header length: %d (total length: %d, idx: %d, dataidx: %d)\n", - hdrlen, len, idx, dataidx); - return -1; - } - if ((pts_flags & 0xc0) == 0x80) { - if (rar_read(buf, 5, 1, mpeg->stream) != 1) - return -1; - if (!(((buf[0] & 0xf0) == 0x20) && (buf[0] & 1) && (buf[2] & 1) && (buf[4] & 1))) { - mp_msg(MSGT_VOBSUB,MSGL_ERR, "vobsub PTS error: 0x%02x %02x%02x %02x%02x \n", - buf[0], buf[1], buf[2], buf[3], buf[4]); - mpeg->pts = 0; - } - else - mpeg->pts = ((buf[0] & 0x0e) << 29 | buf[1] << 22 | (buf[2] & 0xfe) << 14 - | buf[3] << 7 | (buf[4] >> 1)); - } - else /* if ((pts_flags & 0xc0) == 0xc0) */ { - /* what's this? */ - /* abort(); */ - } - rar_seek(mpeg->stream, dataidx, SEEK_SET); - mpeg->aid = rar_getc(mpeg->stream); - if (mpeg->aid < 0) { - mp_msg(MSGT_VOBSUB,MSGL_ERR, "Bogus aid %d\n", mpeg->aid); - return -1; - } - mpeg->packet_size = len - ((unsigned int) mpeg_tell(mpeg) - idx); - if (mpeg->packet_reserve < mpeg->packet_size) { - if (mpeg->packet) - free(mpeg->packet); - mpeg->packet = malloc(mpeg->packet_size); - if (mpeg->packet) - mpeg->packet_reserve = mpeg->packet_size; - } - if (mpeg->packet == NULL) { - mp_msg(MSGT_VOBSUB,MSGL_FATAL,"malloc failure"); - mpeg->packet_reserve = 0; - mpeg->packet_size = 0; - return -1; - } - if (rar_read(mpeg->packet, mpeg->packet_size, 1, mpeg->stream) != 1) { - mp_msg(MSGT_VOBSUB,MSGL_ERR,"fread failure"); - mpeg->packet_size = 0; - return -1; - } - idx = len; - } - break; - case 0xbe: /* Padding */ - if (rar_read(buf, 2, 1, mpeg->stream) != 1) - return -1; - len = buf[0] << 8 | buf[1]; - if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR)) - return -1; - break; + case 0xb9: /* System End Code */ + break; + case 0xba: /* Packet start code */ + c = rar_getc(mpeg->stream); + if (c < 0) + return -1; + if ((c & 0xc0) == 0x40) + version = 4; + else if ((c & 0xf0) == 0x20) + version = 2; + else { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Unsupported MPEG version: 0x%02x\n", c); + return -1; + } + if (version == 4) { + if (rar_seek(mpeg->stream, 9, SEEK_CUR)) + return -1; + } else if (version == 2) { + if (rar_seek(mpeg->stream, 7, SEEK_CUR)) + return -1; + } else + abort(); + break; + case 0xbd: /* packet */ + if (rar_read(buf, 2, 1, mpeg->stream) != 1) + return -1; + len = buf[0] << 8 | buf[1]; + idx = mpeg_tell(mpeg); + c = rar_getc(mpeg->stream); + if (c < 0) + return -1; + if ((c & 0xC0) == 0x40) { /* skip STD scale & size */ + if (rar_getc(mpeg->stream) < 0) + return -1; + c = rar_getc(mpeg->stream); + if (c < 0) + return -1; + } + if ((c & 0xf0) == 0x20) { /* System-1 stream timestamp */ + /* Do we need this? */ + abort(); + } else if ((c & 0xf0) == 0x30) { + /* Do we need this? */ + abort(); + } else if ((c & 0xc0) == 0x80) { /* System-2 (.VOB) stream */ + unsigned int pts_flags, hdrlen, dataidx; + c = rar_getc(mpeg->stream); + if (c < 0) + return -1; + pts_flags = c; + c = rar_getc(mpeg->stream); + if (c < 0) + return -1; + hdrlen = c; + dataidx = mpeg_tell(mpeg) + hdrlen; + if (dataidx > idx + len) { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "Invalid header length: %d (total length: %d, idx: %d, dataidx: %d)\n", + hdrlen, len, idx, dataidx); + return -1; + } + if ((pts_flags & 0xc0) == 0x80) { + if (rar_read(buf, 5, 1, mpeg->stream) != 1) + return -1; + if (!(((buf[0] & 0xf0) == 0x20) && (buf[0] & 1) && (buf[2] & 1) && (buf[4] & 1))) { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "vobsub PTS error: 0x%02x %02x%02x %02x%02x \n", + buf[0], buf[1], buf[2], buf[3], buf[4]); + mpeg->pts = 0; + } else + mpeg->pts = ((buf[0] & 0x0e) << 29 | buf[1] << 22 | (buf[2] & 0xfe) << 14 + | buf[3] << 7 | (buf[4] >> 1)); + } else /* if ((pts_flags & 0xc0) == 0xc0) */ { + /* what's this? */ + /* abort(); */ + } + rar_seek(mpeg->stream, dataidx, SEEK_SET); + mpeg->aid = rar_getc(mpeg->stream); + if (mpeg->aid < 0) { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "Bogus aid %d\n", mpeg->aid); + return -1; + } + mpeg->packet_size = len - ((unsigned int) mpeg_tell(mpeg) - idx); + if (mpeg->packet_reserve < mpeg->packet_size) { + if (mpeg->packet) + free(mpeg->packet); + mpeg->packet = malloc(mpeg->packet_size); + if (mpeg->packet) + mpeg->packet_reserve = mpeg->packet_size; + } + if (mpeg->packet == NULL) { + mp_msg(MSGT_VOBSUB, MSGL_FATAL, "malloc failure"); + mpeg->packet_reserve = 0; + mpeg->packet_size = 0; + return -1; + } + if (rar_read(mpeg->packet, mpeg->packet_size, 1, mpeg->stream) != 1) { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "fread failure"); + mpeg->packet_size = 0; + return -1; + } + idx = len; + } + break; + case 0xbe: /* Padding */ + if (rar_read(buf, 2, 1, mpeg->stream) != 1) + return -1; + len = buf[0] << 8 | buf[1]; + if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR)) + return -1; + break; default: - if (0xc0 <= buf[3] && buf[3] < 0xf0) { - /* MPEG audio or video */ - if (rar_read(buf, 2, 1, mpeg->stream) != 1) - return -1; - len = buf[0] << 8 | buf[1]; - if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR)) - return -1; - - } - else { - mp_msg(MSGT_VOBSUB,MSGL_ERR,"unknown header 0x%02X%02X%02X%02X\n", - buf[0], buf[1], buf[2], buf[3]); - return -1; - } + if (0xc0 <= buf[3] && buf[3] < 0xf0) { + /* MPEG audio or video */ + if (rar_read(buf, 2, 1, mpeg->stream) != 1) + return -1; + len = buf[0] << 8 | buf[1]; + if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR)) + return -1; + } else { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "unknown header 0x%02X%02X%02X%02X\n", + buf[0], buf[1], buf[2], buf[3]); + return -1; + } } return 0; } @@ -493,8 +474,7 @@ typedef struct { unsigned int current_index; } packet_queue_t; -static void -packet_construct(packet_t *pkt) +static void packet_construct(packet_t *pkt) { pkt->pts100 = 0; pkt->filepos = 0; @@ -502,15 +482,13 @@ packet_construct(packet_t *pkt) pkt->data = NULL; } -static void -packet_destroy(packet_t *pkt) +static void packet_destroy(packet_t *pkt) { if (pkt->data) - free(pkt->data); + free(pkt->data); } -static void -packet_queue_construct(packet_queue_t *queue) +static void packet_queue_construct(packet_queue_t *queue) { queue->id = NULL; queue->packets = NULL; @@ -519,66 +497,61 @@ packet_queue_construct(packet_queue_t *queue) queue->current_index = 0; } -static void -packet_queue_destroy(packet_queue_t *queue) +static void packet_queue_destroy(packet_queue_t *queue) { if (queue->packets) { - while (queue->packets_size--) - packet_destroy(queue->packets + queue->packets_size); - free(queue->packets); + while (queue->packets_size--) + packet_destroy(queue->packets + queue->packets_size); + free(queue->packets); } return; } /* Make sure there is enough room for needed_size packets in the packet queue. */ -static int -packet_queue_ensure(packet_queue_t *queue, unsigned int needed_size) +static int packet_queue_ensure(packet_queue_t *queue, unsigned int needed_size) { if (queue->packets_reserve < needed_size) { - if (queue->packets) { - packet_t *tmp = realloc(queue->packets, 2 * queue->packets_reserve * sizeof(packet_t)); - if (tmp == NULL) { - mp_msg(MSGT_VOBSUB,MSGL_FATAL,"realloc failure"); - return -1; - } - queue->packets = tmp; - queue->packets_reserve *= 2; - } - else { - queue->packets = malloc(sizeof(packet_t)); - if (queue->packets == NULL) { - mp_msg(MSGT_VOBSUB,MSGL_FATAL,"malloc failure"); - return -1; - } - queue->packets_reserve = 1; - } + if (queue->packets) { + packet_t *tmp = realloc(queue->packets, 2 * queue->packets_reserve * sizeof(packet_t)); + if (tmp == NULL) { + mp_msg(MSGT_VOBSUB, MSGL_FATAL, "realloc failure"); + return -1; + } + queue->packets = tmp; + queue->packets_reserve *= 2; + } else { + queue->packets = malloc(sizeof(packet_t)); + if (queue->packets == NULL) { + mp_msg(MSGT_VOBSUB, MSGL_FATAL, "malloc failure"); + return -1; + } + queue->packets_reserve = 1; + } } return 0; } /* add one more packet */ -static int -packet_queue_grow(packet_queue_t *queue) +static int packet_queue_grow(packet_queue_t *queue) { if (packet_queue_ensure(queue, queue->packets_size + 1) < 0) - return -1; + return -1; packet_construct(queue->packets + queue->packets_size); ++queue->packets_size; return 0; } /* insert a new packet, duplicating pts from the current one */ -static int -packet_queue_insert(packet_queue_t *queue) +static int packet_queue_insert(packet_queue_t *queue) { packet_t *pkts; if (packet_queue_ensure(queue, queue->packets_size + 1) < 0) - return -1; + return -1; /* XXX packet_size does not reflect the real thing here, it will be updated a bit later */ memmove(queue->packets + queue->current_index + 2, - queue->packets + queue->current_index + 1, - sizeof(packet_t) * (queue->packets_size - queue->current_index - 1)); + queue->packets + queue->current_index + 1, + sizeof(packet_t) * (queue->packets_size - queue->current_index - 1)); pkts = queue->packets + queue->current_index; ++queue->packets_size; ++queue->current_index; @@ -606,173 +579,167 @@ typedef struct { } vobsub_t; /* Make sure that the spu stream idx exists. */ -static int -vobsub_ensure_spu_stream(vobsub_t *vob, unsigned int index) +static int vobsub_ensure_spu_stream(vobsub_t *vob, unsigned int index) { if (index >= vob->spu_streams_size) { - /* This is a new stream */ - if (vob->spu_streams) { - packet_queue_t *tmp = realloc(vob->spu_streams, (index + 1) * sizeof(packet_queue_t)); - if (tmp == NULL) { - mp_msg(MSGT_VOBSUB,MSGL_ERR,"vobsub_ensure_spu_stream: realloc failure"); - return -1; - } - vob->spu_streams = tmp; - } - else { - vob->spu_streams = malloc((index + 1) * sizeof(packet_queue_t)); - if (vob->spu_streams == NULL) { - mp_msg(MSGT_VOBSUB,MSGL_ERR,"vobsub_ensure_spu_stream: malloc failure"); - return -1; - } - } - while (vob->spu_streams_size <= index) { - packet_queue_construct(vob->spu_streams + vob->spu_streams_size); - ++vob->spu_streams_size; - } + /* This is a new stream */ + if (vob->spu_streams) { + packet_queue_t *tmp = realloc(vob->spu_streams, (index + 1) * sizeof(packet_queue_t)); + if (tmp == NULL) { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "vobsub_ensure_spu_stream: realloc failure"); + return -1; + } + vob->spu_streams = tmp; + } else { + vob->spu_streams = malloc((index + 1) * sizeof(packet_queue_t)); + if (vob->spu_streams == NULL) { + mp_msg(MSGT_VOBSUB, MSGL_ERR, "vobsub_ensure_spu_stream: malloc failure"); + return -1; + } + } + while (vob->spu_streams_size <= index) { + packet_queue_construct(vob->spu_streams + vob->spu_streams_size); + ++vob->spu_streams_size; + } } return 0; } -static int -vobsub_add_id(vobsub_t *vob, const char *id, size_t idlen, const unsigned int index) +static int vobsub_add_id(vobsub_t *vob, const char *id, size_t idlen, + const unsigned int index) { if (vobsub_ensure_spu_stream(vob, index) < 0) - return -1; + return -1; if (id && idlen) { - if (vob->spu_streams[index].id) - free(vob->spu_streams[index].id); - vob->spu_streams[index].id = malloc(idlen + 1); - if (vob->spu_streams[index].id == NULL) { - mp_msg(MSGT_VOBSUB,MSGL_FATAL,"vobsub_add_id: malloc failure"); - return -1; - } - vob->spu_streams[index].id[idlen] = 0; - memcpy(vob->spu_streams[index].id, id, idlen); + if (vob->spu_streams[index].id) + free(vob->spu_streams[index].id); + vob->spu_streams[index].id = malloc(idlen + 1); + if (vob->spu_streams[index].id == NULL) { + mp_msg(MSGT_VOBSUB, MSGL_FATAL, "vobsub_add_id: malloc failure"); + return -1; + } + vob->spu_streams[index].id[idlen] = 0; + memcpy(vob->spu_streams[index].id, id, idlen); } vob->spu_streams_current = index; mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VOBSUB_ID=%d\n", index); if (id && idlen) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VSID_%d_LANG=%s\n", index, vob->spu_streams[index].id); - mp_msg(MSGT_VOBSUB,MSGL_V,"[vobsub] subtitle (vobsubid): %d language %s\n", - index, vob->spu_streams[index].id); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VSID_%d_LANG=%s\n", index, vob->spu_streams[index].id); + mp_msg(MSGT_VOBSUB, MSGL_V, "[vobsub] subtitle (vobsubid): %d language %s\n", + index, vob->spu_streams[index].id); return 0; } -static int -vobsub_add_timestamp(vobsub_t *vob, off_t filepos, int ms) +static int vobsub_add_timestamp(vobsub_t *vob, off_t filepos, int ms) { packet_queue_t *queue; packet_t *pkt; if (vob->spu_streams == 0) { - mp_msg(MSGT_VOBSUB,MSGL_WARN,"[vobsub] warning, binning some index entries. Check your index file\n"); - return -1; + mp_msg(MSGT_VOBSUB, MSGL_WARN, "[vobsub] warning, binning some index entries. Check your index file\n"); + return -1; } queue = vob->spu_streams + vob->spu_streams_current; if (packet_queue_grow(queue) >= 0) { - pkt = queue->packets + (queue->packets_size - 1); - pkt->filepos = filepos; - pkt->pts100 = ms < 0 ? UINT_MAX : (unsigned int)ms * 90; - return 0; + pkt = queue->packets + (queue->packets_size - 1); + pkt->filepos = filepos; + pkt->pts100 = ms < 0 ? UINT_MAX : (unsigned int)ms * 90; + return 0; } return -1; } -static int -vobsub_parse_id(vobsub_t *vob, const char *line) +static int vobsub_parse_id(vobsub_t *vob, const char *line) { // id: xx, index: n size_t idlen; const char *p, *q; p = line; while (isspace(*p)) - ++p; + ++p; q = p; while (isalpha(*q)) - ++q; + ++q; idlen = q - p; if (idlen == 0) - return -1; + return -1; ++q; while (isspace(*q)) - ++q; + ++q; if (strncmp("index:", q, 6)) - return -1; + return -1; q += 6; while (isspace(*q)) - ++q; + ++q; if (!isdigit(*q)) - return -1; + return -1; return vobsub_add_id(vob, p, idlen, atoi(q)); } -static int -vobsub_parse_timestamp(vobsub_t *vob, const char *line) +static int vobsub_parse_timestamp(vobsub_t *vob, const char *line) { // timestamp: HH:MM:SS.mmm, filepos: 0nnnnnnnnn const char *p; int h, m, s, ms; off_t filepos; while (isspace(*line)) - ++line; + ++line; p = line; while (isdigit(*p)) - ++p; + ++p; if (p - line != 2) - return -1; + return -1; h = atoi(line); if (*p != ':') - return -1; + return -1; line = ++p; while (isdigit(*p)) - ++p; + ++p; if (p - line != 2) - return -1; + return -1; m = atoi(line); if (*p != ':') - return -1; + return -1; line = ++p; while (isdigit(*p)) - ++p; + ++p; if (p - line != 2) - return -1; + return -1; s = atoi(line); if (*p != ':') - return -1; + return -1; line = ++p; while (isdigit(*p)) - ++p; + ++p; if (p - line != 3) - return -1; + return -1; ms = atoi(line); if (*p != ',') - return -1; + return -1; line = p + 1; while (isspace(*line)) - ++line; + ++line; if (strncmp("filepos:", line, 8)) - return -1; + return -1; line += 8; while (isspace(*line)) - ++line; + ++line; if (! isxdigit(*line)) - return -1; + return -1; filepos = strtol(line, NULL, 16); return vobsub_add_timestamp(vob, filepos, vob->delay + ms + 1000 * (s + 60 * (m + 60 * h))); } -static int -vobsub_parse_origin(vobsub_t *vob, const char *line) +static int vobsub_parse_origin(vobsub_t *vob, const char *line) { // org: X,Y char *p; while (isspace(*line)) - ++line; + ++line; if (!isdigit(*line)) - return -1; + return -1; vob->origin_x = strtoul(line, & |