Add changes from GE

Fix issue 430
This commit is contained in:
bossiel 2015-02-11 18:26:48 +00:00
parent 46d9e8a989
commit ca8a252970
13 changed files with 28 additions and 45 deletions

View File

@ -344,19 +344,20 @@ tmedia_bandwidth_level_t;
/* ====== From "tinymedia/tmedia_common.h" ====== */
typedef enum tmedia_pref_video_size_s
{ /* must be sorted like this */
tmedia_pref_video_size_sqcif, // 128 x 98
tmedia_pref_video_size_qcif, // 176 x 144
tmedia_pref_video_size_qvga, // 320 x 240
tmedia_pref_video_size_cif, // 352 x 288
tmedia_pref_video_size_hvga, // 480 x 320
tmedia_pref_video_size_vga, // 640 x 480
tmedia_pref_video_size_4cif, // 704 x 576
tmedia_pref_video_size_wvga, // 800 x 480
tmedia_pref_video_size_svga, // 800 x 600
tmedia_pref_video_size_480p, // 852 x 480
tmedia_pref_video_size_720p, // 1280 x 720
tmedia_pref_video_size_16cif, // 1408 x 1152
tmedia_pref_video_size_1080p, // 1920 x 1080
tmedia_pref_video_size_sqcif, // 128 x 98
tmedia_pref_video_size_qcif, // 176 x 144
tmedia_pref_video_size_qvga, // 320 x 240
tmedia_pref_video_size_cif, // 352 x 288
tmedia_pref_video_size_hvga, // 480 x 320
tmedia_pref_video_size_vga, // 640 x 480
tmedia_pref_video_size_4cif, // 704 x 576
tmedia_pref_video_size_wvga, // 800 x 480
tmedia_pref_video_size_svga, // 800 x 600
tmedia_pref_video_size_480p, // 852 x 480
tmedia_pref_video_size_xga, // 1024 x 768
tmedia_pref_video_size_720p, // 1280 x 720
tmedia_pref_video_size_16cif, // 1408 x 1152
tmedia_pref_video_size_1080p, // 1920 x 1080
tmedia_pref_video_size_2160p, // 3840 x 2160
}
tmedia_pref_video_size_t;

View File

@ -19,6 +19,7 @@ public enum tmedia_pref_video_size_t {
tmedia_pref_video_size_wvga,
tmedia_pref_video_size_svga,
tmedia_pref_video_size_480p,
tmedia_pref_video_size_xga,
tmedia_pref_video_size_720p,
tmedia_pref_video_size_16cif,
tmedia_pref_video_size_1080p,

View File

@ -19,6 +19,7 @@ public enum tmedia_pref_video_size_t {
tmedia_pref_video_size_wvga,
tmedia_pref_video_size_svga,
tmedia_pref_video_size_480p,
tmedia_pref_video_size_xga,
tmedia_pref_video_size_720p,
tmedia_pref_video_size_16cif,
tmedia_pref_video_size_1080p,

View File

@ -19,6 +19,7 @@ public enum tmedia_pref_video_size_t {
tmedia_pref_video_size_wvga,
tmedia_pref_video_size_svga,
tmedia_pref_video_size_480p,
tmedia_pref_video_size_xga,
tmedia_pref_video_size_720p,
tmedia_pref_video_size_16cif,
tmedia_pref_video_size_1080p,

View File

@ -2637,6 +2637,7 @@ package tinyWRAP;
*tmedia_pref_video_size_wvga = *tinyWRAPc::tmedia_pref_video_size_wvga;
*tmedia_pref_video_size_svga = *tinyWRAPc::tmedia_pref_video_size_svga;
*tmedia_pref_video_size_480p = *tinyWRAPc::tmedia_pref_video_size_480p;
*tmedia_pref_video_size_xga = *tinyWRAPc::tmedia_pref_video_size_xga;
*tmedia_pref_video_size_720p = *tinyWRAPc::tmedia_pref_video_size_720p;
*tmedia_pref_video_size_16cif = *tinyWRAPc::tmedia_pref_video_size_16cif;
*tmedia_pref_video_size_1080p = *tinyWRAPc::tmedia_pref_video_size_1080p;

View File

@ -29423,6 +29423,11 @@ XS(SWIG_init) {
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(tmedia_pref_video_size_480p)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
/*@SWIG:/usr/local/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "tmedia_pref_video_size_xga", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(tmedia_pref_video_size_xga)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
/*@SWIG:/usr/local/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "tmedia_pref_video_size_720p", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(tmedia_pref_video_size_720p)));

View File

@ -1781,6 +1781,7 @@ tmedia_pref_video_size_4cif = _tinyWRAP.tmedia_pref_video_size_4cif
tmedia_pref_video_size_wvga = _tinyWRAP.tmedia_pref_video_size_wvga
tmedia_pref_video_size_svga = _tinyWRAP.tmedia_pref_video_size_svga
tmedia_pref_video_size_480p = _tinyWRAP.tmedia_pref_video_size_480p
tmedia_pref_video_size_xga = _tinyWRAP.tmedia_pref_video_size_xga
tmedia_pref_video_size_720p = _tinyWRAP.tmedia_pref_video_size_720p
tmedia_pref_video_size_16cif = _tinyWRAP.tmedia_pref_video_size_16cif
tmedia_pref_video_size_1080p = _tinyWRAP.tmedia_pref_video_size_1080p

View File

@ -28036,6 +28036,7 @@ SWIG_init(void) {
SWIG_Python_SetConstant(d, "tmedia_pref_video_size_wvga",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_wvga)));
SWIG_Python_SetConstant(d, "tmedia_pref_video_size_svga",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_svga)));
SWIG_Python_SetConstant(d, "tmedia_pref_video_size_480p",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_480p)));
SWIG_Python_SetConstant(d, "tmedia_pref_video_size_xga",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_xga)));
SWIG_Python_SetConstant(d, "tmedia_pref_video_size_720p",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_720p)));
SWIG_Python_SetConstant(d, "tmedia_pref_video_size_16cif",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_16cif)));
SWIG_Python_SetConstant(d, "tmedia_pref_video_size_1080p",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_1080p)));

View File

@ -154,6 +154,7 @@ MFCodec::~MFCodec()
if(m_bIsAsync && m_pMFT)
{
m_pMFT->ProcessMessage(MFT_MESSAGE_NOTIFY_END_OF_STREAM, NULL);
m_pMFT->ProcessMessage(MFT_MESSAGE_COMMAND_DRAIN, NULL);
}
SafeRelease(&m_pMFT);

View File

@ -153,18 +153,10 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\tipsec.c" />
<ClCompile Include="..\src\tipsec_common.c" />
<ClCompile Include="..\src\tipsec_racoon.c" />
<ClCompile Include="..\src\tipsec_vista.c" />
<ClCompile Include="..\src\tipsec_xp.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\tinyipsec_config.h" />
<ClInclude Include="..\src\tipsec.h" />
<ClInclude Include="..\src\tipsec_common.h" />
<ClInclude Include="..\src\tipsec_racoon.h" />
<ClInclude Include="..\src\tipsec_vista.h" />
<ClInclude Include="..\src\tipsec_xp.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />

View File

@ -16,18 +16,6 @@
<ClCompile Include="..\src\tipsec.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\tipsec_common.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\tipsec_racoon.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\tipsec_vista.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\tipsec_xp.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\tinyipsec_config.h">
@ -36,17 +24,5 @@
<ClInclude Include="..\src\tipsec.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\src\tipsec_common.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\src\tipsec_racoon.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\src\tipsec_vista.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\src\tipsec_xp.h">
<Filter>include</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -142,6 +142,7 @@ typedef enum tmedia_pref_video_size_s
tmedia_pref_video_size_wvga, // 800 x 480
tmedia_pref_video_size_svga, // 800 x 600
tmedia_pref_video_size_480p, // 852 x 480
tmedia_pref_video_size_xga, // 1024 x 768
tmedia_pref_video_size_720p, // 1280 x 720
tmedia_pref_video_size_16cif, // 1408 x 1152
tmedia_pref_video_size_1080p, // 1920 x 1080

View File

@ -57,6 +57,7 @@ static const fmtp_size_t fmtp_sizes[] =
{"1080P", tmedia_pref_video_size_1080p, tsk_false, 1920, 1080},
{"16CIF", tmedia_pref_video_size_16cif, tsk_true, 1408, 1152},
{"720P", tmedia_pref_video_size_720p, tsk_false, 1280, 720},
{"XGA", tmedia_pref_video_size_xga, tsk_false, 1024, 768},
{"480P", tmedia_pref_video_size_480p, tsk_false, 852, 480},
{"WVGA", tmedia_pref_video_size_wvga, tsk_false, 800, 480},
{"SVGA", tmedia_pref_video_size_svga, tsk_false, 800, 600},