From 675312b0be07f63edb41e676ea9459ebeb667195 Mon Sep 17 00:00:00 2001 From: smorlat Date: Tue, 5 Jan 2010 12:30:57 +0000 Subject: [PATCH] add mediastreamer2 winmob files. git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@803 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/mediastreamer2/build/Makefile.am | 2 +- .../build/wince/mediastreamer2.vcproj | 2481 +++++++++++------ .../mediastreamer2/build/winmob/Makefile.am | 2 + .../mediastreamer2/build/winmob/alldescs.h | 68 + .../build/winmob/mediastreamer2.def | 129 + .../{wince => winmob}/mediastreamer2.sln | 0 .../build/winmob/mediastreamer2.vcproj | 913 ++++++ linphone/mediastreamer2/configure.ac | 1 + linphone/oRTP/build/wince/oRTP.sln | 46 - 9 files changed, 2682 insertions(+), 960 deletions(-) create mode 100755 linphone/mediastreamer2/build/winmob/Makefile.am create mode 100644 linphone/mediastreamer2/build/winmob/alldescs.h create mode 100644 linphone/mediastreamer2/build/winmob/mediastreamer2.def rename linphone/mediastreamer2/build/{wince => winmob}/mediastreamer2.sln (100%) create mode 100644 linphone/mediastreamer2/build/winmob/mediastreamer2.vcproj delete mode 100644 linphone/oRTP/build/wince/oRTP.sln diff --git a/linphone/mediastreamer2/build/Makefile.am b/linphone/mediastreamer2/build/Makefile.am index 4718144ae..7d64e0e78 100755 --- a/linphone/mediastreamer2/build/Makefile.am +++ b/linphone/mediastreamer2/build/Makefile.am @@ -1 +1 @@ -SUBDIRS= win32native win32-novideo wince +SUBDIRS= win32native win32-novideo wince winmob diff --git a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj index c36cce4dd..84f96ae3d 100644 --- a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj +++ b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj @@ -1,913 +1,1568 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linphone/mediastreamer2/build/winmob/Makefile.am b/linphone/mediastreamer2/build/winmob/Makefile.am new file mode 100755 index 000000000..29f98410c --- /dev/null +++ b/linphone/mediastreamer2/build/winmob/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST=alldescs.h mediastreamer2.vcproj mediastreamer2.sln mediastreamer2.def + diff --git a/linphone/mediastreamer2/build/winmob/alldescs.h b/linphone/mediastreamer2/build/winmob/alldescs.h new file mode 100644 index 000000000..e5e179401 --- /dev/null +++ b/linphone/mediastreamer2/build/winmob/alldescs.h @@ -0,0 +1,68 @@ +#include "mediastreamer2/msfilter.h" + +extern MSFilterDesc ms_alaw_dec_desc; +extern MSFilterDesc ms_alaw_enc_desc; +extern MSFilterDesc ms_ulaw_dec_desc; +extern MSFilterDesc ms_ulaw_enc_desc; +extern MSFilterDesc ms_file_player_desc; +extern MSFilterDesc ms_rtp_send_desc; +extern MSFilterDesc ms_rtp_recv_desc; +extern MSFilterDesc ms_dtmf_gen_desc; +extern MSFilterDesc ms_file_rec_desc; +extern MSFilterDesc ms_speex_dec_desc; +extern MSFilterDesc ms_speex_enc_desc; +//extern MSFilterDesc ms_gsm_dec_desc; +//extern MSFilterDesc ms_gsm_enc_desc; +extern MSFilterDesc ms_speex_ec_desc; +extern MSFilterDesc ms_tee_desc; +extern MSFilterDesc ms_conf_desc; +//extern MSFilterDesc alsa_write_desc; +//extern MSFilterDesc alsa_read_desc; +//extern MSFilterDesc oss_read_desc; +//extern MSFilterDesc oss_write_desc; +//extern MSFilterDesc ms_arts_read_desc; +//extern MSFilterDesc ms_arts_write_desc; +//extern MSFilterDesc ms_v4l_desc; +//extern MSFilterDesc ms_sdl_out_desc; +//extern MSFilterDesc ms_h263_enc_desc; +//extern MSFilterDesc ms_h263_dec_desc; +extern MSFilterDesc ms_join_desc; +extern MSFilterDesc ms_resample_desc; +extern MSFilterDesc ms_volume_desc; +extern MSFilterDesc ms_ice_desc; +extern MSFilterDesc ms_void_sink_desc; +MSFilterDesc * ms_filter_descs[]={ +&ms_alaw_dec_desc, +&ms_alaw_enc_desc, +&ms_ulaw_dec_desc, +&ms_ulaw_enc_desc, +&ms_file_player_desc, +&ms_rtp_send_desc, +&ms_rtp_recv_desc, +&ms_dtmf_gen_desc, +&ms_file_rec_desc, +&ms_speex_dec_desc, +&ms_speex_enc_desc, +//&ms_gsm_dec_desc, +//&ms_gsm_enc_desc, +&ms_speex_ec_desc, +&ms_tee_desc, +&ms_conf_desc, +//&alsa_write_desc, +//&alsa_read_desc, +//&oss_read_desc, +//&oss_write_desc, +//&ms_arts_read_desc, +//&ms_arts_write_desc, +//&ms_v4l_desc, +//&ms_sdl_out_desc, +//&ms_h263_enc_desc, +//&ms_h263_dec_desc, +&ms_join_desc, +&ms_resample_desc, +&ms_volume_desc, +&ms_ice_desc, +&ms_void_sink_desc, +NULL +}; + diff --git a/linphone/mediastreamer2/build/winmob/mediastreamer2.def b/linphone/mediastreamer2/build/winmob/mediastreamer2.def new file mode 100644 index 000000000..80dad5f0b --- /dev/null +++ b/linphone/mediastreamer2/build/winmob/mediastreamer2.def @@ -0,0 +1,129 @@ +LIBRARY mediastreamer2 + +EXPORTS + + ms_init + ms_exit + + ms_filter_new + ms_filter_new_from_desc + ms_filter_destroy + ms_filter_create_encoder + ms_filter_create_decoder + ms_filter_call_method + ms_filter_call_method_noarg + ms_filter_link + ms_filter_unlink + ms_filter_preprocess + ms_filter_postprocess + ms_filter_codec_supported + ms_filter_register + ms_filter_new_from_name + ms_filter_set_notify_callback + ms_filter_get_encoder + + ms_snd_card_new + ms_snd_card_manager_destroy + ms_snd_card_manager_reload + ms_snd_card_manager_add_card + ms_snd_card_manager_register_desc + ms_snd_card_create_reader + ms_snd_card_create_writer + ms_snd_card_get_name + ms_snd_card_get_string_id + ms_snd_card_manager_get + ms_snd_card_manager_get_default_card + ms_snd_card_manager_get_default_capture_card + ms_snd_card_manager_get_default_playback_card + ms_snd_card_manager_get_card + ms_snd_card_manager_get_list + ms_snd_card_dup + ms_snd_card_destroy + ms_snd_card_set_level + ms_snd_card_get_level + ms_snd_card_set_capture + ms_snd_card_set_control + ms_snd_card_get_control + + ms_web_cam_new + ms_web_cam_manager_reload + ms_web_cam_manager_get_default_cam + ms_web_cam_manager_get + ms_web_cam_manager_get_list + ms_web_cam_manager_get_cam + ms_web_cam_manager_add_cam + ms_web_cam_manager_register_desc + ms_web_cam_create_reader + ms_web_cam_get_driver_type + ms_web_cam_get_name + ms_web_cam_get_string_id + + ms_ticker_new + ms_ticker_set_name + ms_ticker_destroy + ms_ticker_attach + ms_ticker_detach + ms_ticker_set_time_func + ms_ticker_print_graphs + + + ms_bufferizer_init + ms_bufferizer_uninit + ms_bufferizer_read + ms_bufferizer_put + ms_bufferizer_put_from_queue + + ms_queue_init + ms_queue_flush + + rfc3984_init + rfc3984_uninit + rfc3984_pack + rfc3984_unpack + rfc3984_set_mode + + ms_load_plugins + + audio_stream_start + audio_stream_alive + audio_stream_enable_automatic_gain_control + audio_stream_set_echo_canceler_params + audio_stream_enable_gain_control + audio_stream_enable_echo_limiter + audio_stream_new + audio_stream_set_rtcp_information + audio_stream_start_with_files + audio_stream_start_now + audio_stream_set_relay_session_id + audio_stream_play_received_dtmfs + audio_stream_set_mic_gain + audio_stream_stop + audio_stream_play + audio_stream_record + ms_snd_card_get_capabilities + ring_start_with_cb + ring_start + ring_stop + audio_stream_send_dtmf + ms_discover_mtu + ms_set_mtu + + ms_list_append + ms_list_remove + ms_list_free + ms_list_for_each + ms_list_find + ms_list_for_each2 + ms_list_find_custom + ms_list_size + ms_list_nth_data + ms_list_remove_link + ms_list_index + ms_list_prepend + ms_list_position + + ms_time + ms_get_payload_max_size + ms_sleep + + \ No newline at end of file diff --git a/linphone/mediastreamer2/build/wince/mediastreamer2.sln b/linphone/mediastreamer2/build/winmob/mediastreamer2.sln similarity index 100% rename from linphone/mediastreamer2/build/wince/mediastreamer2.sln rename to linphone/mediastreamer2/build/winmob/mediastreamer2.sln diff --git a/linphone/mediastreamer2/build/winmob/mediastreamer2.vcproj b/linphone/mediastreamer2/build/winmob/mediastreamer2.vcproj new file mode 100644 index 000000000..c36cce4dd --- /dev/null +++ b/linphone/mediastreamer2/build/winmob/mediastreamer2.vcproj @@ -0,0 +1,913 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linphone/mediastreamer2/configure.ac b/linphone/mediastreamer2/configure.ac index f274a97d1..6559af89f 100644 --- a/linphone/mediastreamer2/configure.ac +++ b/linphone/mediastreamer2/configure.ac @@ -650,6 +650,7 @@ build/Makefile build/win32native/Makefile build/win32-novideo/Makefile build/wince/Makefile +build/winmob/Makefile mediastreamer.pc mediastreamer2.spec help/Makefile diff --git a/linphone/oRTP/build/wince/oRTP.sln b/linphone/oRTP/build/wince/oRTP.sln deleted file mode 100644 index e481bdf21..000000000 --- a/linphone/oRTP/build/wince/oRTP.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oRTP", "oRTP.vcproj", "{9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - Debug|Windows Mobile 6 Professional SDK (ARMV4I) = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - Debug|Windows Mobile 6 Standard SDK (ARMV4I) = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - Release|Windows Mobile 6 Professional SDK (ARMV4I) = Release|Windows Mobile 6 Professional SDK (ARMV4I) - Release|Windows Mobile 6 Standard SDK (ARMV4I) = Release|Windows Mobile 6 Standard SDK (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I) - {9FEA0683-C391-4C74-BCF6-2F9E4DE1B541}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal