1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-20 10:17:31 +00:00

spudec.c: Extract image allocation code to a separate function

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31659 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-07-10 10:22:28 +00:00 committed by Uoti Urpala
parent 8200a8d532
commit dd70420bb8

View File

@ -224,6 +224,27 @@ static inline void spudec_cut_image(spudec_handle_t *this)
}
}
static int spudec_alloc_image(spudec_handle_t *this, int stride, int height)
{
if (this->width > stride) // just a safeguard
this->width = stride;
this->stride = stride;
this->height = height;
if (this->image_size < this->stride * this->height) {
if (this->image != NULL) {
free(this->image);
this->image_size = 0;
}
this->image = malloc(2 * this->stride * this->height);
if (this->image) {
this->image_size = this->stride * this->height;
this->aimage = this->image + this->image_size;
}
}
return this->image != NULL;
}
static void spudec_process_data(spudec_handle_t *this, packet_t *packet)
{
unsigned int cmap[4], alpha[4];
@ -256,18 +277,7 @@ static void spudec_process_data(spudec_handle_t *this, packet_t *packet)
}
}
if (this->image_size < this->stride * this->height) {
if (this->image != NULL) {
free(this->image);
this->image_size = 0;
}
this->image = malloc(2 * this->stride * this->height);
if (this->image) {
this->image_size = this->stride * this->height;
this->aimage = this->image + this->image_size;
}
}
if (this->image == NULL)
if (!spudec_alloc_image(this, this->stride, this->height))
return;
/* Kludge: draw_alpha needs width multiple of 8. */