fix: embed portrait 4K

Author: comdev1337

Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp

@@ -47,6 +47,8 @@ constexpr auto kImageFormat = QImage::Format_ARGB32_Premultiplied;
 constexpr auto kMaxScaleByAspectRatio = 16;
 constexpr auto kAvioBlockSize = 4096;
 constexpr auto kMaxFrameStorageBytes = 64 * 1024 * 1024;
+constexpr auto kMaxPixelsPaddingRatio = 32;
+constexpr auto kMaxPixelsFixedPadding = 64 * 1024;
 constexpr auto kTimeUnknown = std::numeric_limits<crl::time>::min();
 constexpr auto kDurationMax = crl::time(std::numeric_limits<int>::max());
 
@@ -417,6 +419,12 @@ const AVCodec *FindDecoder(not_null<AVCodecContext*> context) {
 		: avcodec_find_decoder(context->codec_id);
 }
 
+int64_t MaxPixelsForAreaLimit(int64_t area) {
+	// Decoders may check internally padded frame dimensions against max_pixels,
+	// not just the visible frame size. Leave room for alignment/cropping slack.
+	return area + area / kMaxPixelsPaddingRatio + kMaxPixelsFixedPadding;
+}
+
 CodecPointer MakeCodecPointer(CodecDescriptor descriptor) {
 	auto error = AvErrorWrap();
 
@@ -435,7 +443,8 @@ CodecPointer MakeCodecPointer(CodecDescriptor descriptor) {
 	context->pkt_timebase = stream->time_base;
 	if ((descriptor.videoMaxArea > 0)
 		&& (context->codec_type == AVMEDIA_TYPE_VIDEO)) {
-		context->max_pixels = descriptor.videoMaxArea;
+		context->max_pixels = MaxPixelsForAreaLimit(
+			descriptor.videoMaxArea);
 	}
 	av_opt_set(context, "threads", "auto", 0);
 	av_opt_set_int(context, "refcounted_frames", 1, 0);

Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h

@@ -214,6 +214,7 @@ void LogError(
 	const QString &details = {});
 
 [[nodiscard]] const AVCodec *FindDecoder(not_null<AVCodecContext*> context);
+[[nodiscard]] int64_t MaxPixelsForAreaLimit(int64_t area);
 [[nodiscard]] crl::time PtsToTime(int64_t pts, AVRational timeBase);
 // Used for full duration conversion.
 [[nodiscard]] crl::time PtsToTimeCeil(int64_t pts, AVRational timeBase);

Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp

@@ -329,7 +329,8 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 		const auto audioStreamId = av_find_best_stream(_fmtContext, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
 		_hasAudioStream = (audioStreamId >= 0);
 	}
-	_codecContext->max_pixels = MaxAreaForMode(_mode);
+	_codecContext->max_pixels = FFmpeg::MaxPixelsForAreaLimit(
+		MaxAreaForMode(_mode));
 
 	if ((res = avcodec_open2(_codecContext, codec, nullptr)) < 0) {
 		LOG(("Gif Error: Unable to avcodec_open2 %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));