diff options
Diffstat (limited to 'libavcodec/me_cmp.h')
| -rw-r--r-- | libavcodec/me_cmp.h | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/libavcodec/me_cmp.h b/libavcodec/me_cmp.h index 725f9b25ee..a3603ec2c1 100644 --- a/libavcodec/me_cmp.h +++ b/libavcodec/me_cmp.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 */ @@ -25,6 +25,20 @@ extern uint32_t ff_square_tab[512]; + +/* minimum alignment rules ;) + * If you notice errors in the align stuff, need more alignment for some ASM code + * for some CPU or need to use a function with less aligned data then send a mail + * to the ffmpeg-devel mailing list, ... + * + * !warning These alignments might not match reality, (missing attribute((align)) + * stuff somewhere possible). + * I (Michael) did not check them, these are just the alignments which I think + * could be reached easily ... + * + * !future video codecs might need functions with less strict alignment + */ + struct MpegEncContext; /* Motion estimation: * h is limited to { width / 2, width, 2 * width }, @@ -49,6 +63,8 @@ typedef struct MECmpContext { me_cmp_func vsad[6]; me_cmp_func vsse[6]; me_cmp_func nsse[6]; + me_cmp_func w53[6]; + me_cmp_func w97[6]; me_cmp_func dct_max[6]; me_cmp_func dct264_sad[6]; @@ -64,11 +80,17 @@ typedef struct MECmpContext { void ff_me_cmp_init_static(void); +int ff_check_alignment(void); + void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx); +void ff_me_cmp_init_alpha(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_arm(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_ppc(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx); +void ff_me_cmp_init_mips(MECmpContext *c, AVCodecContext *avctx); void ff_set_cmp(MECmpContext *c, me_cmp_func *cmp, int type); +void ff_dsputil_init_dwt(MECmpContext *c); + #endif /* AVCODEC_ME_CMP_H */ |