Commit 5ddeb6cd authored by Guillaume BIENKOWSKI's avatar Guillaume BIENKOWSKI

Switched to tabs. No code change, just indentation.

parent c6087cfd
......@@ -36,11 +36,12 @@ typedef enum {
/* This enum is to be used in WebRtcIsacfix_EncoderInit() */
typedef enum {
/* In this mode, the bitrate and ptime are adjusted according to statistics
provided by the user through the WebRtcIsacfix_UpdateBwEstimate*() functions */
* provided by the user through the WebRtcIsacfix_UpdateBwEstimate*()
* functions */
CODING_AUTOMATIC,
/* Setup the encoder so that bitrate and ptime are controlled by calls to
WebRtcIsacFix_Encode(). This means the user is in charge of evaluating
the correct set of parameters for optimal call quality. */
* WebRtcIsacFix_Encode(). This means the user is in charge of evaluating
* the correct set of parameters for optimal call quality. */
CODING_USERDEFINED
} isac_codingmode_e;
......
......@@ -80,14 +80,14 @@ static void decode(MSFilter *f, mblk_t *im) {
// im is one packet from the encoder, so it's either 30 or 60 ms of audio
ret = WebRtcIsacfix_ReadFrameLen( (const WebRtc_Word16*)im->b_rptr, &samples_nb);
// ms_message("WebRtcIsacfix_ReadFrameLen -> %d", samples_nb);
// ms_message("WebRtcIsacfix_ReadFrameLen -> %d", samples_nb);
if( ret == 0 ) {
mblk_t *om = allocb(samples_nb*2, 0);
mblk_meta_copy(im, om);
obj->ptime = (samples_nb == ISAC_30MS_SAMPLE_COUNT) ? 30 : 60; // update ptime
// ms_message("DECODED om datap @%p", om->b_datap);
// ms_message("DECODED om datap @%p", om->b_datap);
ret = WebRtcIsacfix_Decode(obj->isac,
(const WebRtc_UWord16*)im->b_rptr,
......@@ -98,7 +98,7 @@ static void decode(MSFilter *f, mblk_t *im) {
ms_error( "WebRtcIsacfix_Decode error: %d", WebRtcIsacfix_GetErrorCode(obj->isac) );
freeb(om);
} else {
// ms_message("Decoded %d samples", ret);
// ms_message("Decoded %d samples", ret);
om->b_wptr+= ret*2;
mblk_set_plc_flag(om, 0);
ms_queue_put(f->outputs[0], om);
......@@ -133,7 +133,7 @@ static void filter_process(MSFilter *f){
WebRtc_Word16 flen = (obj->ptime == 30) ? ISAC_30MS_SAMPLE_COUNT
: ISAC_60MS_SAMPLE_COUNT;
mblk_t* plc_blk = allocb(flen*2, 0 );
// ms_message("PLC for %d ms", obj->ptime);
// ms_message("PLC for %d ms", obj->ptime);
// interpolate 1 frame for 30ms ptime, 2 frames for 60ms
WebRtc_Word16 ret = WebRtcIsacfix_DecodePlc(obj->isac,
......
......@@ -124,7 +124,7 @@ static void filter_process ( MSFilter *f ) {
obj->ts += ISAC_SAMPLES_PER_ENCODE;
om->b_wptr += ret;
out_count++;
// ms_message("packet %d out, samples %d", out_count, obj->ts);
// ms_message("packet %d out, samples %d", out_count, obj->ts);
mblk_set_timestamp_info( om, obj->ts );
ms_queue_put(f->outputs[0], om);
......@@ -214,10 +214,10 @@ static MSFilterMethod filter_methods[]= {
{MS_FILTER_GET_SAMPLE_RATE, filter_get_sample_rate },
{MS_FILTER_SET_BITRATE, filter_set_bitrate },
{MS_FILTER_GET_BITRATE, filter_get_bitrate },
#ifdef MS_AUDIO_ENCODER_SET_PTIME
#ifdef MS_AUDIO_ENCODER_SET_PTIME
{MS_AUDIO_ENCODER_SET_PTIME, filter_set_ptime },
{MS_AUDIO_ENCODER_GET_PTIME, filter_get_ptime },
#endif
#endif
{0, NULL}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment