RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-04 22:20:22 +00:00
Code Issues Releases Wiki Activity

Put all spudec_new stuff in a single function,

Browse Source 
spudec_new_scaled_vobsub.  Original frame width is always either
720x576 or 720x480.  See dvd-subtitle-problem.txt and
dvd-subtitle-problem.txt.vob.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6939 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
kmkaplan 2002-08-06 13:32:55 +00:00
parent 19e3d7f975
commit fc8d212e57
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spudec.c
View File

@ -927,25 +927,7 @@ void spudec_set_font_factor(void * this, double factor)
void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigned int frame_height) void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigned int frame_height)
{ {
spudec_handle_t *this = calloc(1, sizeof(spudec_handle_t)); return spudec_new_scaled_vobsub(palette, NULL, 0, frame_width, frame_height);
if (this) {
if (palette) {
memcpy(this->global_palette, palette, sizeof(this->global_palette));
this->auto_palette = 0;
}
else {
/* No palette, compute one */
this->auto_palette = 1;
}
this->packet = NULL;
this->image = NULL;
this->scaled_image = NULL;
this->orig_frame_width = frame_width;
this->orig_frame_height = frame_height;
}
else
mp_msg(MSGT_SPUDEC,MSGL_FATAL, "FATAL: spudec_init: calloc");
return this;
} }
/* get palette custom color, width, height from .idx file */ /* get palette custom color, width, height from .idx file */
@ -957,8 +939,10 @@ void *spudec_new_scaled_vobsub(unsigned int *palette, unsigned int *cuspal, unsi
this->packet = NULL; this->packet = NULL;
this->image = NULL; this->image = NULL;
this->scaled_image = NULL; this->scaled_image = NULL;
this->orig_frame_width = frame_width; /* XXX Although the video frame is some size, the SPU frame is
this->orig_frame_height = frame_height; always maximum size i.e. 720 wide and 576 or 480 high */
this->orig_frame_width = 720;
this->orig_frame_height = (frame_height == 480 || frame_height == 240) ? 480 : 576;
this->custom = custom; this->custom = custom;
// set up palette: // set up palette:
this->auto_palette = 1; this->auto_palette = 1;