mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-23 01:35:07 +02:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* qatar/master: dnxhddec: optimise dnxhd_decode_dct_block() rtp: remove disabled code eac3enc: use different numbers of blocks per frame to allow higher bitrates dnxhd: add regression test for 10-bit dnxhd: 10-bit support dsputil: update per-arch init funcs for non-h264 high bit depth dsputil: template get_pixels() for different bit depths dsputil: create 16/32-bit dctcoef versions of some functions jfdctint: add 10-bit version mov: add clcp type track as Subtitle stream. mpeg4: add Mpeg4 Profiles names. mpeg4: decode Level Profile for MPEG4 Part 2. ffprobe: display bitstream level. imgconvert: remove unused glue and xglue macros Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
276 lines
9.2 KiB
C
276 lines
9.2 KiB
C
/*
|
|
* BlackFin DSPUTILS
|
|
*
|
|
* Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
|
|
* Copyright (c) 2006 Michael Benjamin <michael.benjamin@analog.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
|
|
*/
|
|
|
|
#include "libavcodec/avcodec.h"
|
|
#include "libavcodec/dsputil.h"
|
|
#include "dsputil_bfin.h"
|
|
|
|
int off;
|
|
|
|
static void bfin_idct_add (uint8_t *dest, int line_size, DCTELEM *block)
|
|
{
|
|
ff_bfin_idct (block);
|
|
ff_bfin_add_pixels_clamped (block, dest, line_size);
|
|
}
|
|
|
|
static void bfin_idct_put (uint8_t *dest, int line_size, DCTELEM *block)
|
|
{
|
|
ff_bfin_idct (block);
|
|
ff_bfin_put_pixels_clamped (block, dest, line_size);
|
|
}
|
|
|
|
|
|
static void bfin_clear_blocks (DCTELEM *blocks)
|
|
{
|
|
// This is just a simple memset.
|
|
//
|
|
__asm__("P0=192; "
|
|
"I0=%0; "
|
|
"R0=0; "
|
|
"LSETUP(clear_blocks_blkfn_lab,clear_blocks_blkfn_lab)LC0=P0;"
|
|
"clear_blocks_blkfn_lab:"
|
|
"[I0++]=R0;"
|
|
::"a" (blocks):"P0","I0","R0");
|
|
}
|
|
|
|
|
|
|
|
static void bfin_put_pixels8 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc (block, pixels, pixels, line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels8_x2(uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc (block, pixels, pixels+1, line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels8_y2 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc (block, pixels, pixels+line_size, line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int line_size, int h)
|
|
{
|
|
ff_bfin_z_put_pixels8_xy2 (block,s0,line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels16 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc (block, pixels, pixels, line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels16_x2 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc (block, pixels, pixels+1, line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels16_y2 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc (block, pixels, pixels+line_size, line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int line_size, int h)
|
|
{
|
|
ff_bfin_z_put_pixels16_xy2 (block,s0,line_size, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc_nornd (block, pixels, pixels, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels8_x2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+1, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels8_y2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+line_size, line_size, h);
|
|
}
|
|
|
|
|
|
static void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc_nornd (block, pixels, pixels, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels16_x2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+1, line_size, h);
|
|
}
|
|
|
|
static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h);
|
|
}
|
|
|
|
static int bfin_pix_abs16 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
return ff_bfin_z_sad16x16 (blk1,blk2,line_size,line_size,h);
|
|
}
|
|
|
|
static int bfin_vsad_intra16 (void *c, uint8_t *blk1, uint8_t *dummy, int stride, int h) {
|
|
return ff_bfin_z_sad16x16 (blk1,blk1+stride,stride<<1,stride<<1,h);
|
|
}
|
|
|
|
static int bfin_vsad (void *c, uint8_t *blk1, uint8_t *blk2, int stride, int h) {
|
|
return ff_bfin_z_sad16x16 (blk1,blk1+stride,stride<<1,stride<<1,h)
|
|
+ ff_bfin_z_sad16x16 (blk2,blk2+stride,stride<<1,stride<<1,h);
|
|
}
|
|
|
|
static uint8_t vtmp_blk[256] attribute_l1_data_b;
|
|
|
|
static int bfin_pix_abs16_x2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc (vtmp_blk, blk2, blk2+1, 16, line_size, h);
|
|
return ff_bfin_z_sad16x16 (blk1, vtmp_blk, line_size, 16, h);
|
|
}
|
|
|
|
static int bfin_pix_abs16_y2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels16uc (vtmp_blk, blk2, blk2+line_size, 16, line_size, h);
|
|
return ff_bfin_z_sad16x16 (blk1, vtmp_blk, line_size, 16, h);
|
|
}
|
|
|
|
static int bfin_pix_abs16_xy2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
ff_bfin_z_put_pixels16_xy2 (vtmp_blk, blk2, 16, line_size, h);
|
|
return ff_bfin_z_sad16x16 (blk1, vtmp_blk, line_size, 16, h);
|
|
}
|
|
|
|
static int bfin_pix_abs8 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
return ff_bfin_z_sad8x8 (blk1,blk2,line_size,line_size, h);
|
|
}
|
|
|
|
static int bfin_pix_abs8_x2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc (vtmp_blk, blk2, blk2+1, 8, line_size, h);
|
|
return ff_bfin_z_sad8x8 (blk1, vtmp_blk, line_size, 8, h);
|
|
}
|
|
|
|
static int bfin_pix_abs8_y2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
ff_bfin_put_pixels8uc (vtmp_blk, blk2, blk2+line_size, 8, line_size, h);
|
|
return ff_bfin_z_sad8x8 (blk1, vtmp_blk, line_size, 8, h);
|
|
}
|
|
|
|
static int bfin_pix_abs8_xy2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
|
|
{
|
|
ff_bfin_z_put_pixels8_xy2 (vtmp_blk, blk2, 8, line_size, h);
|
|
return ff_bfin_z_sad8x8 (blk1, vtmp_blk, line_size, 8, h);
|
|
}
|
|
|
|
|
|
/*
|
|
decoder optimization
|
|
start on 2/11 100 frames of 352x240@25 compiled with no optimization -g debugging
|
|
9.824s ~ 2.44x off
|
|
6.360s ~ 1.58x off with -O2
|
|
5.740s ~ 1.43x off with idcts
|
|
|
|
2.64s 2/20 same sman.mp4 decode only
|
|
|
|
*/
|
|
|
|
void dsputil_init_bfin( DSPContext* c, AVCodecContext *avctx )
|
|
{
|
|
const int high_bit_depth = avctx->bits_per_raw_sample > 8;
|
|
|
|
c->diff_pixels = ff_bfin_diff_pixels;
|
|
c->put_pixels_clamped = ff_bfin_put_pixels_clamped;
|
|
c->add_pixels_clamped = ff_bfin_add_pixels_clamped;
|
|
|
|
if (!high_bit_depth)
|
|
c->get_pixels = ff_bfin_get_pixels;
|
|
c->clear_blocks = bfin_clear_blocks;
|
|
c->pix_sum = ff_bfin_pix_sum;
|
|
c->pix_norm1 = ff_bfin_pix_norm1;
|
|
|
|
c->sad[0] = bfin_pix_abs16;
|
|
c->sad[1] = bfin_pix_abs8;
|
|
|
|
/* c->vsad[0] = bfin_vsad; */
|
|
/* c->vsad[4] = bfin_vsad_intra16; */
|
|
|
|
/* TODO [0] 16 [1] 8 */
|
|
c->pix_abs[0][0] = bfin_pix_abs16;
|
|
c->pix_abs[0][1] = bfin_pix_abs16_x2;
|
|
c->pix_abs[0][2] = bfin_pix_abs16_y2;
|
|
c->pix_abs[0][3] = bfin_pix_abs16_xy2;
|
|
|
|
c->pix_abs[1][0] = bfin_pix_abs8;
|
|
c->pix_abs[1][1] = bfin_pix_abs8_x2;
|
|
c->pix_abs[1][2] = bfin_pix_abs8_y2;
|
|
c->pix_abs[1][3] = bfin_pix_abs8_xy2;
|
|
|
|
|
|
c->sse[0] = ff_bfin_sse16;
|
|
c->sse[1] = ff_bfin_sse8;
|
|
c->sse[2] = ff_bfin_sse4;
|
|
|
|
if (!high_bit_depth) {
|
|
c->put_pixels_tab[0][0] = bfin_put_pixels16;
|
|
c->put_pixels_tab[0][1] = bfin_put_pixels16_x2;
|
|
c->put_pixels_tab[0][2] = bfin_put_pixels16_y2;
|
|
c->put_pixels_tab[0][3] = bfin_put_pixels16_xy2;
|
|
|
|
c->put_pixels_tab[1][0] = bfin_put_pixels8;
|
|
c->put_pixels_tab[1][1] = bfin_put_pixels8_x2;
|
|
c->put_pixels_tab[1][2] = bfin_put_pixels8_y2;
|
|
c->put_pixels_tab[1][3] = bfin_put_pixels8_xy2;
|
|
|
|
c->put_no_rnd_pixels_tab[1][0] = bfin_put_pixels8_nornd;
|
|
c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_nornd;
|
|
c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_nornd;
|
|
/* c->put_no_rnd_pixels_tab[1][3] = ff_bfin_put_pixels8_xy2_nornd; */
|
|
|
|
c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_nornd;
|
|
c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_nornd;
|
|
c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_nornd;
|
|
/* c->put_no_rnd_pixels_tab[0][3] = ff_bfin_put_pixels16_xy2_nornd; */
|
|
}
|
|
|
|
if (avctx->bits_per_raw_sample <= 8) {
|
|
if (avctx->dct_algo == FF_DCT_AUTO)
|
|
c->fdct = ff_bfin_fdct;
|
|
|
|
if (avctx->idct_algo == FF_IDCT_VP3) {
|
|
c->idct_permutation_type = FF_NO_IDCT_PERM;
|
|
c->idct = ff_bfin_vp3_idct;
|
|
c->idct_add = ff_bfin_vp3_idct_add;
|
|
c->idct_put = ff_bfin_vp3_idct_put;
|
|
} else if (avctx->idct_algo == FF_IDCT_AUTO) {
|
|
c->idct_permutation_type = FF_NO_IDCT_PERM;
|
|
c->idct = ff_bfin_idct;
|
|
c->idct_add = bfin_idct_add;
|
|
c->idct_put = bfin_idct_put;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|