* #36737: switch back to svn repo, remove assert in sip_transaction.c
diff --git a/jni/pjproject-android/.svn/pristine/39/392d8c7eaad03fc5f5726e57936fad180f73c9f5.svn-base b/jni/pjproject-android/.svn/pristine/39/392d8c7eaad03fc5f5726e57936fad180f73c9f5.svn-base
new file mode 100644
index 0000000..8221175
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/39/392d8c7eaad03fc5f5726e57936fad180f73c9f5.svn-base
@@ -0,0 +1,232 @@
+/* $Id$ */
+/*
+ * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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
+ */
+#include <pjmedia/resample.h>
+#include <pjmedia/errno.h>
+#include <pj/assert.h>
+#include <pj/pool.h>
+#include <pj/string.h>
+
+
+#define BYTES_PER_SAMPLE 2
+#define SIGNATURE PJMEDIA_SIG_PORT_RESAMPLE
+
+
+struct resample_port
+{
+ pjmedia_port base;
+ pjmedia_port *dn_port;
+ unsigned options;
+ pjmedia_resample *resample_get;
+ pjmedia_resample *resample_put;
+ pj_int16_t *get_buf;
+ pj_int16_t *put_buf;
+};
+
+
+
+static pj_status_t resample_put_frame(pjmedia_port *this_port,
+ pjmedia_frame *frame);
+static pj_status_t resample_get_frame(pjmedia_port *this_port,
+ pjmedia_frame *frame);
+static pj_status_t resample_destroy(pjmedia_port *this_port);
+
+
+
+PJ_DEF(pj_status_t) pjmedia_resample_port_create( pj_pool_t *pool,
+ pjmedia_port *dn_port,
+ unsigned clock_rate,
+ unsigned opt,
+ pjmedia_port **p_port )
+{
+ const pj_str_t name = pj_str("resample");
+ struct resample_port *rport;
+ pjmedia_audio_format_detail *d_afd, *r_afd;
+ pj_status_t status;
+
+ /* Validate arguments. */
+ PJ_ASSERT_RETURN(pool && dn_port && clock_rate && p_port, PJ_EINVAL);
+
+ /* Only supports 16bit samples per frame */
+ PJ_ASSERT_RETURN(PJMEDIA_PIA_BITS(&dn_port->info) == 16, PJMEDIA_ENCBITS);
+
+ d_afd = pjmedia_format_get_audio_format_detail(&dn_port->info.fmt, 1);
+
+ /* Create and initialize port. */
+ rport = PJ_POOL_ZALLOC_T(pool, struct resample_port);
+ PJ_ASSERT_RETURN(rport != NULL, PJ_ENOMEM);
+
+ pjmedia_port_info_init(&rport->base.info, &name, SIGNATURE, clock_rate,
+ d_afd->channel_count, BYTES_PER_SAMPLE * 8,
+ clock_rate * d_afd->frame_time_usec / 1000000);
+
+ rport->dn_port = dn_port;
+ rport->options = opt;
+
+ r_afd = pjmedia_format_get_audio_format_detail(&rport->base.info.fmt, 1);
+
+ /* Create buffers.
+ * We need separate buffer for get_frame() and put_frame() since
+ * both functions may run simultaneously.
+ */
+ rport->get_buf = (pj_int16_t*)
+ pj_pool_alloc(pool, PJMEDIA_PIA_AVG_FSZ(&dn_port->info));
+ PJ_ASSERT_RETURN(rport->get_buf != NULL, PJ_ENOMEM);
+
+ rport->put_buf = (pj_int16_t*)
+ pj_pool_alloc(pool, PJMEDIA_PIA_AVG_FSZ(&dn_port->info));
+ PJ_ASSERT_RETURN(rport->put_buf != NULL, PJ_ENOMEM);
+
+
+ /* Create "get_frame" resample */
+ status = pjmedia_resample_create(pool,
+ (opt&PJMEDIA_RESAMPLE_USE_LINEAR)==0,
+ (opt&PJMEDIA_RESAMPLE_USE_SMALL_FILTER)==0,
+ d_afd->channel_count,
+ d_afd->clock_rate,
+ r_afd->clock_rate,
+ PJMEDIA_PIA_SPF(&dn_port->info),
+ &rport->resample_get);
+ if (status != PJ_SUCCESS)
+ return status;
+
+ /* Create "put_frame" resample */
+ status = pjmedia_resample_create(pool,
+ (opt&PJMEDIA_RESAMPLE_USE_LINEAR)==0,
+ (opt&PJMEDIA_RESAMPLE_USE_SMALL_FILTER)==0,
+ d_afd->channel_count,
+ r_afd->clock_rate,
+ d_afd->clock_rate,
+ PJMEDIA_PIA_SPF(&rport->base.info),
+ &rport->resample_put);
+
+ /* Media port interface */
+ rport->base.get_frame = &resample_get_frame;
+ rport->base.put_frame = &resample_put_frame;
+ rport->base.on_destroy = &resample_destroy;
+
+
+ /* Done */
+ *p_port = &rport->base;
+
+ return PJ_SUCCESS;
+}
+
+
+
+static pj_status_t resample_put_frame(pjmedia_port *this_port,
+ pjmedia_frame *frame)
+{
+ struct resample_port *rport = (struct resample_port*) this_port;
+ pjmedia_frame downstream_frame;
+
+ /* Return if we don't have downstream port. */
+ if (rport->dn_port == NULL) {
+ return PJ_SUCCESS;
+ }
+
+ if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO) {
+ pjmedia_resample_run( rport->resample_put,
+ (const pj_int16_t*) frame->buf,
+ rport->put_buf);
+
+ downstream_frame.buf = rport->put_buf;
+ downstream_frame.size = PJMEDIA_PIA_AVG_FSZ(&rport->dn_port->info);
+ } else {
+ downstream_frame.buf = frame->buf;
+ downstream_frame.size = frame->size;
+ }
+
+ downstream_frame.type = frame->type;
+ downstream_frame.timestamp.u64 = frame->timestamp.u64;
+
+ return pjmedia_port_put_frame( rport->dn_port, &downstream_frame );
+}
+
+
+
+static pj_status_t resample_get_frame(pjmedia_port *this_port,
+ pjmedia_frame *frame)
+{
+ struct resample_port *rport = (struct resample_port*) this_port;
+ pjmedia_frame tmp_frame;
+ pj_status_t status;
+
+ /* Return silence if we don't have downstream port */
+ if (rport->dn_port == NULL) {
+ pj_bzero(frame->buf, frame->size);
+ return PJ_SUCCESS;
+ }
+
+ tmp_frame.buf = rport->get_buf;
+ tmp_frame.size = PJMEDIA_PIA_AVG_FSZ(&rport->dn_port->info);
+ tmp_frame.timestamp.u64 = frame->timestamp.u64;
+ tmp_frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+
+ status = pjmedia_port_get_frame( rport->dn_port, &tmp_frame);
+ if (status != PJ_SUCCESS)
+ return status;
+
+ if (tmp_frame.type != PJMEDIA_FRAME_TYPE_AUDIO) {
+ frame->type = tmp_frame.type;
+ frame->timestamp = tmp_frame.timestamp;
+ /* Copy whatever returned as long as the buffer size is enough */
+ frame->size = tmp_frame.size < PJMEDIA_PIA_AVG_FSZ(&rport->base.info) ?
+ tmp_frame.size : PJMEDIA_PIA_AVG_FSZ(&rport->base.info);
+ if (tmp_frame.size) {
+ pjmedia_copy_samples((pj_int16_t*)frame->buf,
+ (const pj_int16_t*)tmp_frame.buf,
+ (unsigned)frame->size >> 1);
+ }
+ return PJ_SUCCESS;
+ }
+
+ pjmedia_resample_run( rport->resample_get,
+ (const pj_int16_t*) tmp_frame.buf,
+ (pj_int16_t*) frame->buf);
+
+ frame->size = PJMEDIA_PIA_AVG_FSZ(&rport->base.info);
+ frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
+
+ return PJ_SUCCESS;
+}
+
+
+static pj_status_t resample_destroy(pjmedia_port *this_port)
+{
+ struct resample_port *rport = (struct resample_port*) this_port;
+
+ if ((rport->options & PJMEDIA_RESAMPLE_DONT_DESTROY_DN)==0) {
+ pjmedia_port_destroy(rport->dn_port);
+ rport->dn_port = NULL;
+ }
+
+ if (rport->resample_get) {
+ pjmedia_resample_destroy(rport->resample_get);
+ rport->resample_get = NULL;
+ }
+
+ if (rport->resample_put) {
+ pjmedia_resample_destroy(rport->resample_put);
+ rport->resample_put = NULL;
+ }
+
+ return PJ_SUCCESS;
+}
+