Blender Git Loki

Git Commits -> Revision 370a2d6

Revision 370a2d6 by Sergey Sharybin (master)
March 9, 2018, 09:32 (GMT)
Fix T53857: Incorrect framerate for videos imported from OBS

This is an issue with which value to trust: fps vs. tbr. They both cam be
somewhat broken. Currently the idea is:

- If file was saved with FFmpeg AND we are decoding with FFmpeg we trust tbr.
- If we are decoding with Libav we use fps (there does not seem to be tbr in
Libav, unless i'm missing something).
- All other cases we use fps.

Seems to work all good for files from T53857, T54148 and T51153. Ideally we
would need to collect some amount of regression files to make further tweaks
more scientific.

Reviewers: mont29

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D3083

Commit Details:

Full Hash: 370a2d6917ebd8df5177fe4854a447e3839dddaa
Parent Commit: ecab7be
Lines Changed: +52, -5

4 Modified Paths:

/intern/ffmpeg/ffmpeg_compat.h (+48, -1) (Diff)
/source/blender/imbuf/intern/anim_movie.c (+2, -2) (Diff)
/source/blender/imbuf/intern/indexer.c (+1, -1) (Diff)
/source/gameengine/VideoTexture/VideoFFmpeg.cpp (+1, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021