projects / packages / vlc.git / blame
| Commit | Line | Data |
|---|---|---|
| 9953ba90 AM |
1 | diff -ur -x '*~' vlc-0.8.2/modules/video_chroma/i420_rgb16.c vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c |
| 2 | --- vlc-0.8.2/modules/video_chroma/i420_rgb16.c 2005-06-25 15:43:10.000000000 +0200 | |
| 3 | +++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c 2005-07-10 23:59:57.656177984 +0200 | |
| 4 | @@ -31,7 +31,7 @@ | |
| 5 | #include <vlc/vout.h> | |
| 6 | ||
| 7 | #include "i420_rgb.h" | |
| 8 | -#if defined (MODULE_NAME_IS_i420_rgb) | |
| 9 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__) | |
| 10 | # include "i420_rgb_c.h" | |
| 11 | #elif defined (MODULE_NAME_IS_i420_rgb_mmx) | |
| 12 | # include "i420_rgb_mmx.h" | |
| 13 | @@ -216,7 +216,7 @@ | |
| 14 | int i_scale_count; /* scale modulo counter */ | |
| 15 | int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */ | |
| 16 | uint16_t * p_pic_start; /* beginning of the current line for copy */ | |
| 17 | -#if defined (MODULE_NAME_IS_i420_rgb) | |
| 18 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__) | |
| 19 | int i_uval, i_vval; /* U and V samples */ | |
| 20 | int i_red, i_green, i_blue; /* U and V modified samples */ | |
| 21 | uint16_t * p_yuv = p_vout->chroma.p_sys->p_rgb16; | |
| 22 | @@ -264,7 +264,7 @@ | |
| 23 | p_pic_start = p_pic; | |
| 24 | p_buffer = b_hscale ? p_buffer_start : p_pic; | |
| 25 | ||
| 26 | -#if defined (MODULE_NAME_IS_i420_rgb) | |
| 27 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__) | |
| 28 | for ( i_x = p_vout->render.i_width / 8; i_x--; ) | |
| 29 | { | |
| 30 | CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2); | |
| 31 | @@ -323,7 +323,7 @@ | |
| 32 | p_u -= i_rewind >> 1; | |
| 33 | p_v -= i_rewind >> 1; | |
| 34 | p_buffer -= i_rewind; | |
| 35 | -#if defined (MODULE_NAME_IS_i420_rgb) | |
| 36 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__) | |
| 37 | CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2); | |
| 38 | CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2); | |
| 39 | CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2); | |
| 40 | @@ -397,7 +397,7 @@ | |
| 41 | int i_scale_count; /* scale modulo counter */ | |
| 42 | int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */ | |
| 43 | uint32_t * p_pic_start; /* beginning of the current line for copy */ | |
| 44 | -#if defined (MODULE_NAME_IS_i420_rgb) | |
| 45 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__) | |
| 46 | int i_uval, i_vval; /* U and V samples */ | |
| 47 | int i_red, i_green, i_blue; /* U and V modified samples */ | |
| 48 | uint32_t * p_yuv = p_vout->chroma.p_sys->p_rgb32; | |
| 49 | @@ -447,7 +447,7 @@ | |
| 50 | ||
| 51 | for ( i_x = p_vout->render.i_width / 8; i_x--; ) | |
| 52 | { | |
| 53 | -#if defined (MODULE_NAME_IS_i420_rgb) | |
| 54 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__) | |
| 55 | CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4); | |
| 56 | CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4); | |
| 57 | CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4); | |
| 58 | @@ -477,7 +477,7 @@ | |
| 59 | p_u -= i_rewind >> 1; | |
| 60 | p_v -= i_rewind >> 1; | |
| 61 | p_buffer -= i_rewind; | |
| 62 | -#if defined (MODULE_NAME_IS_i420_rgb) | |
| 63 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__) | |
| 64 | CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4); | |
| 65 | CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4); | |
| 66 | CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4); | |
| 67 | diff -ur -x '*~' vlc-0.8.2/modules/video_chroma/i420_rgb.h vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h | |
| 68 | --- vlc-0.8.2/modules/video_chroma/i420_rgb.h 2005-06-25 15:43:10.000000000 +0200 | |
| 69 | +++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h 2005-07-10 23:57:30.248587344 +0200 | |
| 70 | @@ -35,7 +35,7 @@ | |
| 71 | uint8_t *p_buffer; | |
| 72 | int *p_offset; | |
| 73 | ||
| 74 | -#ifdef MODULE_NAME_IS_i420_rgb | |
| 75 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__) | |
| 76 | /**< Pre-calculated conversion tables */ | |
| 77 | void *p_base; /**< base for all conversion tables */ | |
| 78 | uint8_t *p_rgb8; /**< RGB 8 bits table */ | |
| 79 | @@ -55,7 +55,7 @@ | |
| 80 | /***************************************************************************** | |
| 81 | * Prototypes | |
| 82 | *****************************************************************************/ | |
| 83 | -#ifdef MODULE_NAME_IS_i420_rgb | |
| 84 | +#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__) | |
| 85 | void E_(I420_RGB8) ( vout_thread_t *, picture_t *, picture_t * ); | |
| 86 | void E_(I420_RGB16_dither) ( vout_thread_t *, picture_t *, picture_t * ); | |
| 87 | #endif |