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