Changeset 2675


Ignore:
Timestamp:
May 6, 2009 2:34:13 PM (10 years ago)
Author:
bennylp
Message:

More ticket #774: fixed G.722.1 compilation warnings on linux/gcc-4.3.2

Location:
pjproject/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/test/codec_vectors.c

    r2660 r2675  
    126126 
    127127        if (out_frame.size) { 
    128             fwrite(out_frame.buf, out_frame.size, 1, output); 
     128            int cnt; 
     129 
     130            cnt = fwrite(out_frame.buf, out_frame.size, 1, output); 
    129131 
    130132            if (encoded_frame_len == 0) 
    131133                encoded_frame_len = out_frame.size; 
    132         }    } 
     134        }     
     135    } 
    133136 
    134137    fclose(output); 
     
    491494} 
    492495 
    493  
     496#if PJMEDIA_HAS_G7221_CODEC 
    494497/* For ITU testing, off the 2 lsbs. */ 
    495498static void g7221_pcm_manip(short *pcm, unsigned count) 
     
    500503 
    501504} 
     505#endif  /* PJMEDIA_HAS_G7221_CODEC */ 
    502506 
    503507int codec_test_vectors(void) 
  • pjproject/trunk/pjmedia/src/test/mips_test.c

    r2605 r2675  
    883883} 
    884884 
     885#if PJMEDIA_HAS_G7221_CODEC 
    885886/* G.722.1 benchmark benchmark */ 
    886887static pjmedia_port* g7221_encode_decode(pj_pool_t *pool, 
     
    912913                               samples_per_frame, flags, te); 
    913914} 
     915#endif  /* PJMEDIA_HAS_G7221_CODEC */ 
    914916 
    915917#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0 
     
    19401942 
    19411943/* G722.1 stream */ 
     1944#if PJMEDIA_HAS_G7221_CODEC 
    19421945static pjmedia_port* create_stream_g7221( pj_pool_t *pool, 
    19431946                                          unsigned clock_rate, 
     
    19681971                         samples_per_frame, flags, te); 
    19691972} 
     1973#endif  /* PJMEDIA_HAS_G7221_CODEC */  
    19701974 
    19711975/***************************************************************************/ 
  • pjproject/trunk/pjmedia/src/test/sdp_neg_test.c

    r2604 r2675  
    14611461            } 
    14621462        } else if (neg) { 
    1463             status = pjmedia_sdp_neg_get_active_local(neg, &sdp2); 
     1463            const pjmedia_sdp_session *lsdp; 
     1464            status = pjmedia_sdp_neg_get_active_local(neg, &lsdp); 
    14641465            if (status != PJ_SUCCESS) { 
    14651466                app_perror(status,  
     
    14671468                return -215; 
    14681469            } 
     1470            sdp2 = (pjmedia_sdp_session*)lsdp; 
    14691471        } 
    14701472 
  • pjproject/trunk/third_party/g7221/common/common.c

    r2616 r2675  
    170170    Word16 temp_category_balances[2*MAX_NUM_CATEGORIZATION_CONTROL_POSSIBILITIES]; 
    171171    Word16 raw_max, raw_min; 
    172     Word16 raw_max_index, raw_min_index; 
     172    Word16 raw_max_index=0, raw_min_index=0; 
    173173    Word16 max_rate_pointer, min_rate_pointer; 
    174174    Word16 max, min; 
  • pjproject/trunk/third_party/g7221/decode/decoder.c

    r2623 r2675  
    473473    Word16 num_vecs; 
    474474    Word16 index; 
    475     Word16 bit; 
    476     Word16 signs_index; 
     475    Word16 bit=0; 
     476    Word16 signs_index=0; 
    477477    Word16 num_sign_bits; 
    478478    Word16 ran_out_of_bits_flag; 
Note: See TracChangeset for help on using the changeset viewer.