Commit 800df6a8 authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg_filter: use get_rotation()

This unifies the rotation extraction code between ffplay and ffmpeg
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4351c288
...@@ -700,24 +700,25 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ...@@ -700,24 +700,25 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
last_filter = ifilter->filter; last_filter = ifilter->filter;
if (ist->autorotate) { if (ist->autorotate) {
uint8_t* displaymatrix = av_stream_get_side_data(ist->st, double theta = get_rotation(ist->st);
AV_PKT_DATA_DISPLAYMATRIX, NULL);
if (displaymatrix) { if (fabs(theta - 90) < 1.0) {
double rot = av_display_rotation_get((int32_t*) displaymatrix); ret = insert_filter(&last_filter, &pad_idx, "transpose", "clock");
if (rot < -135 || rot > 135) { } else if (fabs(theta - 180) < 1.0) {
ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL);
} else if (rot < -45) { } else if (fabs(theta - 270) < 1.0) {
ret = insert_filter(&last_filter, &pad_idx, "transpose", "dir=clock"); ret = insert_filter(&last_filter, &pad_idx, "transpose", "cclock");
} else if (rot > 45) { } else if (fabs(theta) > 1.0) {
ret = insert_filter(&last_filter, &pad_idx, "transpose", "dir=cclock"); char rotate_buf[64];
snprintf(rotate_buf, sizeof(rotate_buf), "%f*PI/180", theta);
ret = insert_filter(&last_filter, &pad_idx, "rotate", rotate_buf);
} }
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
}
if (ist->framerate.num) { if (ist->framerate.num) {
AVFilterContext *setpts; AVFilterContext *setpts;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment