diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
commit | 48a691630833d6b12905475b6bf39fef285872a9 (patch) | |
tree | aaeb0c4d73c6c0c72606aae3c4a1de62b17dc6e7 /libavcodec/huffyuvencdsp.h | |
parent | e2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (diff) | |
parent | 512f3ffe9b4bb86767c2b1176554407c75fe1a5c (diff) |
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
dsputil: Split off HuffYUV encoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/pngenc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffyuvencdsp.h')
-rw-r--r-- | libavcodec/huffyuvencdsp.h | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/libavcodec/huffyuvencdsp.h b/libavcodec/huffyuvencdsp.h new file mode 100644 index 0000000000..3a49b4a7ef --- /dev/null +++ b/libavcodec/huffyuvencdsp.h @@ -0,0 +1,41 @@ +/* + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_HUFFYUVENCDSP_H +#define AVCODEC_HUFFYUVENCDSP_H + +#include <stdint.h> + +typedef struct HuffYUVEncDSPContext { + void (*diff_bytes)(uint8_t *dst /* align 16 */, + const uint8_t *src1 /* align 16 */, + const 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); +} HuffYUVEncDSPContext; + +void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c); +void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c); + +#endif /* AVCODEC_HUFFYUVENCDSP_H */ |