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

Fix sending videos larger than 720p.

Browse source
This commit is contained in:
John Preston 2020-03-29 12:28:41 +04:00
parent df290605f4
commit 735f7709b9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
View file

@ -18,6 +18,7 @@ namespace {
constexpr auto kSkipInvalidDataPackets = 10; constexpr auto kSkipInvalidDataPackets = 10;
constexpr auto kMaxInlineArea = 1280 * 720; constexpr auto kMaxInlineArea = 1280 * 720;
constexpr auto kMaxSendingArea = 3840 * 2160; // usual 4K
// See https://github.com/telegramdesktop/tdesktop/issues/7225 // See https://github.com/telegramdesktop/tdesktop/issues/7225
constexpr auto kAlignImageBy = 64; constexpr auto kAlignImageBy = 64;
@ -60,7 +61,10 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
do { do {
int res = avcodec_receive_frame(_codecContext, _frame.get()); int res = avcodec_receive_frame(_codecContext, _frame.get());
if (res >= 0) { if (res >= 0) {
if (_frame->width * _frame->height > kMaxInlineArea) { const auto limit = (_mode == Mode::Inspecting)
? kMaxSendingArea
: kMaxInlineArea;
if (_frame->width * _frame->height > limit) {
return ReadResult::Error; return ReadResult::Error;
} }
processReadFrame(); processReadFrame();