diff options
Diffstat (limited to 'libavcodec/huffyuvencdsp.h')
| -rw-r--r-- | libavcodec/huffyuvencdsp.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/libavcodec/huffyuvencdsp.h b/libavcodec/huffyuvencdsp.h index 603c36f7af..603f9c8c2c 100644 --- a/libavcodec/huffyuvencdsp.h +++ b/libavcodec/huffyuvencdsp.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 */ @@ -21,21 +21,20 @@ #include <stdint.h> +#include "avcodec.h" + typedef struct HuffYUVEncDSPContext { - void (*diff_bytes)(uint8_t *dst /* align 16 */, - uint8_t *src1 /* align 16 */, - uint8_t *src2 /* align 1 */, - int w); - /** - * Subtract HuffYUV's variant of median prediction. - * Note, this might read from src1[-1], src2[-1]. - */ - void (*sub_hfyu_median_pred)(uint8_t *dst, const uint8_t *src1, - const uint8_t *src2, int w, - int *left, int *left_top); + void (*diff_int16)(uint16_t *dst /* align 16 */, + const uint16_t *src1 /* align 16 */, + const uint16_t *src2 /* align 1 */, + unsigned mask, int w); + + void (*sub_hfyu_median_pred_int16)(uint16_t *dst, const uint16_t *src1, + const uint16_t *src2, unsigned mask, + int w, int *left, int *left_top); } HuffYUVEncDSPContext; -void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c); -void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c); +void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, AVCodecContext *avctx); +void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, AVCodecContext *avctx); #endif /* AVCODEC_HUFFYUVENCDSP_H */ |