From 13ab055fe0335b56510c8f03c8335e92500a5eef Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 Nov 2017 15:41:15 +0400
Subject: [PATCH] Add debug information about crash in ffmpeg.

---
 Telegram/SourceFiles/logs.cpp                 |  4 ++++
 .../media/media_audio_ffmpeg_loader.cpp       | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index d916756c8..92a92b179 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include <signal.h>
 #include <new>
+#include <mutex>
 
 #include "platform/platform_specific.h"
 #include "mtproto/connection.h"
@@ -630,6 +631,7 @@ namespace internal {
 	using Annotations = std::map<std::string, std::string>;
 	using AnnotationRefs = std::map<std::string, const QString*>;
 
+	std::mutex ProcessAnnotationsMutex;
 	Annotations ProcessAnnotations;
 	AnnotationRefs ProcessAnnotationRefs;
 
@@ -1125,6 +1127,7 @@ namespace internal {
 	}
 
 	void setCrashAnnotation(const std::string &key, const QString &value) {
+		std::unique_lock<std::mutex> lock(internal::ProcessAnnotationsMutex);
 		if (!value.trimmed().isEmpty()) {
 			internal::ProcessAnnotations[key] = value.toUtf8().constData();
 		} else {
@@ -1133,6 +1136,7 @@ namespace internal {
 	}
 
 	void setCrashAnnotationRef(const std::string &key, const QString *valuePtr) {
+		std::unique_lock<std::mutex> lock(internal::ProcessAnnotationsMutex);
 		if (valuePtr) {
 			internal::ProcessAnnotationRefs[key] = valuePtr;
 		} else {
diff --git a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp
index 012ce56c1..b33a8baa9 100644
--- a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp
+++ b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp
@@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "media/media_audio_ffmpeg_loader.h"
 
+extern "C" {
+#include <libswresample/swresample_internal.h>
+}
+
 constexpr AVSampleFormat AudioToFormat = AV_SAMPLE_FMT_S16;
 constexpr int64_t AudioToChannelLayout = AV_CH_LAYOUT_STEREO;
 constexpr int32 AudioToChannels = 2;
@@ -351,6 +355,21 @@ AudioPlayerLoader::ReadResult FFMpegLoader::readFromReadyFrame(QByteArray &resul
 				return ReadResult::Error;
 			}
 		}
+		if (swrContext->in.ch_count == 2 && frame->extended_data[1] == nullptr) {
+			auto params = fmtContext->streams[streamId]->codecpar;
+			SignalHandlers::setCrashAnnotation("MediaCrash",
+				QString("layout:%1,channels:%2,rate:%3,format:%4,framelayout:%5,framechannels:%6,framerate:%7,stream:%8"
+				).arg(params->channel_layout
+				).arg(params->channels
+				).arg(params->sample_rate
+				).arg(codecContext->sample_fmt
+				).arg(frame->channel_layout
+				).arg(frame->channels
+				).arg(frame->sample_rate
+				).arg(streamId
+				));
+			Unexpected("Bad frame while reading audio!");
+		}
 		if ((res = swr_convert(swrContext, dstSamplesData, dstSamples, (const uint8_t**)frame->extended_data, frame->nb_samples)) < 0) {
 			char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
 			LOG(("Audio Error: Unable to swr_convert for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));