Move decode_significance_x86() and decode_significance_8x8_x86() to
i386-specific file from cabac.h. New file is h264-oriented and only included from h264.c Resolves compilation when configured with --disable-optimizations due to decode_significance_8x8_x86 using last_coeff_flag_offset_8x8, which is only defined in h264.c Originally committed as revision 12838 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jeff Downs
parent
4b3cca3630
commit
e6cfd8fffb
@ -685,116 +685,6 @@ static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
|
|
||||||
//FIXME use some macros to avoid duplicatin get_cabac (cannot be done yet as that would make optimization work hard)
|
|
||||||
#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
|
|
||||||
static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
|
|
||||||
void *end= significant_coeff_ctx_base + max_coeff - 1;
|
|
||||||
int minusstart= -(int)significant_coeff_ctx_base;
|
|
||||||
int minusindex= 4-(int)index;
|
|
||||||
int coeff_count;
|
|
||||||
asm volatile(
|
|
||||||
"movl "RANGE "(%3), %%esi \n\t"
|
|
||||||
"movl "LOW "(%3), %%ebx \n\t"
|
|
||||||
|
|
||||||
"2: \n\t"
|
|
||||||
|
|
||||||
BRANCHLESS_GET_CABAC("%%edx", "%3", "(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
|
||||||
|
|
||||||
"test $1, %%edx \n\t"
|
|
||||||
" jz 3f \n\t"
|
|
||||||
|
|
||||||
BRANCHLESS_GET_CABAC("%%edx", "%3", "61(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
|
||||||
|
|
||||||
"mov %2, %%"REG_a" \n\t"
|
|
||||||
"movl %4, %%ecx \n\t"
|
|
||||||
"add %1, %%"REG_c" \n\t"
|
|
||||||
"movl %%ecx, (%%"REG_a") \n\t"
|
|
||||||
|
|
||||||
"test $1, %%edx \n\t"
|
|
||||||
" jnz 4f \n\t"
|
|
||||||
|
|
||||||
"add $4, %%"REG_a" \n\t"
|
|
||||||
"mov %%"REG_a", %2 \n\t"
|
|
||||||
|
|
||||||
"3: \n\t"
|
|
||||||
"add $1, %1 \n\t"
|
|
||||||
"cmp %5, %1 \n\t"
|
|
||||||
" jb 2b \n\t"
|
|
||||||
"mov %2, %%"REG_a" \n\t"
|
|
||||||
"movl %4, %%ecx \n\t"
|
|
||||||
"add %1, %%"REG_c" \n\t"
|
|
||||||
"movl %%ecx, (%%"REG_a") \n\t"
|
|
||||||
"4: \n\t"
|
|
||||||
"add %6, %%eax \n\t"
|
|
||||||
"shr $2, %%eax \n\t"
|
|
||||||
|
|
||||||
"movl %%esi, "RANGE "(%3) \n\t"
|
|
||||||
"movl %%ebx, "LOW "(%3) \n\t"
|
|
||||||
:"=&a"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index)
|
|
||||||
:"r"(c), "m"(minusstart), "m"(end), "m"(minusindex)
|
|
||||||
: "%"REG_c, "%ebx", "%edx", "%esi", "memory"
|
|
||||||
);
|
|
||||||
return coeff_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coeff_ctx_base, int *index, const uint8_t *sig_off){
|
|
||||||
int minusindex= 4-(int)index;
|
|
||||||
int coeff_count;
|
|
||||||
long last=0;
|
|
||||||
asm volatile(
|
|
||||||
"movl "RANGE "(%3), %%esi \n\t"
|
|
||||||
"movl "LOW "(%3), %%ebx \n\t"
|
|
||||||
|
|
||||||
"mov %1, %%"REG_D" \n\t"
|
|
||||||
"2: \n\t"
|
|
||||||
|
|
||||||
"mov %6, %%"REG_a" \n\t"
|
|
||||||
"movzbl (%%"REG_a", %%"REG_D"), %%edi \n\t"
|
|
||||||
"add %5, %%"REG_D" \n\t"
|
|
||||||
|
|
||||||
BRANCHLESS_GET_CABAC("%%edx", "%3", "(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
|
||||||
|
|
||||||
"mov %1, %%edi \n\t"
|
|
||||||
"test $1, %%edx \n\t"
|
|
||||||
" jz 3f \n\t"
|
|
||||||
|
|
||||||
"movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%%edi), %%edi\n\t"
|
|
||||||
"add %5, %%"REG_D" \n\t"
|
|
||||||
|
|
||||||
BRANCHLESS_GET_CABAC("%%edx", "%3", "15(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
|
||||||
|
|
||||||
"mov %2, %%"REG_a" \n\t"
|
|
||||||
"mov %1, %%edi \n\t"
|
|
||||||
"movl %%edi, (%%"REG_a") \n\t"
|
|
||||||
|
|
||||||
"test $1, %%edx \n\t"
|
|
||||||
" jnz 4f \n\t"
|
|
||||||
|
|
||||||
"add $4, %%"REG_a" \n\t"
|
|
||||||
"mov %%"REG_a", %2 \n\t"
|
|
||||||
|
|
||||||
"3: \n\t"
|
|
||||||
"addl $1, %%edi \n\t"
|
|
||||||
"mov %%edi, %1 \n\t"
|
|
||||||
"cmpl $63, %%edi \n\t"
|
|
||||||
" jb 2b \n\t"
|
|
||||||
"mov %2, %%"REG_a" \n\t"
|
|
||||||
"movl %%edi, (%%"REG_a") \n\t"
|
|
||||||
"4: \n\t"
|
|
||||||
"addl %4, %%eax \n\t"
|
|
||||||
"shr $2, %%eax \n\t"
|
|
||||||
|
|
||||||
"movl %%esi, "RANGE "(%3) \n\t"
|
|
||||||
"movl %%ebx, "LOW "(%3) \n\t"
|
|
||||||
:"=&a"(coeff_count),"+m"(last), "+m"(index)
|
|
||||||
:"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off)
|
|
||||||
: "%"REG_c, "%ebx", "%edx", "%esi", "%"REG_D, "memory"
|
|
||||||
);
|
|
||||||
return coeff_count;
|
|
||||||
}
|
|
||||||
#endif /* defined(ARCH_X86) && && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return the number of bytes read or 0 if no end
|
* @return the number of bytes read or 0 if no end
|
||||||
|
|||||||
@ -35,6 +35,9 @@
|
|||||||
#include "rectangle.h"
|
#include "rectangle.h"
|
||||||
|
|
||||||
#include "cabac.h"
|
#include "cabac.h"
|
||||||
|
#ifdef ARCH_X86
|
||||||
|
#include "i386/h264_i386.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
//#undef NDEBUG
|
//#undef NDEBUG
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|||||||
144
libavcodec/i386/h264_i386.h
Normal file
144
libavcodec/i386/h264_i386.h
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
/*
|
||||||
|
* 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 h264_i386.h
|
||||||
|
* H.264 / AVC / MPEG4 part10 codec.
|
||||||
|
* non-MMX i386-specific optimizations for H.264
|
||||||
|
* @author Michael Niedermayer <michaelni@gmx.at>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef FFMPEG_H264_I386_H
|
||||||
|
#define FFMPEG_H264_I386_H
|
||||||
|
|
||||||
|
|
||||||
|
#include "cabac.h"
|
||||||
|
|
||||||
|
//FIXME use some macros to avoid duplicatin get_cabac (cannot be done yet as that would make optimization work hard)
|
||||||
|
#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
|
||||||
|
static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
|
||||||
|
void *end= significant_coeff_ctx_base + max_coeff - 1;
|
||||||
|
int minusstart= -(int)significant_coeff_ctx_base;
|
||||||
|
int minusindex= 4-(int)index;
|
||||||
|
int coeff_count;
|
||||||
|
asm volatile(
|
||||||
|
"movl "RANGE "(%3), %%esi \n\t"
|
||||||
|
"movl "LOW "(%3), %%ebx \n\t"
|
||||||
|
|
||||||
|
"2: \n\t"
|
||||||
|
|
||||||
|
BRANCHLESS_GET_CABAC("%%edx", "%3", "(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
||||||
|
|
||||||
|
"test $1, %%edx \n\t"
|
||||||
|
" jz 3f \n\t"
|
||||||
|
|
||||||
|
BRANCHLESS_GET_CABAC("%%edx", "%3", "61(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
||||||
|
|
||||||
|
"mov %2, %%"REG_a" \n\t"
|
||||||
|
"movl %4, %%ecx \n\t"
|
||||||
|
"add %1, %%"REG_c" \n\t"
|
||||||
|
"movl %%ecx, (%%"REG_a") \n\t"
|
||||||
|
|
||||||
|
"test $1, %%edx \n\t"
|
||||||
|
" jnz 4f \n\t"
|
||||||
|
|
||||||
|
"add $4, %%"REG_a" \n\t"
|
||||||
|
"mov %%"REG_a", %2 \n\t"
|
||||||
|
|
||||||
|
"3: \n\t"
|
||||||
|
"add $1, %1 \n\t"
|
||||||
|
"cmp %5, %1 \n\t"
|
||||||
|
" jb 2b \n\t"
|
||||||
|
"mov %2, %%"REG_a" \n\t"
|
||||||
|
"movl %4, %%ecx \n\t"
|
||||||
|
"add %1, %%"REG_c" \n\t"
|
||||||
|
"movl %%ecx, (%%"REG_a") \n\t"
|
||||||
|
"4: \n\t"
|
||||||
|
"add %6, %%eax \n\t"
|
||||||
|
"shr $2, %%eax \n\t"
|
||||||
|
|
||||||
|
"movl %%esi, "RANGE "(%3) \n\t"
|
||||||
|
"movl %%ebx, "LOW "(%3) \n\t"
|
||||||
|
:"=&a"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index)
|
||||||
|
:"r"(c), "m"(minusstart), "m"(end), "m"(minusindex)
|
||||||
|
: "%"REG_c, "%ebx", "%edx", "%esi", "memory"
|
||||||
|
);
|
||||||
|
return coeff_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coeff_ctx_base, int *index, const uint8_t *sig_off){
|
||||||
|
int minusindex= 4-(int)index;
|
||||||
|
int coeff_count;
|
||||||
|
long last=0;
|
||||||
|
asm volatile(
|
||||||
|
"movl "RANGE "(%3), %%esi \n\t"
|
||||||
|
"movl "LOW "(%3), %%ebx \n\t"
|
||||||
|
|
||||||
|
"mov %1, %%"REG_D" \n\t"
|
||||||
|
"2: \n\t"
|
||||||
|
|
||||||
|
"mov %6, %%"REG_a" \n\t"
|
||||||
|
"movzbl (%%"REG_a", %%"REG_D"), %%edi \n\t"
|
||||||
|
"add %5, %%"REG_D" \n\t"
|
||||||
|
|
||||||
|
BRANCHLESS_GET_CABAC("%%edx", "%3", "(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
||||||
|
|
||||||
|
"mov %1, %%edi \n\t"
|
||||||
|
"test $1, %%edx \n\t"
|
||||||
|
" jz 3f \n\t"
|
||||||
|
|
||||||
|
"movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%%edi), %%edi\n\t"
|
||||||
|
"add %5, %%"REG_D" \n\t"
|
||||||
|
|
||||||
|
BRANCHLESS_GET_CABAC("%%edx", "%3", "15(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al")
|
||||||
|
|
||||||
|
"mov %2, %%"REG_a" \n\t"
|
||||||
|
"mov %1, %%edi \n\t"
|
||||||
|
"movl %%edi, (%%"REG_a") \n\t"
|
||||||
|
|
||||||
|
"test $1, %%edx \n\t"
|
||||||
|
" jnz 4f \n\t"
|
||||||
|
|
||||||
|
"add $4, %%"REG_a" \n\t"
|
||||||
|
"mov %%"REG_a", %2 \n\t"
|
||||||
|
|
||||||
|
"3: \n\t"
|
||||||
|
"addl $1, %%edi \n\t"
|
||||||
|
"mov %%edi, %1 \n\t"
|
||||||
|
"cmpl $63, %%edi \n\t"
|
||||||
|
" jb 2b \n\t"
|
||||||
|
"mov %2, %%"REG_a" \n\t"
|
||||||
|
"movl %%edi, (%%"REG_a") \n\t"
|
||||||
|
"4: \n\t"
|
||||||
|
"addl %4, %%eax \n\t"
|
||||||
|
"shr $2, %%eax \n\t"
|
||||||
|
|
||||||
|
"movl %%esi, "RANGE "(%3) \n\t"
|
||||||
|
"movl %%ebx, "LOW "(%3) \n\t"
|
||||||
|
:"=&a"(coeff_count),"+m"(last), "+m"(index)
|
||||||
|
:"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off)
|
||||||
|
: "%"REG_c, "%ebx", "%edx", "%esi", "%"REG_D, "memory"
|
||||||
|
);
|
||||||
|
return coeff_count;
|
||||||
|
}
|
||||||
|
#endif /* defined(ARCH_X86) && && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
|
||||||
|
|
||||||
|
#endif /* FFMPEG_H264_I386_H */
|
||||||
Loading…
Reference in New Issue
Block a user