procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fix rotation reading in FFmpeg.

Browse source
This commit is contained in:
John Preston 2024-04-19 22:47:37 +04:00
parent 615f4b1d1c
commit 046803dbed
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
View file

@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
extern "C" {
#include <libavutil/opt.h>
#include <libavutil/display.h>
} // extern "C"
namespace FFmpeg {
@ -503,16 +504,17 @@ int DurationByPacket(const Packet &packet, AVRational timeBase) {
}
int ReadRotationFromMetadata(not_null<AVStream*> stream) {
const auto tag = av_dict_get(stream->metadata, "rotate", nullptr, 0);
if (tag && *tag->value) {
const auto string = QString::fromUtf8(tag->value);
auto ok = false;
const auto degrees = string.toInt(&ok);
if (ok && (degrees == 90 || degrees == 180 || degrees == 270)) {
return degrees;
}
const auto displaymatrix = av_stream_get_side_data(
stream,
AV_PKT_DATA_DISPLAYMATRIX,
nullptr);
auto theta = 0;
if (displaymatrix) {
theta = -round(av_display_rotation_get((int32_t*)displaymatrix));
}
return 0;
theta -= 360 * floor(theta / 360 + 0.9 / 360);
const auto result = int(base::SafeRound(theta));
return (result == 90 || result == 180 || result == 270) ? result : 0;
}
AVRational ValidateAspectRatio(AVRational aspect) {