Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add extra logging for dummy resample imp #3863

Merged
merged 4 commits into from
Feb 21, 2024
Merged

Add extra logging for dummy resample imp #3863

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04dad02
Add extra logging for dummy resample imp
deeagle001 Feb 17, 2024
5b53201
Update resample_resample.c
sauwming Feb 19, 2024
f5afc38
Update resample_resample.c - fix build failure
sauwming Feb 19, 2024
b3c04c8
Removing trailing whitespace changes.
deeagle001 Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions pjmedia/src/pjmedia/resample_resample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
*
Expand All @@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#include <pjmedia/resample.h>
Expand Down Expand Up @@ -114,7 +114,7 @@ PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
resample->in_buffer = (pj_int16_t**)pj_pool_alloc(pool, size);

/* Allocate input buffer */
size = (samples_per_frame/channel_count + 2*resample->xoff) *
size = (samples_per_frame/channel_count + 2*resample->xoff) *
sizeof(pj_int16_t);
for (i = 0; i < channel_count; ++i) {
resample->in_buffer[i] = (pj_int16_t*)pj_pool_alloc(pool, size);
Expand All @@ -123,7 +123,7 @@ PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
}

/* Allocate temporary output buffer */
size = (unsigned) (resample->frame_size * sizeof(pj_int16_t) *
size = (unsigned) (resample->frame_size * sizeof(pj_int16_t) *
resample->factor / channel_count + 0.5);
resample->tmp_buffer = (pj_int16_t*) pj_pool_alloc(pool, size);
PJ_ASSERT_RETURN(resample->tmp_buffer, PJ_ENOMEM);
Expand All @@ -132,7 +132,7 @@ PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
*p_resample = resample;

PJ_LOG(5,(THIS_FILE, "resample created: %s qualiy, %s filter, in/out "
"rate=%d/%d",
"rate=%d/%d",
(high_quality?"high":"low"),
(large_filter?"large":"small"),
rate_in, rate_out));
Expand All @@ -157,8 +157,8 @@ PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
*
* So here comes the trick.
*
* First of all, because of the history and lookahead requirement,
* resample->buffer need to accomodate framesize+2*xoff samples in its
* First of all, because of the history and lookahead requirement,
* resample->buffer need to accommodate framesize+2*xoff samples in its
* buffer. This is done when the buffer is created.
*
* On the first run, the input frame (supplied by application) is
Expand All @@ -171,27 +171,27 @@ PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
*
* So here's the layout of resample->buffer on the first run.
*
* run 0
* run 0
* +------+------+--------------+
* | 0000 | 0000 | frame0... |
* +------+------+--------------+
* ^ ^ ^ ^
* 0 xoff 2*xoff size+2*xoff
*
* 0 xoff 2*xoff size+2*xoff
*
* (Note again: resample algorithm is called at resample->buffer+xoff)
*
* At the end of the run, 2*xoff samples from the end of
* At the end of the run, 2*xoff samples from the end of
* resample->buffer are copied to the beginning of resample->buffer.
* The first xoff part of this will be used as history for the next
* run, and the second xoff part of this is actually the start of
* resampling for the next run.
*
* And the first run completes, the function returns.
*
*
*
* On the next run, the input frame supplied by application is again
* copied at 2*xoff position in the resample->buffer, and the
* resample algorithm is again invoked at resample->buffer+xoff
* copied at 2*xoff position in the resample->buffer, and the
* resample algorithm is again invoked at resample->buffer+xoff
* position. So effectively, the resample algorithm will start its
* operation on the last xoff from the previous frame, and gets the
* history from the last 2*xoff of the previous frame, and the look-
Expand All @@ -204,7 +204,7 @@ PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
* | frm0 | frm0 | frame1... |
* +------+------+--------------+
* ^ ^ ^ ^
* 0 xoff 2*xoff size+2*xoff
* 0 xoff 2*xoff size+2*xoff
*
* As you can see from above diagram, the resampling algorithm is
* actually called from the last xoff part of previous frame (frm0).
Expand All @@ -227,7 +227,7 @@ PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
resample->factor, (pj_uint16_t)resample->frame_size,
(char)resample->large_filter, (char)PJ_TRUE);
} else {
res_SrcLinear(resample->buffer + resample->xoff, output,
res_SrcLinear(resample->buffer + resample->xoff, output,
resample->factor, (pj_uint16_t)resample->frame_size);
}

Expand All @@ -244,7 +244,7 @@ PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
const pj_int16_t *src_buf;
unsigned mono_frm_sz_in;
unsigned mono_frm_sz_out;

mono_frm_sz_in = resample->frame_size / resample->channel_cnt;
mono_frm_sz_out = (unsigned)(mono_frm_sz_in * resample->factor + 0.5);

Expand All @@ -264,8 +264,8 @@ PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
(char)resample->large_filter, (char)PJ_TRUE);
} else {
res_SrcLinear( resample->in_buffer[i],
resample->tmp_buffer,
resample->factor,
resample->tmp_buffer,
resample->factor,
(pj_uint16_t)mono_frm_sz_in);
}

Expand Down Expand Up @@ -309,7 +309,7 @@ PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
unsigned rate_in,
unsigned rate_out,
unsigned samples_per_frame,
pjmedia_resample **p_resample)
pjmedia_resample **p_resample)
{
PJ_UNUSED_ARG(pool);
PJ_UNUSED_ARG(high_quality);
Expand All @@ -320,25 +320,27 @@ PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
PJ_UNUSED_ARG(samples_per_frame);
PJ_UNUSED_ARG(p_resample);

PJ_LOG(3, (THIS_FILE, "Resampler creation cancelled due to missing"
"resample implementation");
return PJ_EINVALIDOP;
sauwming marked this conversation as resolved.
Show resolved Hide resolved
}

PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
const pj_int16_t *input,
pj_int16_t *output )
pj_int16_t *output )
{
PJ_UNUSED_ARG(resample);
PJ_UNUSED_ARG(input);
PJ_UNUSED_ARG(output);
}

PJ_DEF(unsigned) pjmedia_resample_get_input_size(pjmedia_resample *resample)
PJ_DEF(unsigned) pjmedia_resample_get_input_size(pjmedia_resample *resample)
{
PJ_UNUSED_ARG(resample);
return 0;
}

PJ_DEF(void) pjmedia_resample_destroy(pjmedia_resample *resample)
PJ_DEF(void) pjmedia_resample_destroy(pjmedia_resample *resample)
{
PJ_UNUSED_ARG(resample);
}
Expand Down
Loading