RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-08 07:08:12 +00:00
Code Issues Releases Wiki Activity

Sorry, fix vobsub duration the arpi way.

Browse Source 
Also added origin parsing, those values are to adjust subtitle placement, they should be added to start_row and end_row and start_col and end_col, but haven't yet found the proper place to hook them in.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5564 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2002-04-11 16:50:52 +00:00
parent 804c9adfe3
commit 050c4bc9ad
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vobsub.c
View File

@ -410,6 +410,7 @@ typedef struct {
void *spudec; void *spudec;
unsigned int palette[16]; unsigned int palette[16];
unsigned int orig_frame_width, orig_frame_height; unsigned int orig_frame_width, orig_frame_height;
unsigned int origin_x, origin_y;
/* index */ /* index */
packet_queue_t *spu_streams; packet_queue_t *spu_streams;
unsigned int spu_streams_size; unsigned int spu_streams_size;
@ -481,7 +482,7 @@ vobsub_add_timestamp(vobsub_t *vob, off_t filepos, unsigned int ms)
if (packet_queue_grow(queue) >= 0) { if (packet_queue_grow(queue) >= 0) {
pkt = queue->packets + (queue->packets_size - 1); pkt = queue->packets + (queue->packets_size - 1);
pkt->filepos = filepos; pkt->filepos = filepos;
pkt->pts100 = ms / 10; pkt->pts100 = ms * 90;
return 0; return 0;
} }
return -1; return -1;
@ -587,6 +588,23 @@ vobsub_parse_size(vobsub_t *vob, const char *line)
return 0; return 0;
} }
static int
vobsub_parse_origin(vobsub_t *vob, const char *line)
{
// org: X,Y
char *p;
while (isspace(*line))
++line;
if (!isdigit(*line))
return -1;
vob->origin_x = strtoul(line, &p, 10);
if (*p != ',')
return -1;
++p;
vob->origin_y = strtoul(p, NULL, 10);
return 0;
}
static int static int
vobsub_parse_palette(vobsub_t *vob, const char *line) vobsub_parse_palette(vobsub_t *vob, const char *line)
{ {
@ -634,6 +652,8 @@ vobsub_parse_one_line(vobsub_t *vob, FILE *fd)
res = vobsub_parse_palette(vob, line + 8); res = vobsub_parse_palette(vob, line + 8);
else if (strncmp("size:", line, 5) == 0) else if (strncmp("size:", line, 5) == 0)
res = vobsub_parse_size(vob, line + 5); res = vobsub_parse_size(vob, line + 5);
else if (strncmp("org:", line, 4) == 0)
res = vobsub_parse_origin(vob, line + 4);
else if (strncmp("timestamp:", line, 10) == 0) else if (strncmp("timestamp:", line, 10) == 0)
res = vobsub_parse_timestamp(vob, line + 10); res = vobsub_parse_timestamp(vob, line + 10);
else { else {
@ -822,15 +842,16 @@ vobsub_close(void *this)
void vobsub_draw(void *this, int dxs, int dys, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)) void vobsub_draw(void *this, int dxs, int dys, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride))
{ {
vobsub_t *vob = (vobsub_t *)this; vobsub_t *vob = (vobsub_t *)this;
if (vob->spudec) if (vob->spudec) {
spudec_draw_scaled(vob->spudec, dxs, dys, draw_alpha); spudec_draw_scaled(vob->spudec, dxs, dys, draw_alpha);
}
} }
void void
vobsub_process(void *vobhandle, float pts) vobsub_process(void *vobhandle, float pts)
{ {
vobsub_t *vob = (vobsub_t *)vobhandle; vobsub_t *vob = (vobsub_t *)vobhandle;
unsigned int pts100 = 100 * pts; unsigned int pts100 = 90000 * pts;
if (vob->spudec) { if (vob->spudec) {
spudec_heartbeat(vob->spudec, pts100); spudec_heartbeat(vob->spudec, pts100);
if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) { if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) {