RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/gdv: Combine first and 3rd case in rescale() 

Simplifies code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-08-05 16:55:38 +02:00
parent a423970511
commit 6228ce0a33
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/gdv.c
View File

@ -80,11 +80,11 @@ static void rescale(GDVContext *gdv, uint8_t *dst, int w, int h, int scale_v, in
return; return;
} }
if (gdv->scale_h && gdv->scale_v) { if (gdv->scale_v) {
for (j = 0; j < h; j++) { for (j = 0; j < h; j++) {
int y = h - j - 1; int y = h - j - 1;
uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w; uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w;
uint8_t *src1 = dst + PREAMBLE_SIZE + (y>>1) * (w>>1); uint8_t *src1 = dst + PREAMBLE_SIZE + (y>>!!gdv->scale_h) * (w>>1);
for (i = 0; i < w; i++) { for (i = 0; i < w; i++) {
int x = w - i - 1; int x = w - i - 1;
dst1[x] = src1[(x>>1)]; dst1[x] = src1[(x>>1)];
@ -97,16 +97,6 @@ static void rescale(GDVContext *gdv, uint8_t *dst, int w, int h, int scale_v, in
uint8_t *src1 = dst + PREAMBLE_SIZE + (y>>1) * w; uint8_t *src1 = dst + PREAMBLE_SIZE + (y>>1) * w;
memcpy(dst1, src1, w); memcpy(dst1, src1, w);
} }
} else if (gdv->scale_v) {
for (j = 0; j < h; j++) {
int y = h - j - 1;
uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w;
uint8_t *src1 = dst + PREAMBLE_SIZE + y * (w>>1);
for (i = 0; i < w; i++) {
int x = w - i - 1;
dst1[x] = src1[(x>>1)];
}
}
} }
if (scale_h && scale_v) { if (scale_h && scale_v) {