diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 18:39:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 18:51:21 +0100 |
| commit | 70c25c62051f018cb2d2c2b51bd2d631a4c61650 (patch) | |
| tree | 7dec158babd7645a1a837ed81b93ad66b7f985c8 | |
| parent | 89d2f014bc57397cb65259329eb36772ed2351a1 (diff) | |
| download | ffmpeg-70c25c62051f018cb2d2c2b51bd2d631a4c61650.tar.gz | |
sws: move fillPlane16() to header so it can be used from more than 1 place
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/swscale_internal.h | 21 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 20 |
2 files changed, 21 insertions, 20 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index b3f20ccca0..7795f67a84 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -30,6 +30,7 @@ #include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/common.h" +#include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/pixfmt.h" #include "libavutil/pixdesc.h" @@ -769,4 +770,24 @@ void ff_sws_init_output_funcs(SwsContext *c, void ff_sws_init_swScale_altivec(SwsContext *c); void ff_sws_init_swScale_mmx(SwsContext *c); +static inline void fillPlane16(uint8_t *plane, int stride, int width, int height, int y, + int alpha, int bits, const int big_endian) +{ + int i, j; + uint8_t *ptr = plane + stride * y; + int v = alpha ? 0xFFFF>>(15-bits) : (1<<bits); + for (i = 0; i < height; i++) { +#define FILL(wfunc) \ + for (j = 0; j < width; j++) {\ + wfunc(ptr+2*j, v);\ + } + if (big_endian) { + FILL(AV_WB16); + } else { + FILL(AV_WL16); + } + ptr += stride; + } +} + #endif /* SWSCALE_SWSCALE_INTERNAL_H */ diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index ba0303c252..f35d1ba352 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -139,26 +139,6 @@ static void fillPlane(uint8_t *plane, int stride, int width, int height, int y, } } -static void fillPlane16(uint8_t *plane, int stride, int width, int height, int y, - int alpha, int bits, const int big_endian) -{ - int i, j; - uint8_t *ptr = plane + stride * y; - int v = alpha ? 0xFFFF>>(15-bits) : (1<<bits); - for (i = 0; i < height; i++) { -#define FILL(wfunc) \ - for (j = 0; j < width; j++) {\ - wfunc(ptr+2*j, v);\ - } - if (big_endian) { - FILL(AV_WB16); - } else { - FILL(AV_WL16); - } - ptr += stride; - } -} - static void copyPlane(const uint8_t *src, int srcStride, int srcSliceY, int srcSliceH, int width, uint8_t *dst, int dstStride) |