d40ff29cac
* qatar/master:
asf: only set index_read if the index contained entries.
cabac: add overread protection to BRANCHLESS_GET_CABAC().
cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
h264: add overread protection to get_cabac_bypass_sign_x86().
h264: reindent get_cabac_bypass_sign_x86().
h264: use struct offsets in get_cabac_bypass_sign_x86().
h264: fix overreads in cabac reader.
wmall: fix seeking.
lagarith: fix buffer overreads.
dvdec: drop unnecessary dv_tablegen.h #include
build: fix doc generation errors in parallel builds
Replace memset(0) by zero initializations.
faandct: Remove FAAN_POSTSCALE define and related code.
dvenc: print allowed profiles if the video doesn't conform to any of them.
avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
FATE: add a test for vp8 with changing frame size.
fate: add kgv1 fate test.
oggdec: calculate correct timestamps in Ogg/FLAC
Conflicts:
libavcodec/4xm.c
libavcodec/cook.c
libavcodec/dvdata.c
libavcodec/dvdsubdec.c
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/utils.c
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
158 lines
6.2 KiB
C
158 lines
6.2 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 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;
|
|
__asm__ volatile(
|
|
"3: \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", "%w3",
|
|
"%5", "%k0", "%b0",
|
|
"%a11(%6)", "%a12(%6)")
|
|
|
|
"test $1, %4 \n\t"
|
|
" jz 4f \n\t"
|
|
"add %10, %1 \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "(%1)", "%3", "%w3",
|
|
"%5", "%k0", "%b0",
|
|
"%a11(%6)", "%a12(%6)")
|
|
|
|
"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 5f \n\t"
|
|
|
|
"add"OPSIZE" $4, %2 \n\t"
|
|
|
|
"4: \n\t"
|
|
"add $1, %1 \n\t"
|
|
"cmp %8, %1 \n\t"
|
|
" jb 3b \n\t"
|
|
"mov %2, %0 \n\t"
|
|
"movl %7, %%ecx \n\t"
|
|
"add %1, %%"REG_c" \n\t"
|
|
"movl %%ecx, (%0) \n\t"
|
|
"5: \n\t"
|
|
"add %9, %k0 \n\t"
|
|
"shr $2, %k0 \n\t"
|
|
: "=&q"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index),
|
|
"+&r"(c->low), "=&r"(bit), "+&r"(c->range)
|
|
: "r"(c), "m"(minusstart), "m"(end), "m"(minusindex), "m"(last_off),
|
|
"i"(offsetof(CABACContext, bytestream)),
|
|
"i"(offsetof(CABACContext, bytestream_end))
|
|
: "%"REG_c, "memory"
|
|
);
|
|
return coeff_count;
|
|
}
|
|
|
|
static int decode_significance_8x8_x86(CABACContext *c,
|
|
uint8_t *significant_coeff_ctx_base,
|
|
int *index, uint8_t *last_coeff_ctx_base, const uint8_t *sig_off){
|
|
int minusindex= 4-(intptr_t)index;
|
|
int bit;
|
|
x86_reg coeff_count;
|
|
x86_reg last=0;
|
|
x86_reg state;
|
|
__asm__ volatile(
|
|
"mov %1, %6 \n\t"
|
|
"3: \n\t"
|
|
|
|
"mov %10, %0 \n\t"
|
|
"movzbl (%0, %6), %k6 \n\t"
|
|
"add %9, %6 \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", "%w3",
|
|
"%5", "%k0", "%b0",
|
|
"%a12(%7)", "%a13(%7)")
|
|
|
|
"mov %1, %k6 \n\t"
|
|
"test $1, %4 \n\t"
|
|
" jz 4f \n\t"
|
|
|
|
"movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%k6), %k6\n\t"
|
|
"add %11, %6 \n\t"
|
|
|
|
BRANCHLESS_GET_CABAC("%4", "(%6)", "%3", "%w3",
|
|
"%5", "%k0", "%b0",
|
|
"%a12(%7)", "%a13(%7)")
|
|
|
|
"mov %2, %0 \n\t"
|
|
"mov %1, %k6 \n\t"
|
|
"movl %k6, (%0) \n\t"
|
|
|
|
"test $1, %4 \n\t"
|
|
" jnz 5f \n\t"
|
|
|
|
"add"OPSIZE" $4, %2 \n\t"
|
|
|
|
"4: \n\t"
|
|
"addl $1, %k6 \n\t"
|
|
"mov %k6, %1 \n\t"
|
|
"cmpl $63, %k6 \n\t"
|
|
" jb 3b \n\t"
|
|
"mov %2, %0 \n\t"
|
|
"movl %k6, (%0) \n\t"
|
|
"5: \n\t"
|
|
"addl %8, %k0 \n\t"
|
|
"shr $2, %k0 \n\t"
|
|
: "=&q"(coeff_count), "+m"(last), "+m"(index), "+&r"(c->low),
|
|
"=&r"(bit), "+&r"(c->range), "=&r"(state)
|
|
: "r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base),
|
|
"m"(sig_off), "m"(last_coeff_ctx_base),
|
|
"i"(offsetof(CABACContext, bytestream)),
|
|
"i"(offsetof(CABACContext, bytestream_end))
|
|
: "%"REG_c, "memory"
|
|
);
|
|
return coeff_count;
|
|
}
|
|
#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
|
|
|
|
#endif /* AVCODEC_X86_H264_I386_H */
|