diff options
| -rw-r--r-- | libswscale/rgb2rgb_template.c | 4 | ||||
| -rw-r--r-- | libswscale/swscale.c | 12 | ||||
| -rw-r--r-- | libswscale/swscale.h | 4 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 2 | ||||
| -rw-r--r-- | libswscale/yuv2rgb_init.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 05f49b525c..7b29c2d4b4 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -350,7 +350,7 @@ static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, long src_ end = s + src_size; #ifdef HAVE_MMX mm_end = end - 15; -#if 1 //is faster only if multiplies are reasonable fast (FIXME figure out on which cpus this is faster, on Athlon its slightly faster) +#if 1 //is faster only if multiplies are reasonable fast (FIXME figure out on which CPUs this is faster, on Athlon it is slightly faster) asm volatile( "movq %3, %%mm5 \n\t" "movq %4, %%mm6 \n\t" @@ -509,7 +509,7 @@ static inline void RENAME(rgb32to15)(const uint8_t *src, uint8_t *dst, long src_ end = s + src_size; #ifdef HAVE_MMX mm_end = end - 15; -#if 1 //is faster only if multiplies are reasonable fast (FIXME figure out on which cpus this is faster, on Athlon its slightly faster) +#if 1 //is faster only if multiplies are reasonable fast (FIXME figure out on which CPUs this is faster, on Athlon it is slightly faster) asm volatile( "movq %3, %%mm5 \n\t" "movq %4, %%mm6 \n\t" diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 00e9575e78..b53d2e52e4 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -46,7 +46,7 @@ tested special converters (most are tested actually but i didnt write it down .. YVU9 -> YV12 untested special converters - YV12/I420 -> BGR15/BGR24/BGR32 (its the yuv2rgb stuff, so it should be ok) + YV12/I420 -> BGR15/BGR24/BGR32 (it is the yuv2rgb stuff, so it should be ok) YV12/I420 -> YV12/I420 YUY2/BGR15/BGR24/BGR32/RGB24/RGB32 -> same format BGR24 -> BGR32 & RGB24 -> RGB32 @@ -985,7 +985,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF double *filter2=NULL; #if defined(ARCH_X86) if (flags & SWS_CPU_CAPS_MMX) - asm volatile("emms\n\t"::: "memory"); //FIXME this shouldnt be required but it IS (even for non mmx versions) + asm volatile("emms\n\t"::: "memory"); //FIXME this should not be required but it IS (even for non-MMX versions) #endif // Note the +1 is for the MMXscaler which reads over the end @@ -1198,7 +1198,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF av_free(filter); filter=NULL; /* try to reduce the filter-size (step1 find size and shift left) */ - // Assume its near normalized (*0.5 or *2.0 is ok but * 0.001 is not) + // Assume it is near normalized (*0.5 or *2.0 is OK but * 0.001 is not). minFilterSize= 0; for (i=dstW-1; i>=0; i--) { @@ -1214,7 +1214,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF if (cutOff > SWS_MAX_REDUCE_CUTOFF) break; - /* preserve Monotonicity because the core can't handle the filter otherwise */ + /* preserve monotonicity because the core can't handle the filter otherwise */ if (i<dstW-1 && (*filterPos)[i] >= (*filterPos)[i+1]) break; // Move filter coeffs left @@ -1914,7 +1914,7 @@ static uint16_t roundToInt16(int64_t f){ /** * @param inv_table the yuv2rgb coeffs, normally Inverse_Table_6_9[x] - * @param fullRange if 1 then the luma range is 0..255 if 0 its 16..235 + * @param fullRange if 1 then the luma range is 0..255 if 0 it is 16..235 * @return -1 if not supported */ int sws_setColorspaceDetails(SwsContext *c, const int inv_table[4], int srcRange, const int table[4], int dstRange, int brightness, int contrast, int saturation){ @@ -2246,7 +2246,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH // match pixel 0 of the src to pixel 0 of dst and match pixel n-2 of src to pixel n-2 of dst // but only for the FAST_BILINEAR mode otherwise do correct scaling // n-2 is the last chrominance sample available - // this is not perfect, but noone shuld notice the difference, the more correct variant + // this is not perfect, but no one should notice the difference, the more correct variant // would be like the vertical one, but that would require some special code for the // first and last pixel if (flags&SWS_FAST_BILINEAR) diff --git a/libswscale/swscale.h b/libswscale/swscale.h index aa4c25483c..b9d2b8f19b 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -58,8 +58,8 @@ #define SWS_PRINT_INFO 0x1000 -//the following 3 flags are not completly implemented -//internal chrominace subsamling info +//the following 3 flags are not completely implemented +//internal chrominace subsampling info #define SWS_FULL_CHR_H_INT 0x2000 //input subsampling info #define SWS_FULL_CHR_H_INP 0x4000 diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 85062ca2dc..73447431e0 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -123,7 +123,7 @@ typedef struct SwsContext{ #define V_OFFSET "10*8" #define LUM_MMX_FILTER_OFFSET "11*8" #define CHR_MMX_FILTER_OFFSET "11*8+4*4*256" -#define DSTW_OFFSET "11*8+4*4*256*2" //do not change, its hardcoded in the asm +#define DSTW_OFFSET "11*8+4*4*256*2" //do not change, it is hardcoded in the asm #define ESP_OFFSET "11*8+4*4*256*2+8" #define VROUNDER_OFFSET "11*8+4*4*256*2+16" #define U_TEMP "11*8+4*4*256*2+24" diff --git a/libswscale/yuv2rgb_init.c b/libswscale/yuv2rgb_init.c index 49872234db..1923f4e9b2 100644 --- a/libswscale/yuv2rgb_init.c +++ b/libswscale/yuv2rgb_init.c @@ -267,7 +267,7 @@ int yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange, cbu= (cbu*224) / 255; cgu= (cgu*224) / 255; cgv= (cgv*224) / 255; - //FIXME maybe its cleaner if the tables where based on full range (*244/255) + //FIXME maybe it is cleaner if the tables where based on full range (*244/255) } else { cy = ((1 << 16) * 255) / 219; oy= 16 << 16; |