mirror of https://github.com/FFmpeg/FFmpeg.git
* 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>pull/72/merge
Michael Niedermayer
11 years ago
commit
48a6916308
15 changed files with 284 additions and 171 deletions
@ -0,0 +1,84 @@ |
||||
/*
|
||||
* 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 |
||||
*/ |
||||
|
||||
#include "config.h" |
||||
#include "libavutil/attributes.h" |
||||
#include "huffyuvencdsp.h" |
||||
#include "mathops.h" |
||||
|
||||
// 0x7f7f7f7f or 0x7f7f7f7f7f7f7f7f or whatever, depending on the cpu's native arithmetic size
|
||||
#define pb_7f (~0UL / 255 * 0x7f) |
||||
#define pb_80 (~0UL / 255 * 0x80) |
||||
|
||||
static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w) |
||||
{ |
||||
long i; |
||||
|
||||
#if !HAVE_FAST_UNALIGNED |
||||
if ((long) src2 & (sizeof(long) - 1)) { |
||||
for (i = 0; i + 7 < w; i += 8) { |
||||
dst[i + 0] = src1[i + 0] - src2[i + 0]; |
||||
dst[i + 1] = src1[i + 1] - src2[i + 1]; |
||||
dst[i + 2] = src1[i + 2] - src2[i + 2]; |
||||
dst[i + 3] = src1[i + 3] - src2[i + 3]; |
||||
dst[i + 4] = src1[i + 4] - src2[i + 4]; |
||||
dst[i + 5] = src1[i + 5] - src2[i + 5]; |
||||
dst[i + 6] = src1[i + 6] - src2[i + 6]; |
||||
dst[i + 7] = src1[i + 7] - src2[i + 7]; |
||||
} |
||||
} else |
||||
#endif |
||||
for (i = 0; i <= w - (int) sizeof(long); i += sizeof(long)) { |
||||
long a = *(long *) (src1 + i); |
||||
long b = *(long *) (src2 + i); |
||||
*(long *) (dst + i) = ((a | pb_80) - (b & pb_7f)) ^ |
||||
((a ^ b ^ pb_80) & pb_80); |
||||
} |
||||
for (; i < w; i++) |
||||
dst[i + 0] = src1[i + 0] - src2[i + 0]; |
||||
} |
||||
|
||||
static void sub_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1, |
||||
const uint8_t *src2, int w, |
||||
int *left, int *left_top) |
||||
{ |
||||
int i; |
||||
uint8_t l, lt; |
||||
|
||||
l = *left; |
||||
lt = *left_top; |
||||
|
||||
for (i = 0; i < w; i++) { |
||||
const int pred = mid_pred(l, src1[i], (l + src1[i] - lt) & 0xFF); |
||||
lt = src1[i]; |
||||
l = src2[i]; |
||||
dst[i] = l - pred; |
||||
} |
||||
|
||||
*left = l; |
||||
*left_top = lt; |
||||
} |
||||
|
||||
av_cold void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c) |
||||
{ |
||||
c->diff_bytes = diff_bytes_c; |
||||
c->sub_hfyu_median_pred = sub_hfyu_median_pred_c; |
||||
|
||||
if (ARCH_X86) |
||||
ff_huffyuvencdsp_init_x86(c); |
||||
} |
||||
@ -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 */ |
||||
@ -0,0 +1,114 @@ |
||||
/*
|
||||
* SIMD-optimized HuffYUV encoding functions |
||||
* Copyright (c) 2000, 2001 Fabrice Bellard |
||||
* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
||||
* |
||||
* MMX optimization by Nick Kurshev <nickols_k@mail.ru> |
||||
* |
||||
* 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 |
||||
*/ |
||||
|
||||
#include "libavutil/attributes.h" |
||||
#include "libavutil/cpu.h" |
||||
#include "libavutil/x86/asm.h" |
||||
#include "libavutil/x86/cpu.h" |
||||
#include "libavcodec/huffyuvencdsp.h" |
||||
#include "libavcodec/mathops.h" |
||||
|
||||
#if HAVE_INLINE_ASM |
||||
|
||||
static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w) |
||||
{ |
||||
x86_reg i = 0; |
||||
|
||||
if (w >= 16) |
||||
__asm__ volatile ( |
||||
"1: \n\t" |
||||
"movq (%2, %0), %%mm0 \n\t" |
||||
"movq (%1, %0), %%mm1 \n\t" |
||||
"psubb %%mm0, %%mm1 \n\t" |
||||
"movq %%mm1, (%3, %0) \n\t" |
||||
"movq 8(%2, %0), %%mm0 \n\t" |
||||
"movq 8(%1, %0), %%mm1 \n\t" |
||||
"psubb %%mm0, %%mm1 \n\t" |
||||
"movq %%mm1, 8(%3, %0) \n\t" |
||||
"add $16, %0 \n\t" |
||||
"cmp %4, %0 \n\t" |
||||
" jb 1b \n\t" |
||||
: "+r" (i) |
||||
: "r" (src1), "r" (src2), "r" (dst), "r" ((x86_reg) w - 15)); |
||||
|
||||
for (; i < w; i++) |
||||
dst[i + 0] = src1[i + 0] - src2[i + 0]; |
||||
} |
||||
|
||||
static void sub_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *src1, |
||||
const uint8_t *src2, int w, |
||||
int *left, int *left_top) |
||||
{ |
||||
x86_reg i = 0; |
||||
uint8_t l, lt; |
||||
|
||||
__asm__ volatile ( |
||||
"movq (%1, %0), %%mm0 \n\t" // LT
|
||||
"psllq $8, %%mm0 \n\t" |
||||
"1: \n\t" |
||||
"movq (%1, %0), %%mm1 \n\t" // T
|
||||
"movq -1(%2, %0), %%mm2 \n\t" // L
|
||||
"movq (%2, %0), %%mm3 \n\t" // X
|
||||
"movq %%mm2, %%mm4 \n\t" // L
|
||||
"psubb %%mm0, %%mm2 \n\t" |
||||
"paddb %%mm1, %%mm2 \n\t" // L + T - LT
|
||||
"movq %%mm4, %%mm5 \n\t" // L
|
||||
"pmaxub %%mm1, %%mm4 \n\t" // max(T, L)
|
||||
"pminub %%mm5, %%mm1 \n\t" // min(T, L)
|
||||
"pminub %%mm2, %%mm4 \n\t" |
||||
"pmaxub %%mm1, %%mm4 \n\t" |
||||
"psubb %%mm4, %%mm3 \n\t" // dst - pred
|
||||
"movq %%mm3, (%3, %0) \n\t" |
||||
"add $8, %0 \n\t" |
||||
"movq -1(%1, %0), %%mm0 \n\t" // LT
|
||||
"cmp %4, %0 \n\t" |
||||
" jb 1b \n\t" |
||||
: "+r" (i) |
||||
: "r" (src1), "r" (src2), "r" (dst), "r" ((x86_reg) w)); |
||||
|
||||
l = *left; |
||||
lt = *left_top; |
||||
|
||||
dst[0] = src2[0] - mid_pred(l, src1[0], (l + src1[0] - lt) & 0xFF); |
||||
|
||||
*left_top = src1[w - 1]; |
||||
*left = src2[w - 1]; |
||||
} |
||||
|
||||
#endif /* HAVE_INLINE_ASM */ |
||||
|
||||
av_cold void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c) |
||||
{ |
||||
#if HAVE_INLINE_ASM |
||||
int cpu_flags = av_get_cpu_flags(); |
||||
|
||||
if (INLINE_MMX(cpu_flags)) { |
||||
c->diff_bytes = diff_bytes_mmx; |
||||
} |
||||
|
||||
if (INLINE_MMXEXT(cpu_flags)) { |
||||
c->sub_hfyu_median_pred = sub_hfyu_median_pred_mmxext; |
||||
} |
||||
#endif /* HAVE_INLINE_ASM */ |
||||
} |
||||
Loading…
Reference in new issue