Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mediastreamer2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
mediastreamer2
Commits
2011ba71
Commit
2011ba71
authored
Feb 02, 2016
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove changes that should not have been commited in previous commit.
parent
d06c8acd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
12 deletions
+4
-12
MS2TesterHost.cpp
build/windows10/ms2-tester/MS2TesterHost/MS2TesterHost.cpp
+0
-3
VideoPage.xaml
build/windows10/ms2-tester/VideoPage.xaml
+2
-2
ms2-tester.csproj
build/windows10/ms2-tester/ms2-tester.csproj
+0
-3
msopus.c
src/audiofilters/msopus.c
+1
-1
ms_srtp.c
src/crypto/ms_srtp.c
+1
-1
mediastreamer2_tester_windows.cpp
tester/mediastreamer2_tester_windows.cpp
+0
-2
No files found.
build/windows10/ms2-tester/MS2TesterHost/MS2TesterHost.cpp
View file @
2011ba71
...
...
@@ -52,7 +52,4 @@ int CALLBACK WinMain(_In_ HINSTANCE, _In_ HINSTANCE, _In_ LPSTR, _In_ int)
}
Windows
::
Foundation
::
Uninitialize
();
}
else
{
OutputDebugStringW
(
L"Failed MS2TesterHost initialization"
);
}
}
build/windows10/ms2-tester/VideoPage.xaml
View file @
2011ba71
...
...
@@ -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"/>
...
...
build/windows10/ms2-tester/ms2-tester.csproj
View file @
2011ba71
...
...
@@ -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"
/>
...
...
src/audiofilters/msopus.c
View file @
2011ba71
...
...
@@ -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>
...
...
src/crypto/ms_srtp.c
View file @
2011ba71
...
...
@@ -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>
...
...
tester/mediastreamer2_tester_windows.cpp
View file @
2011ba71
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment