virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

fftools/ffmpeg_filter: Avoid inserting hflip filter

Browse Source 
The transpose filter has modes equivalent to "rotation by 90°/270°"
followed by horizontal flips.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-12-18 23:19:05 +01:00
parent 4e21fff19d
commit 04133eb2d5
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fftools/ffmpeg_filter.c
View File

@ -761,12 +761,8 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
theta = get_rotation(displaymatrix); theta = get_rotation(displaymatrix);
if (fabs(theta - 90) < 1.0) { if (fabs(theta - 90) < 1.0) {
ret = insert_filter(&last_filter, &pad_idx, "transpose", "clock"); ret = insert_filter(&last_filter, &pad_idx, "transpose",
if (displaymatrix[3] > 0) { displaymatrix[3] > 0 ? "cclock_flip" : "clock");
ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL);
if (ret < 0)
return ret;
}
} else if (fabs(theta - 180) < 1.0) { } else if (fabs(theta - 180) < 1.0) {
if (displaymatrix[0] < 0) { if (displaymatrix[0] < 0) {
ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL);
@ -777,12 +773,8 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL);
} }
} else if (fabs(theta - 270) < 1.0) { } else if (fabs(theta - 270) < 1.0) {
ret = insert_filter(&last_filter, &pad_idx, "transpose", "cclock"); ret = insert_filter(&last_filter, &pad_idx, "transpose",
if (displaymatrix[3] < 0) { displaymatrix[3] < 0 ? "clock_flip" : "cclock");
ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL);
if (ret < 0)
return ret;
}
} else if (fabs(theta) > 1.0) { } else if (fabs(theta) > 1.0) {
char rotate_buf[64]; char rotate_buf[64];
snprintf(rotate_buf, sizeof(rotate_buf), "%f*PI/180", theta); snprintf(rotate_buf, sizeof(rotate_buf), "%f*PI/180", theta);