6cbe81999b
* qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
172 lines
6.7 KiB
C
172 lines
6.7 KiB
C
/*
|
|
* H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
|
|
* Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* H.264 / AVC / MPEG4 part10 codec.
|
|
* non-MMX i386-specific optimizations for H.264
|
|
* @author Michael Niedermayer <michaelni@gmx.at>
|
|
*/
|
|
|
|
#ifndef AVCODEC_X86_H264_I386_H
|
|
#define AVCODEC_X86_H264_I386_H
|
|
|
|
#include <stddef.h>
|
|
|
|
#include "libavcodec/cabac.h"
|
|
#include "cabac.h"
|
|
|
|
//FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
|
|
//as that would make optimization work hard)
|
|
#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS)
|
|
static int decode_significance_x86(CABACContext *c, int max_coeff,
|
|
uint8_t *significant_coeff_ctx_base,
|
|
int *index, x86_reg last_off){
|
|
void *end= significant_coeff_ctx_base + max_coeff - 1;
|
|
int minusstart= -(intptr_t)significant_coeff_ctx_base;
|
|
int minusindex= 4-(intptr_t)index;
|
|
int bit;
|
|
x86_reg coeff_count;
|
|
int low;
|
|
int range;
|
|
__asm__ volatile(
|
|
"movl %a11(%6), %5 \n\t"
|
|
"movl %a12(%6), %3 \n\t"
|
|
|
|
"2: \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "%6", "(%1)", "%3",
|
|
"%w3", "%5", "%k0", "%b0", "%a13")
|
|
|
|
"test $1, %4 \n\t"
|
|
" jz 3f \n\t"
|
|
"add %10, %1 \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "%6", "(%1)", "%3",
|
|
"%w3", "%5", "%k0", "%b0", "%a13")
|
|
|
|
"sub %10, %1 \n\t"
|
|
"mov %2, %0 \n\t"
|
|
"movl %7, %%ecx \n\t"
|
|
"add %1, %%"REG_c" \n\t"
|
|
"movl %%ecx, (%0) \n\t"
|
|
|
|
"test $1, %4 \n\t"
|
|
" jnz 4f \n\t"
|
|
|
|
"add $4, %0 \n\t"
|
|
"mov %0, %2 \n\t"
|
|
|
|
"3: \n\t"
|
|
"add $1, %1 \n\t"
|
|
"cmp %8, %1 \n\t"
|
|
" jb 2b \n\t"
|
|
"mov %2, %0 \n\t"
|
|
"movl %7, %%ecx \n\t"
|
|
"add %1, %%"REG_c" \n\t"
|
|
"movl %%ecx, (%0) \n\t"
|
|
"4: \n\t"
|
|
"add %9, %k0 \n\t"
|
|
"shr $2, %k0 \n\t"
|
|
|
|
"movl %5, %a11(%6) \n\t"
|
|
"movl %3, %a12(%6) \n\t"
|
|
:"=&q"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index),
|
|
"=&r"(low), "=&r"(bit), "=&r"(range)
|
|
:"r"(c), "m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off),
|
|
"i"(offsetof(CABACContext, range)), "i"(offsetof(CABACContext, low)),
|
|
"i"(offsetof(CABACContext, bytestream))
|
|
: "%"REG_c, "memory"
|
|
);
|
|
return coeff_count;
|
|
}
|
|
|
|
static int decode_significance_8x8_x86(CABACContext *c,
|
|
uint8_t *significant_coeff_ctx_base,
|
|
int *index, x86_reg last_off, const uint8_t *sig_off){
|
|
int minusindex= 4-(intptr_t)index;
|
|
int bit;
|
|
x86_reg coeff_count;
|
|
int low;
|
|
int range;
|
|
x86_reg last=0;
|
|
x86_reg state;
|
|
__asm__ volatile(
|
|
"movl %a12(%7), %5 \n\t"
|
|
"movl %a13(%7), %3 \n\t"
|
|
|
|
"mov %1, %6 \n\t"
|
|
"2: \n\t"
|
|
|
|
"mov %10, %0 \n\t"
|
|
"movzbl (%0, %6), %k6 \n\t"
|
|
"add %9, %6 \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "%7", "(%6)", "%3",
|
|
"%w3", "%5", "%k0", "%b0", "%a14")
|
|
|
|
"mov %1, %k6 \n\t"
|
|
"test $1, %4 \n\t"
|
|
" jz 3f \n\t"
|
|
|
|
"movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%k6), %k6\n\t"
|
|
"add %9, %6 \n\t"
|
|
"add %11, %6 \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "%7", "(%6)", "%3",
|
|
"%w3", "%5", "%k0", "%b0", "%a14")
|
|
|
|
"mov %2, %0 \n\t"
|
|
"mov %1, %k6 \n\t"
|
|
"movl %k6, (%0) \n\t"
|
|
|
|
"test $1, %4 \n\t"
|
|
" jnz 4f \n\t"
|
|
|
|
"add $4, %0 \n\t"
|
|
"mov %0, %2 \n\t"
|
|
|
|
"3: \n\t"
|
|
"addl $1, %k6 \n\t"
|
|
"mov %k6, %1 \n\t"
|
|
"cmpl $63, %k6 \n\t"
|
|
" jb 2b \n\t"
|
|
"mov %2, %0 \n\t"
|
|
"movl %k6, (%0) \n\t"
|
|
"4: \n\t"
|
|
"addl %8, %k0 \n\t"
|
|
"shr $2, %k0 \n\t"
|
|
|
|
"movl %5, %a12(%7) \n\t"
|
|
"movl %3, %a13(%7) \n\t"
|
|
:"=&q"(coeff_count),"+m"(last), "+m"(index), "=&r"(low), "=&r"(bit),
|
|
"=&r"(range), "=&r"(state)
|
|
:"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off), "m"(last_off),
|
|
"i"(offsetof(CABACContext, range)), "i"(offsetof(CABACContext, low)),
|
|
"i"(offsetof(CABACContext, bytestream))
|
|
: "%"REG_c, "memory"
|
|
);
|
|
return coeff_count;
|
|
}
|
|
#endif /* ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
|
|
|
|
#endif /* AVCODEC_X86_H264_I386_H */
|