virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-29 21:47:48 +02:00
Code Issues Releases Activity

Merge commit '13ae97b210f35d77290f4edb0d6846269271729a'

Browse Source 
* commit '13ae97b210f35d77290f4edb0d6846269271729a':
  bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-14 02:04:04 +01:00
commit 866e11b33b
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/bfin/hpel_pixels_bfin.S
View File

@ -102,7 +102,7 @@ DEFUN_END(put_pixels16uc)
DEFUN(put_pixels8uc_nornd,mL1, DEFUN(put_pixels8uc_no_rnd,mL1,
(uint8_t *block, const uint8_t *s0, const uint8_t *s1, (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
int line_size, int h)): int line_size, int h)):
i3=r0; // dest i3=r0; // dest
@ -125,9 +125,9 @@ pp8$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
(r7:6) = [sp++]; (r7:6) = [sp++];
RTS; RTS;
DEFUN_END(put_pixels8uc_nornd) DEFUN_END(put_pixels8uc_no_rnd)
DEFUN(put_pixels16uc_nornd,mL1, DEFUN(put_pixels16uc_no_rnd,mL1,
(uint8_t *block, const uint8_t *s0, const uint8_t *s1, (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
int line_size, int h)): int line_size, int h)):
i3=r0; // dest i3=r0; // dest
@ -159,7 +159,7 @@ pp16$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
(r7:6) = [sp++]; (r7:6) = [sp++];
RTS; RTS;
DEFUN_END(put_pixels16uc_nornd) DEFUN_END(put_pixels16uc_no_rnd)
DEFUN(z_put_pixels16_xy2,mL1, DEFUN(z_put_pixels16_xy2,mL1,
(uint8_t *block, const uint8_t *s0, (uint8_t *block, const uint8_t *s0,

70
libavcodec/bfin/hpeldsp_bfin.c
View File

@ -29,12 +29,12 @@
#include "libavcodec/hpeldsp.h" #include "libavcodec/hpeldsp.h"
#include "hpeldsp_bfin.h" #include "hpeldsp_bfin.h"
void ff_bfin_put_pixels8uc_nornd(uint8_t *block, const uint8_t *s0, void ff_bfin_put_pixels8uc_no_rnd(uint8_t *block, const uint8_t *s0,
const uint8_t *s1, int line_size,
int h) attribute_l1_text;
void ff_bfin_put_pixels16uc_nornd(uint8_t *block, const uint8_t *s0,
const uint8_t *s1, int line_size, const uint8_t *s1, int line_size,
int h) attribute_l1_text; int h) attribute_l1_text;
void ff_bfin_put_pixels16uc_no_rnd(uint8_t *block, const uint8_t *s0,
const uint8_t *s1, int line_size,
int h) attribute_l1_text;
static void bfin_put_pixels8(uint8_t *block, const uint8_t *pixels, static void bfin_put_pixels8(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h) ptrdiff_t line_size, int h)
@ -86,44 +86,44 @@ static void bfin_put_pixels16_xy2(uint8_t *block, const uint8_t *s0,
ff_bfin_z_put_pixels16_xy2(block, s0, line_size, line_size, 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, static void bfin_put_pixels8_no_rnd(uint8_t *block, const uint8_t *pixels,
ptrdiff_t 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,
ptrdiff_t 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,
ptrdiff_t 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,
ptrdiff_t line_size, int h) ptrdiff_t line_size, int h)
{ {
ff_bfin_put_pixels16uc_nornd(block, pixels, pixels, line_size, h); ff_bfin_put_pixels8uc_no_rnd(block, pixels, pixels, line_size, h);
} }
static void bfin_put_pixels16_x2_nornd(uint8_t *block, const uint8_t *pixels, static void bfin_put_pixels8_x2_no_rnd(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h) ptrdiff_t line_size, int h)
{ {
ff_bfin_put_pixels16uc_nornd(block, pixels, pixels + 1, line_size, h); ff_bfin_put_pixels8uc_no_rnd(block, pixels, pixels + 1, line_size, h);
} }
static void bfin_put_pixels16_y2_nornd(uint8_t *block, const uint8_t *pixels, static void bfin_put_pixels8_y2_no_rnd(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h) ptrdiff_t line_size, int h)
{ {
ff_bfin_put_pixels16uc_nornd(block, pixels, pixels + line_size, ff_bfin_put_pixels8uc_no_rnd(block, pixels, pixels + line_size,
line_size, h); line_size, h);
} }
static void bfin_put_pixels16_no_rnd(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
{
ff_bfin_put_pixels16uc_no_rnd(block, pixels, pixels, line_size, h);
}
static void bfin_put_pixels16_x2_no_rnd(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
{
ff_bfin_put_pixels16uc_no_rnd(block, pixels, pixels + 1, line_size, h);
}
static void bfin_put_pixels16_y2_no_rnd(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
{
ff_bfin_put_pixels16uc_no_rnd(block, pixels, pixels + line_size,
line_size, h);
}
av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags) av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags)
{ {
c->put_pixels_tab[0][0] = bfin_put_pixels16; c->put_pixels_tab[0][0] = bfin_put_pixels16;
@ -136,11 +136,11 @@ av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags)
c->put_pixels_tab[1][2] = bfin_put_pixels8_y2; c->put_pixels_tab[1][2] = bfin_put_pixels8_y2;
c->put_pixels_tab[1][3] = bfin_put_pixels8_xy2; 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][0] = bfin_put_pixels8_no_rnd;
c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_nornd; c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_no_rnd;
c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_nornd; c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_no_rnd;
c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_nornd; c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_no_rnd;
c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_nornd; c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_no_rnd;
c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_nornd; c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_no_rnd;
} }