summaryrefslogtreecommitdiff
path: root/src/video_dec
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_dec')
-rw-r--r--src/video_dec/foovideo.c6
-rw-r--r--src/video_dec/gdkpixbuf.c30
-rw-r--r--src/video_dec/image.c34
-rw-r--r--src/video_dec/libmpeg2/xine_mpeg2_decoder.c16
-rw-r--r--src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c28
-rw-r--r--src/video_dec/rgb.c72
-rw-r--r--src/video_dec/yuv.c38
7 files changed, 112 insertions, 112 deletions
diff --git a/src/video_dec/foovideo.c b/src/video_dec/foovideo.c
index 61a4b1e40..99ec1287b 100644
--- a/src/video_dec/foovideo.c
+++ b/src/video_dec/foovideo.c
@@ -67,7 +67,7 @@ typedef struct foovideo_decoder_s {
/* these are variables exclusive to the foo video decoder */
unsigned char current_yuv_byte;
-
+
} foovideo_decoder_t;
/**************************************************************************
@@ -98,7 +98,7 @@ static void foovideo_decode_data (video_decoder_t *this_gen,
this->video_step = buf->decoder_info[0];
_x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
}
-
+
if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
(this->stream->video_out->open) (this->stream->video_out, this->stream);
@@ -256,7 +256,7 @@ static void *init_plugin (xine_t *xine, void *data) {
* list of valid buffer types (and add a new one if the one you need does
* not exist). Terminate the list with a 0.
*/
-static const uint32_t video_types[] = {
+static const uint32_t video_types[] = {
/* BUF_VIDEO_FOOVIDEO, */
BUF_VIDEO_VQA,
BUF_VIDEO_SORENSON_V3,
diff --git a/src/video_dec/gdkpixbuf.c b/src/video_dec/gdkpixbuf.c
index 9eea449a5..ed88323fb 100644
--- a/src/video_dec/gdkpixbuf.c
+++ b/src/video_dec/gdkpixbuf.c
@@ -1,18 +1,18 @@
/*
* Copyright (C) 2006 the xine project
- *
+ *
* This file is part of xine, a free video player.
- *
+ *
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* xine is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -65,7 +65,7 @@ typedef struct image_decoder_s {
xine_stream_t *stream;
int video_open;
-
+
GdkPixbufLoader *loader;
} image_decoder_t;
@@ -158,8 +158,8 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
* alloc and draw video frame
*/
img = this->stream->video_out->get_frame (this->stream->video_out, width,
- height, (double)width/(double)height,
- XINE_IMGFMT_YUY2,
+ height, (double)width/(double)height,
+ XINE_IMGFMT_YUY2,
VO_BOTH_FIELDS);
img->pts = buf->pts;
img->duration = 3600;
@@ -167,9 +167,9 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
yuv444_to_yuy2(&yuv_planes, img->base[0], img->pitches[0]);
free_yuv_planes(&yuv_planes);
-
+
_x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, img->duration);
-
+
img->draw(img, this->stream);
img->free(img);
}
@@ -178,7 +178,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
static void image_flush (video_decoder_t *this_gen) {
/* image_decoder_t *this = (image_decoder_t *) this_gen; */
-
+
/*
* flush out any frames that are still stored in the decoder
*/
@@ -187,7 +187,7 @@ static void image_flush (video_decoder_t *this_gen) {
static void image_reset (video_decoder_t *this_gen) {
image_decoder_t *this = (image_decoder_t *) this_gen;
-
+
/*
* reset decoder after engine flush (prepare for new
* video data not related to recently decoded data)
@@ -203,7 +203,7 @@ static void image_reset (video_decoder_t *this_gen) {
static void image_discontinuity (video_decoder_t *this_gen) {
/* image_decoder_t *this = (image_decoder_t *) this_gen; */
-
+
/*
* a time reference discontinuity has happened.
* that is, it must forget any currently held pts value
@@ -231,7 +231,7 @@ static void image_dispose (video_decoder_t *this_gen) {
}
-static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
+static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
xine_stream_t *stream) {
image_class_t *cls = (image_class_t *) class_gen;
@@ -277,7 +277,7 @@ static void *init_class (xine_t *xine, void *data) {
*/
lprintf("class opened\n");
-
+
return this;
}
@@ -293,7 +293,7 @@ static const decoder_info_t dec_info_image = {
};
const plugin_info_t xine_plugin_info[] EXPORTED = {
- /* type, API, "name", version, special_info, init_function */
+ /* type, API, "name", version, special_info, init_function */
{ PLUGIN_VIDEO_DECODER, 19, "gdkpixbuf", XINE_VERSION_CODE, &dec_info_image, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/video_dec/image.c b/src/video_dec/image.c
index 14ca6fefe..a4b6e43bd 100644
--- a/src/video_dec/image.c
+++ b/src/video_dec/image.c
@@ -1,18 +1,18 @@
/*
* Copyright (C) 2003-2005 the xine project
- *
+ *
* This file is part of xine, a free video player.
- *
+ *
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* xine is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -71,7 +71,7 @@ typedef struct image_decoder_s {
xine_stream_t *stream;
int video_open;
-
+
unsigned char *image;
int index;
@@ -89,7 +89,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
xine_buffer_copyin(this->image, this->index, buf->mem, buf->size);
this->index += buf->size;
-
+
if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
int width, height, i;
int status;
@@ -143,8 +143,8 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
* alloc and draw video frame
*/
img = this->stream->video_out->get_frame (this->stream->video_out, width,
- height, (double)width/(double)height,
- XINE_IMGFMT_YUY2,
+ height, (double)width/(double)height,
+ XINE_IMGFMT_YUY2,
VO_BOTH_FIELDS);
img->pts = buf->pts;
img->duration = 3600;
@@ -152,9 +152,9 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
yuv444_to_yuy2(&yuv_planes, img->base[0], img->pitches[0]);
free_yuv_planes(&yuv_planes);
-
+
_x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, img->duration);
-
+
img->draw(img, this->stream);
img->free(img);
}
@@ -163,7 +163,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
static void image_flush (video_decoder_t *this_gen) {
/* image_decoder_t *this = (image_decoder_t *) this_gen; */
-
+
/*
* flush out any frames that are still stored in the decoder
*/
@@ -172,19 +172,19 @@ static void image_flush (video_decoder_t *this_gen) {
static void image_reset (video_decoder_t *this_gen) {
image_decoder_t *this = (image_decoder_t *) this_gen;
-
+
/*
* reset decoder after engine flush (prepare for new
* video data not related to recently decoded data)
*/
-
+
this->index = 0;
}
static void image_discontinuity (video_decoder_t *this_gen) {
/* image_decoder_t *this = (image_decoder_t *) this_gen; */
-
+
/*
* a time reference discontinuity has happened.
* that is, it must forget any currently held pts value
@@ -208,7 +208,7 @@ static void image_dispose (video_decoder_t *this_gen) {
}
-static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
+static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
xine_stream_t *stream) {
image_class_t *cls = (image_class_t *) class_gen;
@@ -254,7 +254,7 @@ static void *init_class (xine_t *xine, void *data) {
*/
lprintf("class opened\n");
-
+
return this;
}
@@ -271,7 +271,7 @@ static const decoder_info_t dec_info_image = {
};
const plugin_info_t xine_plugin_info[] EXPORTED = {
- /* type, API, "name", version, special_info, init_function */
+ /* type, API, "name", version, special_info, init_function */
{ PLUGIN_VIDEO_DECODER, 19, "image", XINE_VERSION_CODE, &dec_info_image, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/video_dec/libmpeg2/xine_mpeg2_decoder.c b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
index d72e610ab..c4c7fac2d 100644
--- a/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
+++ b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright (C) 2000-2003 the xine project
- *
+ *
* This file is part of xine, a free video player.
- *
+ *
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* xine is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -73,11 +73,11 @@ static void mpeg2dec_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
}
return;
}
-
+
if (buf->decoder_flags & BUF_FLAG_PREVIEW) {
mpeg2_find_sequence_header (&this->mpeg2, buf->content, buf->content + buf->size);
} else {
-
+
mpeg2_decode_data (&this->mpeg2, buf->content, buf->content + buf->size,
buf->pts);
}
@@ -167,7 +167,7 @@ static const decoder_info_t dec_info_mpeg2 = {
};
const plugin_info_t xine_plugin_info[] EXPORTED = {
- /* type, API, "name", version, special_info, init_function */
+ /* type, API, "name", version, special_info, init_function */
{ PLUGIN_VIDEO_DECODER, 19, "mpeg2", XINE_VERSION_CODE, &dec_info_mpeg2, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c b/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c
index bcb0384fd..2678168e2 100644
--- a/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c
+++ b/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c
@@ -1,18 +1,18 @@
-/*
+/*
* Copyright (C) 2000-2004 the xine project
- *
+ *
* This file is part of xine, a free video player.
- *
+ *
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* xine is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -68,7 +68,7 @@ typedef struct mpeg2_video_decoder_s {
img_state_t img_state[30];
uint32_t frame_number;
uint32_t rff_pattern;
-
+
} mpeg2_video_decoder_t;
#ifndef LOG_FRAME_ALLOC_FREE
@@ -85,7 +85,7 @@ static void mpeg2_video_print_bad_state(img_state_t * img_state) {
}
if (m > 3) _x_abort();
if (m == 0) printf("NO FRAMES\n");
-}
+}
#endif
static void mpeg2_video_free_all(img_state_t * img_state) {
@@ -99,7 +99,7 @@ static void mpeg2_video_free_all(img_state_t * img_state) {
img_state[n].id = 0;
}
}
-}
+}
static void mpeg2_video_print_fbuf(const mpeg2_fbuf_t * fbuf) {
@@ -138,7 +138,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
else
this->force_pan_scan = 0;
}
-
+
return;
}
@@ -151,7 +151,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
mpeg2_buffer (this->mpeg2dec, current, end);
info = mpeg2_info (this->mpeg2dec);
-
+
while ((state = mpeg2_parse (this->mpeg2dec)) != STATE_BUFFER) {
switch (state) {
case STATE_SEQUENCE:
@@ -194,7 +194,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
} else {
picture_structure = VO_BOTH_FIELDS;
}
-
+
img = this->stream->video_out->get_frame (this->stream->video_out,
info->sequence->picture_width,
info->sequence->picture_height,
@@ -214,7 +214,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
img->duration += img->duration/4;
} else {
if( img->repeat_first_field ) {
- img->duration = (img->duration * info->current_picture->nb_fields) / 2;
+ img->duration = (img->duration * info->current_picture->nb_fields) / 2;
}
}
@@ -224,7 +224,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
img->pts=0;
}
-
+
#ifdef LOG_FRAME_ALLOC_FREE
printf ("libmpeg2:decode_data:get_frame xine=%p (id=%d)\n", img,img->id);
#endif
@@ -506,7 +506,7 @@ static const decoder_info_t dec_info_mpeg2 = {
};
const plugin_info_t xine_plugin_info[] EXPORTED = {
- /* type, API, "name", version, special_info, init_function */
+ /* type, API, "name", version, special_info, init_function */
{ PLUGIN_VIDEO_DECODER, 19, "mpeg2new", XINE_VERSION_CODE, &dec_info_mpeg2, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/video_dec/rgb.c b/src/video_dec/rgb.c
index f661bd63e..678ce8194 100644
--- a/src/video_dec/rgb.c
+++ b/src/video_dec/rgb.c
@@ -27,7 +27,7 @@
* file can be 32-, 24-, 16-, 8-, 4-, 2-, or 1-bit. Any resolutions <= 8
* can also be greyscale depending on what the QT file specifies.
*
- * One more catch: Raw RGB from a Microsoft file is upside down. This is
+ * One more catch: Raw RGB from a Microsoft file is upside down. This is
* indicated by a negative height parameter.
*/
@@ -80,7 +80,7 @@ typedef struct rgb_decoder_s {
unsigned char yuv_palette[256 * 4];
yuv_planes_t yuv_planes;
-
+
} rgb_decoder_t;
static void rgb_decode_data (video_decoder_t *this_gen,
@@ -121,7 +121,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
this->video_step = buf->decoder_info[0];
_x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->video_step);
}
-
+
if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */
(this->stream->video_out->open) (this->stream->video_out, this->stream);
@@ -194,11 +194,11 @@ static void rgb_decode_data (video_decoder_t *this_gen,
palette_index = this->buf[buf_ptr++];
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 0];
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 1];
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 2];
} else if (this->bytes_per_pixel == 2) {
@@ -208,11 +208,11 @@ static void rgb_decode_data (video_decoder_t *this_gen,
buf_ptr += 2;
UNPACK_BGR15(packed_pixel, r, g, b);
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
COMPUTE_Y(r, g, b);
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
COMPUTE_U(r, g, b);
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
COMPUTE_V(r, g, b);
} else {
@@ -225,11 +225,11 @@ static void rgb_decode_data (video_decoder_t *this_gen,
/* the next line takes care of 'A' in the 32-bit case */
buf_ptr += this->bytes_per_pixel - 3;
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
COMPUTE_Y(r, g, b);
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
COMPUTE_U(r, g, b);
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
COMPUTE_V(r, g, b);
}
@@ -249,18 +249,18 @@ static void rgb_decode_data (video_decoder_t *this_gen,
}
if (pixel_byte & 0x80) {
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
this->yuv_palette[1 * 4 + 0];
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
this->yuv_palette[1 * 4 + 1];
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
this->yuv_palette[1 * 4 + 2];
} else {
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
this->yuv_palette[0 * 4 + 0];
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
this->yuv_palette[0 * 4 + 1];
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
this->yuv_palette[0 * 4 + 2];
}
pixels_left--;
@@ -274,11 +274,11 @@ static void rgb_decode_data (video_decoder_t *this_gen,
}
palette_index = (pixel_byte & 0xC0) >> 6;
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 0];
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 1];
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 2];
pixels_left--;
@@ -292,11 +292,11 @@ static void rgb_decode_data (video_decoder_t *this_gen,
}
palette_index = (pixel_byte & 0xF0) >> 4;
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 0];
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 1];
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 2];
pixels_left--;
@@ -306,11 +306,11 @@ static void rgb_decode_data (video_decoder_t *this_gen,
palette_index = this->buf[buf_ptr++];
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 0];
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 1];
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
this->yuv_palette[palette_index * 4 + 2];
} else if (this->bytes_per_pixel == 2) {
@@ -320,16 +320,16 @@ static void rgb_decode_data (video_decoder_t *this_gen,
buf_ptr += 2;
UNPACK_RGB15(packed_pixel, r, g, b);
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
COMPUTE_Y(r, g, b);
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
COMPUTE_U(r, g, b);
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
COMPUTE_V(r, g, b);
} else {
- /* RGB24 or ARGB32; the next line takes care of 'A' in the
+ /* RGB24 or ARGB32; the next line takes care of 'A' in the
* 32-bit case */
buf_ptr += this->bytes_per_pixel - 3;
@@ -337,11 +337,11 @@ static void rgb_decode_data (video_decoder_t *this_gen,
g = this->buf[buf_ptr++];
b = this->buf[buf_ptr++];
- this->yuv_planes.y[row_ptr + pixel_ptr] =
+ this->yuv_planes.y[row_ptr + pixel_ptr] =
COMPUTE_Y(r, g, b);
- this->yuv_planes.u[row_ptr + pixel_ptr] =
+ this->yuv_planes.u[row_ptr + pixel_ptr] =
COMPUTE_U(r, g, b);
- this->yuv_planes.v[row_ptr + pixel_ptr] =
+ this->yuv_planes.v[row_ptr + pixel_ptr] =
COMPUTE_V(r, g, b);
}
@@ -434,7 +434,7 @@ static void *init_plugin (xine_t *xine, void *data) {
* exported plugin catalog entry
*/
-static const uint32_t video_types[] = {
+static const uint32_t video_types[] = {
BUF_VIDEO_RGB,
0
};
@@ -445,7 +445,7 @@ static const decoder_info_t dec_info_video = {
};
const plugin_info_t xine_plugin_info[] EXPORTED = {
- /* type, API, "name", version, special_info, init_function */
+ /* type, API, "name", version, special_info, init_function */
{ PLUGIN_VIDEO_DECODER, 19, "rgb", XINE_VERSION_CODE, &dec_info_video, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/video_dec/yuv.c b/src/video_dec/yuv.c
index bfad8b713..c1a8b1829 100644
--- a/src/video_dec/yuv.c
+++ b/src/video_dec/yuv.c
@@ -62,7 +62,7 @@ typedef struct yuv_decoder_s {
int width; /* the width of a video frame */
int height; /* the height of a video frame */
double ratio; /* the width to height ratio */
-
+
int progressive;
int top_field_first;
@@ -104,10 +104,10 @@ static void yuv_decode_data (video_decoder_t *this_gen,
this->ratio = (double)buf->decoder_info[1] / (double)buf->decoder_info[2];
else
this->ratio = (double)this->width / (double)this->height;
-
+
this->progressive = buf->decoder_info[3];
this->top_field_first = buf->decoder_info[4];
-
+
free (this->buf);
this->buf = NULL;
@@ -123,7 +123,7 @@ static void yuv_decode_data (video_decoder_t *this_gen,
case BUF_VIDEO_YUY2:
_x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YUY2");
break;
-
+
case BUF_VIDEO_YV12:
_x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
break;
@@ -135,13 +135,13 @@ static void yuv_decode_data (video_decoder_t *this_gen,
case BUF_VIDEO_GREY:
_x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
break;
-
+
case BUF_VIDEO_I420:
_x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
break;
}
-
+
_x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->width);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->height);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, this->ratio*10000);
@@ -164,14 +164,14 @@ static void yuv_decode_data (video_decoder_t *this_gen,
xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
this->size += buf->size;
-
+
src = this->buf;
}
if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
if (buf->type == BUF_VIDEO_YUY2) {
-
+
img = this->stream->video_out->get_frame (this->stream->video_out,
this->width, this->height,
this->ratio, XINE_IMGFMT_YUY2, VO_BOTH_FIELDS);
@@ -182,14 +182,14 @@ static void yuv_decode_data (video_decoder_t *this_gen,
/* dst */
img->base[0], img->pitches[0],
/* width x height */
- this->width, this->height);
-
+ this->width, this->height);
+
} else if (buf->type == BUF_VIDEO_YV12) {
img = this->stream->video_out->get_frame (this->stream->video_out,
this->width, this->height,
this->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
-
+
yv12_to_yv12(
/* Y */
src, this->width,
@@ -204,7 +204,7 @@ static void yuv_decode_data (video_decoder_t *this_gen,
this->width, this->height);
} else if (buf->type == BUF_VIDEO_I420) {
-
+
img = this->stream->video_out->get_frame (this->stream->video_out,
this->width, this->height,
this->ratio, XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
@@ -231,17 +231,17 @@ static void yuv_decode_data (video_decoder_t *this_gen,
yuv9_to_yv12(
/* Y */
- src,
+ src,
this->width,
- img->base[0],
+ img->base[0],
img->pitches[0],
/* U */
- src + (this->width * this->height),
+ src + (this->width * this->height),
this->width / 4,
img->base[1],
img->pitches[1],
/* V */
- src + (this->width * this->height) +
+ src + (this->width * this->height) +
(this->width * this->height / 16),
this->width / 4,
img->base[2],
@@ -356,8 +356,8 @@ static void *init_plugin (xine_t *xine, void *data) {
* exported plugin catalog entry
*/
-static const uint32_t video_types[] = {
- BUF_VIDEO_YUY2,
+static const uint32_t video_types[] = {
+ BUF_VIDEO_YUY2,
BUF_VIDEO_YV12,
BUF_VIDEO_YVU9,
BUF_VIDEO_GREY,
@@ -371,7 +371,7 @@ static const decoder_info_t dec_info_video = {
};
const plugin_info_t xine_plugin_info[] EXPORTED = {
- /* type, API, "name", version, special_info, init_function */
+ /* type, API, "name", version, special_info, init_function */
{ PLUGIN_VIDEO_DECODER, 19, "yuv", XINE_VERSION_CODE, &dec_info_video, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 06:40:10 +0000