RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mp_image, f_decoder_wrapper: implement AV_FRAME_DATA_DISPLAYMATRIX 

fixes #9249 (JPEG orientation support) with ffmpeg commit [0].

[0] e93c998602
This commit is contained in:
Alex Xu (Hello71) 2021-10-02 13:19:10 -04:00 committed by sfan5
parent f9fd50c654
commit 3ec2012cec
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filters/f_decoder_wrapper.c
View File

@ -594,12 +594,14 @@ static void fix_image_params(struct priv *p,
if (m.p_w <= 0 || m.p_h <= 0)
m.p_w = m.p_h = 1;
m.rotate = p->codec->rotate;
m.stereo3d = p->codec->stereo_mode;
if (opts->video_rotate < 0) {
m.rotate = 0;
} else {
// ffmpeg commit 535a835e51 says that frame rotate takes priority
if (!m.rotate)
m.rotate = p->codec->rotate;
m.rotate = (m.rotate + opts->video_rotate) % 360;
}

8
video/mp_image.c
View File

@ -21,6 +21,7 @@
#include <libavutil/mem.h>
#include <libavutil/common.h>
#include <libavutil/display.h>
#include <libavutil/bswap.h>
#include <libavutil/hwcontext.h>
#include <libavutil/intreadwrite.h>
@ -973,6 +974,13 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *src)
dst->params.alpha = p->alpha;
}
sd = av_frame_get_side_data(src, AV_FRAME_DATA_DISPLAYMATRIX);
if (sd) {
double r = av_display_rotation_get((int32_t *)(sd->data));
if (!isnan(r))
dst->params.rotate = (((int)(-r) % 360) + 360) % 360;
}
sd = av_frame_get_side_data(src, AV_FRAME_DATA_ICC_PROFILE);
if (sd)
dst->icc_profile = sd->buf;