virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avfilter/vf_framerate: unify luma and chroma blending

Browse Source 
The expressions were mathematically equvivalent...

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2018-01-08 21:01:09 +01:00
parent 293f24b42c
commit 5bf774a4a4
1 changed files with 15 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libavfilter/vf_framerate.c
View File

@@ -196,32 +196,16 @@ static int filter_slice8(AVFilterContext *ctx, void *arg, int job, int nb_jobs)
cpy_src2_data += start * cpy_src2_line_size; cpy_src2_data += start * cpy_src2_line_size;
cpy_dst_data += start * cpy_dst_line_size; cpy_dst_data += start * cpy_dst_line_size;
if (plane <1 || plane >2) { for (line = start; line < end; line++) {
// luma or alpha for (pixel = 0; pixel < cpy_line_width; pixel++) {
for (line = start; line < end; line++) { // integer version of (src1 * src1_factor) + (src2 + src2_factor) + 0.5
for (pixel = 0; pixel < cpy_line_width; pixel++) { // 0.5 is for rounding
// integer version of (src1 * src1_factor) + (src2 + src2_factor) + 0.5 // 128 is the integer representation of 0.5 << 8
// 0.5 is for rounding cpy_dst_data[pixel] = ((cpy_src1_data[pixel] * src1_factor) + (cpy_src2_data[pixel] * src2_factor) + 128) >> 8;
// 128 is the integer representation of 0.5 << 8
cpy_dst_data[pixel] = ((cpy_src1_data[pixel] * src1_factor) + (cpy_src2_data[pixel] * src2_factor) + 128) >> 8;
}
cpy_src1_data += cpy_src1_line_size;
cpy_src2_data += cpy_src2_line_size;
cpy_dst_data += cpy_dst_line_size;
}
} else {
// chroma
for (line = start; line < end; line++) {
for (pixel = 0; pixel < cpy_line_width; pixel++) {
// as above
// because U and V are based around 128 we have to subtract 128 from the components.
// 32896 is the integer representation of 128.5 << 8
cpy_dst_data[pixel] = (((cpy_src1_data[pixel] - 128) * src1_factor) + ((cpy_src2_data[pixel] - 128) * src2_factor) + 32896) >> 8;
}
cpy_src1_data += cpy_src1_line_size;
cpy_src2_data += cpy_src2_line_size;
cpy_dst_data += cpy_dst_line_size;
} }
cpy_src1_data += cpy_src1_line_size;
cpy_src2_data += cpy_src2_line_size;
cpy_dst_data += cpy_dst_line_size;
} }
} }
@@ -235,7 +219,6 @@ static int filter_slice16(AVFilterContext *ctx, void *arg, int job, int nb_jobs)
uint16_t src1_factor = td->src1_factor; uint16_t src1_factor = td->src1_factor;
uint16_t src2_factor = td->src2_factor; uint16_t src2_factor = td->src2_factor;
const int half = s->max / 2; const int half = s->max / 2;
const int uv = (s->max + 1) * half;
const int shift = s->bitdepth; const int shift = s->bitdepth;
int plane, line, pixel; int plane, line, pixel;
@@ -254,25 +237,12 @@ static int filter_slice16(AVFilterContext *ctx, void *arg, int job, int nb_jobs)
cpy_src2_data += start * cpy_src2_line_size; cpy_src2_data += start * cpy_src2_line_size;
cpy_dst_data += start * cpy_dst_line_size; cpy_dst_data += start * cpy_dst_line_size;
if (plane <1 || plane >2) { for (line = start; line < end; line++) {
// luma or alpha for (pixel = 0; pixel < cpy_line_width; pixel++)
for (line = start; line < end; line++) { cpy_dst_data[pixel] = ((cpy_src1_data[pixel] * src1_factor) + (cpy_src2_data[pixel] * src2_factor) + half) >> shift;
for (pixel = 0; pixel < cpy_line_width; pixel++) cpy_src1_data += cpy_src1_line_size;
cpy_dst_data[pixel] = ((cpy_src1_data[pixel] * src1_factor) + (cpy_src2_data[pixel] * src2_factor) + half) >> shift; cpy_src2_data += cpy_src2_line_size;
cpy_src1_data += cpy_src1_line_size; cpy_dst_data += cpy_dst_line_size;
cpy_src2_data += cpy_src2_line_size;
cpy_dst_data += cpy_dst_line_size;
}
} else {
// chroma
for (line = start; line < end; line++) {
for (pixel = 0; pixel < cpy_line_width; pixel++) {
cpy_dst_data[pixel] = (((cpy_src1_data[pixel] - half) * src1_factor) + ((cpy_src2_data[pixel] - half) * src2_factor) + uv) >> shift;
}
cpy_src1_data += cpy_src1_line_size;
cpy_src2_data += cpy_src2_line_size;
cpy_dst_data += cpy_dst_line_size;
}
} }
} }