virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/xbr: make xbr[234]x a bit more consistent

Browse Source
This commit is contained in:
Clément Bœsch 2014-11-15 21:04:49 +01:00
parent a99004a926
commit d1529273fb
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/vf_xbr.c
View File

@ -181,8 +181,8 @@ static uint32_t pixel_diff(uint32_t x, uint32_t y, const uint32_t *r2y)
static void xbr2x(AVFrame * input, AVFrame * output, const uint32_t * r2y) static void xbr2x(AVFrame * input, AVFrame * output, const uint32_t * r2y)
{ {
int x,y; int x, y;
int next_line = output->linesize[0]>>2; const int nl = output->linesize[0] >> 2;
for (y = 0; y < input->height; y++) { for (y = 0; y < input->height; y++) {
INIT_SRC_DST_POINTERS(2) INIT_SRC_DST_POINTERS(2)
@ -190,12 +190,12 @@ static void xbr2x(AVFrame * input, AVFrame * output, const uint32_t * r2y)
for (x = 0; x < input->width; x++) { for (x = 0; x < input->width; x++) {
INIT_21_PIXELS INIT_21_PIXELS
E[0] = E[1] = E[next_line] = E[next_line + 1] = PE; // 0, 1, 2, 3 E[0] = E[1] = E[nl] = E[nl + 1] = PE; // 0, 1, 2, 3
FILT2(PE, PI, PH, PF, PG, PC, PD, PB, PA, G5, C4, G0, D0, C1, B1, F4, I4, H5, I5, A0, A1, 0, 1, next_line, next_line+1); FILT2(PE, PI, PH, PF, PG, PC, PD, PB, PA, G5, C4, G0, D0, C1, B1, F4, I4, H5, I5, A0, A1, 0, 1, nl, nl+1);
FILT2(PE, PC, PF, PB, PI, PA, PH, PD, PG, I4, A1, I5, H5, A0, D0, B1, C1, F4, C4, G5, G0, next_line, 0, next_line+1, 1); FILT2(PE, PC, PF, PB, PI, PA, PH, PD, PG, I4, A1, I5, H5, A0, D0, B1, C1, F4, C4, G5, G0, nl, 0, nl+1, 1);
FILT2(PE, PA, PB, PD, PC, PG, PF, PH, PI, C1, G0, C4, F4, G5, H5, D0, A0, B1, A1, I4, I5, next_line+1, next_line, 1, 0); FILT2(PE, PA, PB, PD, PC, PG, PF, PH, PI, C1, G0, C4, F4, G5, H5, D0, A0, B1, A1, I4, I5, nl+1, nl, 1, 0);
FILT2(PE, PG, PD, PH, PA, PI, PB, PF, PC, A0, I5, A1, B1, I4, F4, H5, G5, D0, G0, C1, C4, 1, next_line+1, 0, next_line); FILT2(PE, PG, PD, PH, PA, PI, PB, PF, PC, A0, I5, A1, B1, I4, F4, H5, G5, D0, G0, C1, C4, 1, nl+1, 0, nl);
sa0 += 1; sa0 += 1;
sa1 += 1; sa1 += 1;
@ -250,14 +250,14 @@ static void xbr2x(AVFrame * input, AVFrame * output, const uint32_t * r2y)
static void xbr3x(AVFrame *input, AVFrame *output, const uint32_t *r2y) static void xbr3x(AVFrame *input, AVFrame *output, const uint32_t *r2y)
{ {
const int nl = output->linesize[0]>>2; int x, y;
const int nl = output->linesize[0] >> 2;
const int nl1 = nl + nl; const int nl1 = nl + nl;
int x,y;
for (y = 0; y < input->height; y++) { for (y = 0; y < input->height; y++) {
INIT_SRC_DST_POINTERS(3) INIT_SRC_DST_POINTERS(3)
for (x = 0; x < input->width; x++){ for (x = 0; x < input->width; x++) {
INIT_21_PIXELS INIT_21_PIXELS
E[0] = E[1] = E[2] = PE; E[0] = E[1] = E[2] = PE;
@ -326,11 +326,10 @@ static void xbr3x(AVFrame *input, AVFrame *output, const uint32_t *r2y)
static void xbr4x(AVFrame *input, AVFrame *output, const uint32_t *r2y) static void xbr4x(AVFrame *input, AVFrame *output, const uint32_t *r2y)
{ {
int x, y;
const int nl = output->linesize[0]>>2; const int nl = output->linesize[0] >> 2;
const int nl1 = nl + nl; const int nl1 = nl + nl;
const int nl2 = nl1 + nl; const int nl2 = nl1 + nl;
int x, y;
for (y = 0; y < input->height; y++) { for (y = 0; y < input->height; y++) {
INIT_SRC_DST_POINTERS(4) INIT_SRC_DST_POINTERS(4)