diff options
Diffstat (limited to 'libavcodec/huffyuvdsp.h')
| -rw-r--r-- | libavcodec/huffyuvdsp.h | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/libavcodec/huffyuvdsp.h b/libavcodec/huffyuvdsp.h index 5e84e3aecb..e5f5b05466 100644 --- a/libavcodec/huffyuvdsp.h +++ b/libavcodec/huffyuvdsp.h @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -20,22 +20,33 @@ #define AVCODEC_HUFFYUVDSP_H #include <stdint.h> +#include "libavutil/pixfmt.h" +#include "config.h" + +#if HAVE_BIGENDIAN +#define B 3 +#define G 2 +#define R 1 +#define A 0 +#else +#define B 0 +#define G 1 +#define R 2 +#define A 3 +#endif typedef struct HuffYUVDSPContext { - void (*add_bytes)(uint8_t *dst /* align 16 */, uint8_t *src /* align 16 */, - int w); - void (*add_hfyu_median_pred)(uint8_t *dst, const uint8_t *top, - const uint8_t *diff, int w, - int *left, int *left_top); - int (*add_hfyu_left_pred)(uint8_t *dst, const uint8_t *src, - int w, int left); + void (*add_int16)(uint16_t *dst/*align 16*/, const uint16_t *src/*align 16*/, + unsigned mask, int w); + + void (*add_hfyu_median_pred_int16)(uint16_t *dst, const uint16_t *top, + const uint16_t *diff, unsigned mask, + int w, int *left, int *left_top); void (*add_hfyu_left_pred_bgr32)(uint8_t *dst, const uint8_t *src, - int w, int *red, int *green, - int *blue, int *alpha); + intptr_t w, uint8_t *left); } HuffYUVDSPContext; -void ff_huffyuvdsp_init(HuffYUVDSPContext *c); -void ff_huffyuvdsp_init_ppc(HuffYUVDSPContext *c); -void ff_huffyuvdsp_init_x86(HuffYUVDSPContext *c); +void ff_huffyuvdsp_init(HuffYUVDSPContext *c, enum AVPixelFormat pix_fmt); +void ff_huffyuvdsp_init_x86(HuffYUVDSPContext *c, enum AVPixelFormat pix_fmt); #endif /* AVCODEC_HUFFYUVDSP_H */ |