Commit 2011ba71 authored by Ghislain MARY's avatar Ghislain MARY

Remove changes that should not have been commited in previous commit.

parent d06c8acd
......@@ -52,7 +52,4 @@ int CALLBACK WinMain(_In_ HINSTANCE, _In_ HINSTANCE, _In_ LPSTR, _In_ int)
}
Windows::Foundation::Uninitialize();
}
else {
OutputDebugStringW(L"Failed MS2TesterHost initialization");
}
}
......@@ -44,9 +44,9 @@
<TextBlock x:Name="VideoSizeLabel" Grid.Row="2" Grid.Column="0" Text="Video size:" VerticalAlignment="Center" Margin="8"/>
<ComboBox x:Name="VideoSizeComboBox" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="8">
<ComboBoxItem Content="720P"/>
<ComboBoxItem Content="VGA" IsSelected="True"/>
<ComboBoxItem Content="VGA"/>
<ComboBoxItem Content="CIF"/>
<ComboBoxItem Content="QVGA"/>
<ComboBoxItem Content="QVGA" IsSelected="True"/>
<ComboBoxItem Content="QCIF"/>
</ComboBox>
<TextBlock x:Name="FramerateLabel" Grid.Row="3" Grid.Column="0" Text="FPS:" VerticalAlignment="Center" Margin="8"/>
......
......@@ -119,9 +119,6 @@
<ItemGroup>
<Content Include="Assets\StoreLogo.png" />
<Content Include="Assets\WideLogo.png" />
<Content Include="LeakTrack.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\Images\nowebcamCIF.jpg" />
<Content Include="Assets\Logo.png" />
......
......@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "ortp/rtp.h"
#include <stdint.h>
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE) || defined(MS2_WINDOWS_UNIVERSAL)
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE)
#include <opus.h>
#else
#include <opus/opus.h>
......
......@@ -34,7 +34,7 @@
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE) || defined(MS2_WINDOWS_UNIVERSAL)
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE)
// Android and Windows phone don't use make install
#include <srtp.h>
//#include <srtp_priv.h>
......
......@@ -194,7 +194,6 @@ void NativeTester::initVideo()
char cPath[MAX_FILEPATH_SIZE] = { 0 };
wcstombs(cPath, wsPath.c_str(), sizeof(cPath));
ms_static_image_set_default_image(cPath);
//ortp_load_leak_track_dll();
}
void NativeTester::uninitVideo()
......@@ -263,7 +262,6 @@ void NativeTester::stopVideoStream()
ms_filter_log_statistics();
video_stream_stop(_videoStream);
_videoStream = NULL;
ortp_dump_memory_leaks();
}
void NativeTester::changeCamera(Platform::String^ camera)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment