mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
b8a43bc1b5
* qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
95 lines
3.3 KiB
C
95 lines
3.3 KiB
C
/*
|
|
* Copyright (C) 2010 Mans Rullgard <mans@mansr.com>
|
|
*
|
|
* 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_ARM_VP56_ARITH_H
|
|
#define AVCODEC_ARM_VP56_ARITH_H
|
|
|
|
#if HAVE_ARMV6 && HAVE_INLINE_ASM
|
|
|
|
#define vp56_rac_get_prob vp56_rac_get_prob_armv6
|
|
static inline int vp56_rac_get_prob_armv6(VP56RangeCoder *c, int pr)
|
|
{
|
|
unsigned shift = ff_vp56_norm_shift[c->high];
|
|
unsigned code_word = c->code_word << shift;
|
|
unsigned high = c->high << shift;
|
|
unsigned bit;
|
|
|
|
__asm__ ("adds %3, %3, %0 \n"
|
|
"cmpcs %7, %4 \n"
|
|
"ldrcsh %2, [%4], #2 \n"
|
|
"rsb %0, %6, #256 \n"
|
|
"smlabb %0, %5, %6, %0 \n"
|
|
"rev16cs %2, %2 \n"
|
|
"orrcs %1, %1, %2, lsl %3 \n"
|
|
"subcs %3, %3, #16 \n"
|
|
"lsr %0, %0, #8 \n"
|
|
"cmp %1, %0, lsl #16 \n"
|
|
"subge %1, %1, %0, lsl #16 \n"
|
|
"subge %0, %5, %0 \n"
|
|
"movge %2, #1 \n"
|
|
"movlt %2, #0 \n"
|
|
: "=&r"(c->high), "=&r"(c->code_word), "=&r"(bit),
|
|
"+&r"(c->bits), "+&r"(c->buffer)
|
|
: "r"(high), "r"(pr), "r"(c->end - 1),
|
|
"0"(shift), "1"(code_word)
|
|
: "cc");
|
|
|
|
return bit;
|
|
}
|
|
|
|
#define vp56_rac_get_prob_branchy vp56_rac_get_prob_branchy_armv6
|
|
static inline int vp56_rac_get_prob_branchy_armv6(VP56RangeCoder *c, int pr)
|
|
{
|
|
unsigned shift = ff_vp56_norm_shift[c->high];
|
|
unsigned code_word = c->code_word << shift;
|
|
unsigned high = c->high << shift;
|
|
unsigned low;
|
|
unsigned tmp;
|
|
|
|
__asm__ ("adds %3, %3, %0 \n"
|
|
"cmpcs %7, %4 \n"
|
|
"ldrcsh %2, [%4], #2 \n"
|
|
"rsb %0, %6, #256 \n"
|
|
"smlabb %0, %5, %6, %0 \n"
|
|
"rev16cs %2, %2 \n"
|
|
"orrcs %1, %1, %2, lsl %3 \n"
|
|
"subcs %3, %3, #16 \n"
|
|
"lsr %0, %0, #8 \n"
|
|
"lsl %2, %0, #16 \n"
|
|
: "=&r"(low), "+&r"(code_word), "=&r"(tmp),
|
|
"+&r"(c->bits), "+&r"(c->buffer)
|
|
: "r"(high), "r"(pr), "r"(c->end - 1), "0"(shift)
|
|
: "cc");
|
|
|
|
if (code_word >= tmp) {
|
|
c->high = high - low;
|
|
c->code_word = code_word - tmp;
|
|
return 1;
|
|
}
|
|
|
|
c->high = low;
|
|
c->code_word = code_word;
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* AVCODEC_ARM_VP56_ARITH_H */
|