Disable some code for macOS for now.

telegramdesktop · May 28, 2019 · a19a0af · a19a0af
1 parent e701050
commit a19a0af
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/VoIPController.cpp b/VoIPController.cpp
@@ -2162,7 +2162,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA
 						f=sentVideoFrames.erase(f);
 						continue;
 					}else{
-						LOGE("!!!!!!!!!!!!!!11 VIDEO FRAME LOSS DETECTED [1] %u of %u fragments", sentVideoFrames[0].unacknowledgedPackets.size(), sentVideoFrames[0].fragmentCount);
+						LOGE("!!!!!!!!!!!!!!11 VIDEO FRAME LOSS DETECTED [1] %d of %u fragments", int(sentVideoFrames[0].unacknowledgedPackets.size()), sentVideoFrames[0].fragmentCount);
 						videoPacketLossCount++;
 						videoKeyframeRequested=true;
 						videoSource->RequestKeyFrame();
@@ -2171,7 +2171,7 @@ simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedA
 				}else if(first){
 					first=false;
 				}else if(!first && f->unacknowledgedPackets.size()<f->fragmentCount){
-					LOGE("!!!!!!!!!!!!!!11 VIDEO FRAME LOSS DETECTED [2] %u of %u fragments", f->unacknowledgedPackets.size(), f->fragmentCount);
+					LOGE("!!!!!!!!!!!!!!11 VIDEO FRAME LOSS DETECTED [2] %d of %u fragments", int(f->unacknowledgedPackets.size()), f->fragmentCount);
 					videoPacketLossCount++;
 					videoKeyframeRequested=true;
 					videoSource->RequestKeyFrame();

diff --git a/libtgvoip.gyp b/libtgvoip.gyp
@@ -773,6 +773,7 @@
                     '<(DEPTH)/../../../Libraries/macold/openssl/include',
                   ],
                   'defines': [
+                    'TARGET_OSX',
                     'TARGET_OSX32',
                   ],
                 }, {
@@ -788,15 +789,18 @@
                       '-framework VideoToolbox',
                     ],
                   },
+                  'defines': [
+                    'TARGET_OSX',
+                  ],
                   'sources': [
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.mm',
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.h',
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoSource.mm',
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoSource.h',
-                   '<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.mm',
-                   '<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.h',
-                   '<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.mm',
-                   '<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.h',
+                   #'<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.mm',
+                   #'<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.h',
+                   #'<(tgvoip_src_loc)/os/darwin/TGVVideoSource.mm',
+                   #'<(tgvoip_src_loc)/os/darwin/TGVVideoSource.h',
+                   #'<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.mm',
+                   #'<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.h',
+                   #'<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.mm',
+                   #'<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.h',
                   ],
                 }],
                 ['"<(official_build_target)" == "macstore"', {

diff --git a/video/VideoRenderer.cpp b/video/VideoRenderer.cpp
@@ -6,14 +6,14 @@
 
 #ifdef __ANDROID__
 #include "../os/android/VideoRendererAndroid.h"
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
+#elif defined(__APPLE__) && !defined(TARGET_OSX)
 #include "../os/darwin/SampleBufferDisplayLayerRenderer.h"
 #endif
 
 std::vector<uint32_t> tgvoip::video::VideoRenderer::GetAvailableDecoders(){
 #ifdef __ANDROID__
 	return VideoRendererAndroid::availableDecoders;
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
+#elif defined(__APPLE__) && !defined(TARGET_OSX)
 	return SampleBufferDisplayLayerRenderer::GetAvailableDecoders();
 #endif
 	return std::vector<uint32_t>();
@@ -22,7 +22,7 @@ std::vector<uint32_t> tgvoip::video::VideoRenderer::GetAvailableDecoders(){
 int tgvoip::video::VideoRenderer::GetMaximumResolution(){
 #ifdef __ANDROID__
 	return VideoRendererAndroid::maxResolution;
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
+#elif defined(__APPLE__) && !defined(TARGET_OSX)
 	return SampleBufferDisplayLayerRenderer::GetMaximumResolution();
 #endif
 	return 0;

diff --git a/video/VideoSource.cpp b/video/VideoSource.cpp
@@ -6,7 +6,7 @@
 
 #ifdef __ANDROID__
 #include "../os/android/VideoSourceAndroid.h"
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
+#elif defined(__APPLE__) && !defined(TARGET_OSX)
 #include "../os/darwin/VideoToolboxEncoderSource.h"
 #endif
 
@@ -37,7 +37,7 @@ std::string VideoSource::GetErrorDescription(){
 std::vector<uint32_t> VideoSource::GetAvailableEncoders(){
 #ifdef __ANDROID__
 	return VideoSourceAndroid::availableEncoders;
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
+#elif defined(__APPLE__) && !defined(TARGET_OSX)
 	return VideoToolboxEncoderSource::GetAvailableEncoders();
 #endif
 	return std::vector<uint32_t>();