Changeset 1008:942e9a44d149 in mediastreamer2


Ignore:
Timestamp:
Jul 7, 2010 11:51:48 AM (3 years ago)
Author:
nikita <nikita@…>
Branch:
default
Message:

fix compilation for wince

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • build/win32native/alldescs.h

    r993 r1008  
    55extern MSFilterDesc ms_ulaw_dec_desc; 
    66extern MSFilterDesc ms_ulaw_enc_desc; 
    7 extern MSFilterDesc ms_file_player_desc; 
     7//extern MSFilterDesc ms_file_player_desc; 
    88extern MSFilterDesc ms_rtp_send_desc; 
    99extern MSFilterDesc ms_rtp_recv_desc; 
    1010extern MSFilterDesc ms_dtmf_gen_desc; 
    11 extern MSFilterDesc ms_file_rec_desc; 
    12 extern MSFilterDesc ms_speex_dec_desc; 
    13 extern MSFilterDesc ms_speex_enc_desc; 
     11//extern MSFilterDesc ms_file_rec_desc; 
     12//extern MSFilterDesc ms_speex_dec_desc; 
     13//extern MSFilterDesc ms_speex_enc_desc; 
    1414extern MSFilterDesc ms_gsm_dec_desc; 
    1515extern MSFilterDesc ms_gsm_enc_desc; 
    16 extern MSFilterDesc ms_speex_ec_desc; 
     16//extern MSFilterDesc ms_speex_ec_desc; 
    1717extern MSFilterDesc ms_tee_desc; 
    1818extern MSFilterDesc ms_void_sink_desc; 
    1919extern MSFilterDesc ms_conf_desc; 
    20 extern MSFilterDesc ms_v4w_desc; 
    21 extern MSFilterDesc ms_video_out_desc; 
    22 extern MSFilterDesc ms_h263_enc_desc; 
    23 extern MSFilterDesc ms_h263_dec_desc; 
    24 extern MSFilterDesc ms_h263_old_enc_desc; 
    25 extern MSFilterDesc ms_h263_old_dec_desc; 
    26 extern MSFilterDesc ms_mpeg4_enc_desc; 
    27 extern MSFilterDesc ms_mpeg4_dec_desc; 
    28 extern MSFilterDesc ms_snow_enc_desc; 
    29 extern MSFilterDesc ms_snow_dec_desc; 
    30 extern MSFilterDesc ms_theora_enc_desc; 
    31 extern MSFilterDesc ms_theora_dec_desc; 
    32 extern MSFilterDesc ms_mjpeg_enc_desc; 
    33 extern MSFilterDesc ms_mjpeg_dec_desc; 
    34 extern MSFilterDesc ms_size_conv_desc; 
    35 extern MSFilterDesc ms_pix_conv_desc; 
     20//extern MSFilterDesc ms_v4w_desc; 
     21//extern MSFilterDesc ms_video_out_desc; 
     22//extern MSFilterDesc ms_h263_enc_desc; 
     23//extern MSFilterDesc ms_h263_dec_desc; 
     24//extern MSFilterDesc ms_h263_old_enc_desc; 
     25//extern MSFilterDesc ms_h263_old_dec_desc; 
     26//extern MSFilterDesc ms_mpeg4_enc_desc; 
     27//extern MSFilterDesc ms_mpeg4_dec_desc; 
     28//extern MSFilterDesc ms_snow_enc_desc; 
     29//extern MSFilterDesc ms_snow_dec_desc; 
     30//extern MSFilterDesc ms_theora_enc_desc; 
     31//extern MSFilterDesc ms_theora_dec_desc; 
     32//extern MSFilterDesc ms_mjpeg_enc_desc; 
     33//extern MSFilterDesc ms_mjpeg_dec_desc; 
     34//extern MSFilterDesc ms_size_conv_desc; 
     35//extern MSFilterDesc ms_pix_conv_desc; 
    3636extern MSFilterDesc ms_join_desc; 
    37 extern MSFilterDesc ms_resample_desc; 
     37//extern MSFilterDesc ms_resample_desc; 
    3838extern MSFilterDesc ms_volume_desc; 
    39 extern MSFilterDesc ms_static_image_desc; 
    40 extern MSFilterDesc ms_mire_desc; 
    41 extern MSFilterDesc ms_vfw_desc; 
    42 extern MSFilterDesc ms_ice_desc; 
     39//extern MSFilterDesc ms_static_image_desc; 
     40//extern MSFilterDesc ms_mire_desc; 
     41//extern MSFilterDesc ms_vfw_desc; 
     42//extern MSFilterDesc ms_ice_desc; 
    4343extern MSFilterDesc ms_equalizer_desc; 
    44 extern MSFilterDesc ms_dd_display_desc; 
    45 extern MSFilterDesc ms_itc_source_desc; 
    46 extern MSFilterDesc ms_itc_sink_desc; 
    47 extern MSFilterDesc ms_audio_mixer_desc; 
    48  
    4944MSFilterDesc * ms_filter_descs[]={ 
    5045&ms_alaw_dec_desc, 
    … …  
    5247&ms_ulaw_dec_desc, 
    5348&ms_ulaw_enc_desc, 
    54 &ms_file_player_desc, 
     49//&ms_file_player_desc, 
    5550&ms_rtp_send_desc, 
    5651&ms_rtp_recv_desc, 
    5752&ms_dtmf_gen_desc, 
    58 &ms_file_rec_desc, 
    59 &ms_speex_dec_desc, 
    60 &ms_speex_enc_desc, 
     53//&ms_file_rec_desc, 
     54//&ms_speex_dec_desc, 
     55//&ms_speex_enc_desc, 
    6156&ms_gsm_dec_desc, 
    6257&ms_gsm_enc_desc, 
    63 &ms_speex_ec_desc, 
     58//&ms_speex_ec_desc, 
    6459&ms_tee_desc, 
    6560&ms_void_sink_desc, 
    6661&ms_conf_desc, 
    67 &ms_v4w_desc, 
    68 &ms_video_out_desc, 
    69 &ms_h263_old_enc_desc, 
    70 &ms_h263_old_dec_desc, 
    71 &ms_h263_enc_desc, 
    72 &ms_h263_dec_desc, 
    73 &ms_mpeg4_enc_desc, 
    74 &ms_mpeg4_dec_desc, 
    75 &ms_snow_enc_desc, 
    76 &ms_snow_dec_desc, 
    77 &ms_theora_enc_desc, 
    78 &ms_theora_dec_desc, 
    79 &ms_mjpeg_enc_desc, 
    80 &ms_mjpeg_dec_desc, 
    81 &ms_size_conv_desc, 
    82 &ms_pix_conv_desc, 
     62//&ms_v4w_desc, 
     63//&ms_video_out_desc, 
     64//&ms_h263_old_enc_desc, 
     65//&ms_h263_old_dec_desc, 
     66//&ms_h263_enc_desc, 
     67//&ms_h263_dec_desc, 
     68//&ms_mpeg4_enc_desc, 
     69//&ms_mpeg4_dec_desc, 
     70//&ms_snow_enc_desc, 
     71//&ms_snow_dec_desc, 
     72//&ms_theora_enc_desc, 
     73//&ms_theora_dec_desc, 
     74//&ms_mjpeg_enc_desc, 
     75//&ms_mjpeg_dec_desc, 
     76//&ms_size_conv_desc, 
     77//&ms_pix_conv_desc, 
    8378&ms_join_desc, 
    8479#ifndef NORESAMPLE 
    85 &ms_resample_desc, 
     80//&ms_resample_desc, 
    8681#endif 
    8782&ms_volume_desc, 
    88 &ms_static_image_desc, 
    89 &ms_mire_desc, 
    90 &ms_vfw_desc, 
    91 &ms_ice_desc, 
     83//&ms_static_image_desc, 
     84//&ms_mire_desc, 
     85//&ms_vfw_desc, 
     86//&ms_ice_desc, 
    9287&ms_equalizer_desc, 
    93 &ms_dd_display_desc, 
    94 &ms_itc_source_desc, 
    95 &ms_itc_sink_desc, 
    96 &ms_audio_mixer_desc, 
    9788NULL 
    9889}; 

  • build/win32native/mediastreamer2.def

    r882 r1008  
    1 LIBRARY mediastreamer2 
    2  
    31EXPORTS 
    42 
    … …  
    6664        ms_load_plugins 
    6765 
    68         ms_display_new 
    69         ms_display_set_window_id 
    70         ms_display_desc_set_default 
    71         ms_display_destroy 
    72  
    73         video_preview_stop 
    74         video_preview_start 
    75         video_stream_new 
    76         video_stream_start 
    77         video_stream_stop 
    78         video_stream_iterate 
    79         video_stream_set_sent_video_size 
    8066         
    8167        ms_is_ipv6 
    82          
    83         yuv_buf_alloc 
    84         yuv_buf_init_from_mblk 
    85         yuv_buf_init_from_mblk_with_size 
     68 
    8669 
    8770        ms_sleep 
    … …  
    8972        ms_queue_init 
    9073        ms_queue_flush 
    91          
    92         rfc3984_init 
    93         rfc3984_uninit 
    94         rfc3984_pack 
    95         rfc3984_unpack 
    96         rfc3984_set_mode 
    9774 
    9875        ms_list_free 
    … …  
    11794        ms_web_cam_get_string_id 
    11895         
    119         ms_video_set_video_func 
    120         ms_sws_getContext 
    121         ms_sws_freeContext 
    122         ms_sws_scale 
     96        audio_stream_record 
     97        audio_stream_play 
     98        audio_stream_new 
     99        audio_stream_start_now 
     100        audio_stream_start_with_sndcards 
     101        audio_stream_change_decoder 
     102        audio_stream_send_dtmf 
     103        audio_stream_equalizer_set_gain 
     104        audio_stream_enable_equalizer 
     105        audio_stream_set_echo_canceller_params 
     106        audio_stream_enable_noise_gate 
     107        audio_stream_enable_automatic_gain_control 
     108        ms_list_size 

  • src/CMakeLists.txt

    r1005 r1008  
    3939if(GSM_LIB) 
    4040  set(MS_LIBS ${MS_LIBS} ${GSM_LIB}) 
     41  set(MS_SRCS ${MS_SRCS} gsm.c) 
     42else(GSM_LIB) 
     43  include_directories(${GSM_INCLUDE_DIRS}) 
     44  set(MS_LIBS ${MS_LIBS} ${GSM_LIBRARIES}) 
    4145  set(MS_SRCS ${MS_SRCS} gsm.c) 
    4246endif(GSM_LIB) 

  • src/equalizer.c

    r856 r1008  
    246246 
    247247static void equalizer_state_run(EqualizerState *s, int16_t *samples, int nsamples){ 
     248        ms_word16_t *w; 
     249 
    248250        if (s->needs_update) 
    249                 equalizer_state_compute_impulse_response(s); 
    250         ms_word16_t *w; 
     251                equalizer_state_compute_impulse_response(s);     
    251252        INT16_TO_WORD16(samples,w,nsamples); 
    252253        ms_fir_mem16(w,s->fir,w,nsamples,s->fir_len,s->mem); 
Note: See TracChangeset for help on using the changeset viewer.