diff --git a/pjmedia/src/test/codec_vectors.c b/pjmedia/src/test/codec_vectors.c
new file mode 100644
index 0000000..11d2f23
--- /dev/null
+++ b/pjmedia/src/test/codec_vectors.c
@@ -0,0 +1,487 @@
+/* $Id$ */
+/* 
+ * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
+ *
+ * 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 "test.h"
+#include <pjmedia-codec.h>
+
+#define THIS_FILE   "codec_vectors.c"
+#define TMP_OUT	    "output.tmp"
+
+static int codec_test_encode(pjmedia_codec_mgr *mgr, 
+			     char *codec_name, 
+			     unsigned bitrate,
+			     const char *wav_file,
+			     const char *ref_file)
+{
+    pj_str_t codec_id = pj_str(codec_name);
+    pj_pool_t *pool = NULL;
+    unsigned count, samples_per_frame, encoded_frame_len = 0, pos;
+    pjmedia_codec *codec = NULL;
+    const pjmedia_codec_info *ci[1];
+    pjmedia_codec_param codec_param;
+    pjmedia_port *wav_port = NULL;
+    pjmedia_frame in_frame, out_frame;
+    FILE *output = NULL, *fref = NULL;
+    int rc = 0;
+    pj_status_t status;
+
+    pool = pj_pool_create(mem, "codec-vectors", 512, 512, NULL);
+    if (!pool)  {
+	rc = -20;
+	goto on_return;
+    }
+
+    /* Find and open the codec */
+    count = 1;
+    status = pjmedia_codec_mgr_find_codecs_by_id(mgr, &codec_id, &count, ci, NULL);
+    if (status != PJ_SUCCESS) {
+	rc = -30;
+	goto on_return;
+    }
+
+    status = pjmedia_codec_mgr_alloc_codec(mgr, ci[0], &codec);
+    if (status != PJ_SUCCESS) {
+	rc = -40;
+	goto on_return;
+    }
+
+    status = pjmedia_codec_mgr_get_default_param(mgr, ci[0], &codec_param);
+    if (status != PJ_SUCCESS) {
+	rc = -50;
+	goto on_return;
+    }
+
+    codec_param.info.avg_bps = bitrate;
+    codec_param.setting.vad = 0;
+
+    status = codec->op->init(codec, pool);
+    if (status != PJ_SUCCESS) {
+	rc = -60;
+	goto on_return;
+    }
+
+    status = codec->op->open(codec, &codec_param);
+    if (status != PJ_SUCCESS) {
+	rc = -70;
+	goto on_return;
+    }
+
+    /* Open WAV file */
+    status = pjmedia_wav_player_port_create(pool, wav_file, 
+					    codec_param.info.frm_ptime, 
+					    PJMEDIA_FILE_NO_LOOP, 0, 
+					    &wav_port);
+    if (status != PJ_SUCCESS) {
+	rc = -80;
+	goto on_return;
+    }
+
+    /* Open output file */
+    output = fopen(TMP_OUT, "wb");
+    if (!output) {
+	rc = -90;
+	goto on_return;
+    }
+
+    /* Allocate buffer for PCM and encoded frames */
+    samples_per_frame = codec_param.info.clock_rate * codec_param.info.frm_ptime / 1000;
+    in_frame.buf = pj_pool_alloc(pool, samples_per_frame * 2);
+    out_frame.buf = (pj_uint8_t*) pj_pool_alloc(pool, samples_per_frame);
+
+    /* Loop read WAV file and encode and write to output file */
+    for (;;) {
+	in_frame.size = samples_per_frame * 2;
+	in_frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+
+	status = pjmedia_port_get_frame(wav_port, &in_frame);
+	if (status != PJ_SUCCESS || in_frame.type != PJMEDIA_FRAME_TYPE_AUDIO)
+	    break;
+
+	out_frame.size = samples_per_frame;
+	status = codec->op->encode(codec, &in_frame, samples_per_frame,
+				   &out_frame);
+	if (status != PJ_SUCCESS) {
+	    rc = -95;
+	    goto on_return;
+	}
+
+	if (out_frame.size) {
+	    fwrite(out_frame.buf, out_frame.size, 1, output);
+
+	    if (encoded_frame_len == 0)
+		encoded_frame_len = out_frame.size;
+	}    }
+
+    fclose(output);
+    output = NULL;
+    
+    /* Compare encoded files */
+    fref = fopen(ref_file, "rb");
+    if (!fref) {
+	rc = -100;
+	goto on_return;
+    }
+
+    output = fopen(TMP_OUT, "rb");
+    if (!output) {
+	rc = -110;
+	goto on_return;
+    }
+
+    pos = 0;
+    for (;;) {
+	int count;
+	
+	count = fread(in_frame.buf, encoded_frame_len, 1, fref);
+	if (count != 1)
+	    break;
+
+	count = fread(out_frame.buf, encoded_frame_len, 1, output);
+	if (count != 1)
+	    break;
+
+	if (memcmp(in_frame.buf, out_frame.buf, encoded_frame_len)) {
+	    unsigned i;
+	    pj_uint8_t *in = (pj_uint8_t*)in_frame.buf;
+	    pj_uint8_t *out = (pj_uint8_t*)out_frame.buf;
+
+	    for (i=0; i<encoded_frame_len; ++i) {
+		if (in[i] != out[i])
+		    break;
+	    }
+
+	    PJ_LOG(1,(THIS_FILE,"     failed: mismatch at pos %d", pos+i));
+	    rc = -200;
+	    break;
+	}
+
+	pos += encoded_frame_len;
+    }
+
+on_return:
+    if (output)
+	fclose(output);
+
+    if (fref)
+	fclose(fref);
+
+    if (codec) {
+	codec->op->close(codec);
+	pjmedia_codec_mgr_dealloc_codec(mgr, codec);
+    }
+
+    if (wav_port)
+	pjmedia_port_destroy(wav_port);
+
+    if (pool)
+	pj_pool_release(pool);
+
+    return rc;
+}
+
+
+
+static int codec_test_decode(pjmedia_codec_mgr *mgr, 
+			     char *codec_name, 
+			     unsigned bitrate,
+			     unsigned encoded_len,
+			     const char *in_file,
+			     const char *ref_file,
+			     void (*manip)(short *pcm, unsigned count))
+{
+    pj_str_t codec_id = pj_str(codec_name);
+    pj_pool_t *pool = NULL;
+    unsigned count, samples_per_frame, pos;
+    pjmedia_codec *codec = NULL;
+    const pjmedia_codec_info *ci[1];
+    pjmedia_codec_param codec_param;
+    pjmedia_frame out_frame;
+    void *pkt;
+    FILE *input = NULL, *output = NULL, *fref = NULL;
+    int rc = 0;
+    pj_status_t status;
+
+    pool = pj_pool_create(mem, "codec-vectors", 512, 512, NULL);
+    if (!pool)  {
+	rc = -20;
+	goto on_return;
+    }
+
+    /* Find and open the codec */
+    count = 1;
+    status = pjmedia_codec_mgr_find_codecs_by_id(mgr, &codec_id, &count, ci, NULL);
+    if (status != PJ_SUCCESS) {
+	rc = -30;
+	goto on_return;
+    }
+
+    status = pjmedia_codec_mgr_alloc_codec(mgr, ci[0], &codec);
+    if (status != PJ_SUCCESS) {
+	rc = -40;
+	goto on_return;
+    }
+
+    status = pjmedia_codec_mgr_get_default_param(mgr, ci[0], &codec_param);
+    if (status != PJ_SUCCESS) {
+	rc = -50;
+	goto on_return;
+    }
+
+    codec_param.info.avg_bps = bitrate;
+    codec_param.setting.vad = 0;
+
+    status = codec->op->init(codec, pool);
+    if (status != PJ_SUCCESS) {
+	rc = -60;
+	goto on_return;
+    }
+
+    status = codec->op->open(codec, &codec_param);
+    if (status != PJ_SUCCESS) {
+	rc = -70;
+	goto on_return;
+    }
+
+    /* Open input file */
+    input = fopen(in_file, "rb");
+    if (!input) {
+	rc = -80;
+	goto on_return;
+    }
+
+    /* Open output file */
+    output = fopen(TMP_OUT, "wb");
+    if (!output) {
+	rc = -90;
+	goto on_return;
+    }
+
+    /* Allocate buffer for PCM and encoded frames */
+    samples_per_frame = codec_param.info.clock_rate * codec_param.info.frm_ptime / 1000;
+    pkt = pj_pool_alloc(pool, samples_per_frame * 2);
+    out_frame.buf = (pj_uint8_t*) pj_pool_alloc(pool, samples_per_frame * 2);
+
+    /* Loop read WAV file and encode and write to output file */
+    for (;;) {
+	pjmedia_frame in_frame[2];
+	pj_timestamp ts;
+	unsigned count;
+
+	if (fread(pkt, encoded_len, 1, input) != 1)
+	    break;
+
+	count = 2;
+	if (codec->op->parse(codec, pkt, encoded_len, &ts, &count, in_frame) != PJ_SUCCESS) {
+	    rc = -100;
+	    goto on_return;
+	}
+
+	if (count != 1) {
+	    rc = -110;
+	    goto on_return;
+	}
+
+	if (codec->op->decode(codec, &in_frame[0], samples_per_frame*2, &out_frame) != PJ_SUCCESS) {
+	    rc = -120;
+	    goto on_return;
+	}
+
+	if (manip)
+	    manip((short*)out_frame.buf, samples_per_frame);
+
+	if (fwrite(out_frame.buf, out_frame.size, 1, output) != 1) {
+	    rc = -130;
+	    goto on_return;
+	}
+    }
+
+    fclose(input);
+    input = NULL;
+
+    fclose(output);
+    output = NULL;
+    
+    /* Compare encoded files */
+    fref = fopen(ref_file, "rb");
+    if (!fref) {
+	rc = -140;
+	goto on_return;
+    }
+
+    output = fopen(TMP_OUT, "rb");
+    if (!output) {
+	rc = -110;
+	goto on_return;
+    }
+
+    pos = 0;
+    for (;;) {
+	int count;
+	
+	count = fread(pkt, samples_per_frame*2, 1, fref);
+	if (count != 1)
+	    break;
+
+	count = fread(out_frame.buf, samples_per_frame*2, 1, output);
+	if (count != 1)
+	    break;
+
+	if (memcmp(pkt, out_frame.buf, samples_per_frame*2)) {
+	    unsigned i;
+	    pj_int16_t *in = (pj_int16_t*)pkt;
+	    pj_int16_t *out = (pj_int16_t*)out_frame.buf;
+
+	    for (i=0; i<samples_per_frame; ++i) {
+		if (in[i] != out[i])
+		    break;
+	    }
+
+	    PJ_LOG(1,(THIS_FILE,"     failed: mismatch at samples %d", pos+i));
+	    rc = -200;
+	    break;
+	}
+
+	pos += samples_per_frame;
+    }
+
+on_return:
+    if (output)
+	fclose(output);
+
+    if (fref)
+	fclose(fref);
+
+    if (input)
+	fclose(input);
+
+    if (codec) {
+	codec->op->close(codec);
+	pjmedia_codec_mgr_dealloc_codec(mgr, codec);
+    }
+
+    if (pool)
+	pj_pool_release(pool);
+
+    return rc;
+}
+
+
+/* For ITU testing, off the 2 lsbs. */
+static void g7221_pcm_manip(short *pcm, unsigned count)
+{
+    unsigned i;
+    for (i=0; i<count; i++)
+        pcm[i] &= 0xfffc;
+
+}
+
+int codec_test_vectors(void)
+{
+    pjmedia_endpt *endpt;
+    pjmedia_codec_mgr *mgr;
+    int rc, rc_final = 0;
+    struct enc_vectors {
+	char	    *codec_name;
+	unsigned     bit_rate;
+	const char  *wav_file;
+	const char  *ref_file;
+    } enc_vectors[] = 
+    {
+#if PJMEDIA_HAS_G7221_CODEC
+	{ "G7221/16000/1", 24000, 
+	  "../src/test/vectors/g722_1_enc_in.wav", 
+	  "../src/test/vectors/g722_1_enc_out_24000_be.pak"
+	},
+	{ "G7221/16000/1", 32000, 
+	  "../src/test/vectors/g722_1_enc_in.wav", 
+	  "../src/test/vectors/g722_1_enc_out_32000_be.pak"
+	},
+#endif
+    };
+    struct dec_vectors {
+	char	    *codec_name;
+	unsigned     bit_rate;
+	unsigned     encoded_frame_len;
+	void	    (*manip)(short *pcm, unsigned count);
+	const char  *enc_file;
+	const char  *ref_file;
+    } dec_vectors[] = 
+    {
+#if PJMEDIA_HAS_G7221_CODEC
+	{ "G7221/16000/1", 24000, 60,
+	  &g7221_pcm_manip,
+	  "../src/test/vectors/g722_1_enc_out_24000_be.pak", 
+	  "../src/test/vectors/g722_1_dec_out_24000.pcm"
+	},
+	{ "G7221/16000/1", 32000, 80,
+	  &g7221_pcm_manip,
+	  "../src/test/vectors/g722_1_enc_out_32000_be.pak", 
+	  "../src/test/vectors/g722_1_dec_out_32000.pcm"
+	},
+#endif
+    };
+    unsigned i;
+    pj_status_t status;
+
+    status = pjmedia_endpt_create(mem, NULL, 0, &endpt);
+    if (status != PJ_SUCCESS)
+	return -5;
+
+    mgr = pjmedia_endpt_get_codec_mgr(endpt);
+
+#if PJMEDIA_HAS_G7221_CODEC
+    status = pjmedia_codec_g7221_init(endpt);
+    if (status != PJ_SUCCESS) {
+	pjmedia_endpt_destroy(endpt);
+	return -7;
+    }
+#endif
+
+    PJ_LOG(3,(THIS_FILE,"  encode tests:"));
+    for (i=0; i<PJ_ARRAY_SIZE(enc_vectors); ++i) {
+	PJ_LOG(3,(THIS_FILE,"    %s @%d bps", enc_vectors[i].codec_name, 
+		  enc_vectors[i].bit_rate));
+	rc = codec_test_encode(mgr, enc_vectors[i].codec_name,
+			       enc_vectors[i].bit_rate,
+			       enc_vectors[i].wav_file,
+			       enc_vectors[i].ref_file);
+	if (rc != 0)
+	    rc_final = rc;
+    }
+
+    PJ_LOG(3,(THIS_FILE,"  decode tests:"));
+    for (i=0; i<PJ_ARRAY_SIZE(dec_vectors); ++i) {
+	PJ_LOG(3,(THIS_FILE,"    %s @%d bps", dec_vectors[i].codec_name, 
+		  dec_vectors[i].bit_rate));
+	rc = codec_test_decode(mgr, dec_vectors[i].codec_name,
+			       dec_vectors[i].bit_rate,
+			       dec_vectors[i].encoded_frame_len,
+			       dec_vectors[i].enc_file,
+			       dec_vectors[i].ref_file,
+			       dec_vectors[i].manip);
+	if (rc != 0)
+	    rc_final = rc;
+    }
+
+    if (pj_file_exists(TMP_OUT))
+	pj_file_delete(TMP_OUT);
+
+    pjmedia_endpt_destroy(endpt);
+    return rc_final;
+}
+
diff --git a/pjmedia/src/test/jbuf_test.c b/pjmedia/src/test/jbuf_test.c
index 3e89648..4421c5e 100644
--- a/pjmedia/src/test/jbuf_test.c
+++ b/pjmedia/src/test/jbuf_test.c
@@ -28,7 +28,7 @@
 #define JB_PTIME	    20
 #define JB_BUF_SIZE	    50
 
-#define REPORT
+//#define REPORT
 //#define PRINT_COMMENT
 
 typedef struct test_param_t {
diff --git a/pjmedia/src/test/test.c b/pjmedia/src/test/test.c
index 0c39963..d5bfd4e 100644
--- a/pjmedia/src/test/test.c
+++ b/pjmedia/src/test/test.c
@@ -56,12 +56,13 @@
 
     mem = &caching_pool.factory;
 
-    //sdp_neg_test();
-    //sdp_test (&caching_pool.factory);
-    //rtp_test(&caching_pool.factory);
-    //session_test (&caching_pool.factory);
+    DO_TEST(sdp_neg_test());
+    //DO_TEST(sdp_test (&caching_pool.factory));
+    //DO_TEST(rtp_test(&caching_pool.factory));
+    //DO_TEST(session_test (&caching_pool.factory));
     DO_TEST(jbuf_main());
-    //DO_TEST(mips_test());
+    DO_TEST(mips_test());
+    DO_TEST(codec_test_vectors());
 
     PJ_LOG(3,(THIS_FILE," "));
 
diff --git a/pjmedia/src/test/test.h b/pjmedia/src/test/test.h
index d0d9f71..267be12 100644
--- a/pjmedia/src/test/test.h
+++ b/pjmedia/src/test/test.h
@@ -30,6 +30,7 @@
 int jbuf_main(void);
 int sdp_neg_test(void);
 int mips_test(void);
+int codec_test_vectors(void);
 
 extern pj_pool_factory *mem;
 void app_perror(pj_status_t status, const char *title);
diff --git a/pjmedia/src/test/vectors/g722_1_dec_out_24000.pcm b/pjmedia/src/test/vectors/g722_1_dec_out_24000.pcm
new file mode 100644
index 0000000..5d725e7
--- /dev/null
+++ b/pjmedia/src/test/vectors/g722_1_dec_out_24000.pcm
Binary files differ
diff --git a/pjmedia/src/test/vectors/g722_1_dec_out_32000.pcm b/pjmedia/src/test/vectors/g722_1_dec_out_32000.pcm
new file mode 100644
index 0000000..e233b55
--- /dev/null
+++ b/pjmedia/src/test/vectors/g722_1_dec_out_32000.pcm
Binary files differ
diff --git a/pjmedia/src/test/vectors/g722_1_enc_in.wav b/pjmedia/src/test/vectors/g722_1_enc_in.wav
new file mode 100644
index 0000000..aa546d0
--- /dev/null
+++ b/pjmedia/src/test/vectors/g722_1_enc_in.wav
Binary files differ
diff --git a/pjmedia/src/test/vectors/g722_1_enc_out_24000_be.pak b/pjmedia/src/test/vectors/g722_1_enc_out_24000_be.pak
new file mode 100644
index 0000000..3c96144
--- /dev/null
+++ b/pjmedia/src/test/vectors/g722_1_enc_out_24000_be.pak
Binary files differ
diff --git a/pjmedia/src/test/vectors/g722_1_enc_out_32000_be.pak b/pjmedia/src/test/vectors/g722_1_enc_out_32000_be.pak
new file mode 100644
index 0000000..2e080e3
--- /dev/null
+++ b/pjmedia/src/test/vectors/g722_1_enc_out_32000_be.pak
Binary files differ
diff --git a/pjmedia/src/test/vectors/swapendian.c b/pjmedia/src/test/vectors/swapendian.c
new file mode 100644
index 0000000..2865d8c
--- /dev/null
+++ b/pjmedia/src/test/vectors/swapendian.c
@@ -0,0 +1,54 @@
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+    FILE *in, *out;
+    char frm[2];
+    unsigned count;
+
+    if (argc != 3) {
+	puts("Usage: swapendian input.pcm OUTPUT.PCM");
+	return 1;
+    }
+
+    in = fopen(argv[1], "rb");
+    if (!in) {
+	puts("Open error");
+	return 1;
+    }
+
+    out = fopen(argv[2], "wb");
+    if (!out) {
+	puts("Open error");
+	fclose(in);
+	return 1;
+    }
+
+    count = 0;
+    for (;;) {
+	char tmp;
+
+	if (fread(frm, 2, 1, in) != 1)
+	    break;
+
+	tmp = frm[0];
+	frm[0] = frm[1];
+	frm[1] = tmp;
+
+	if (fwrite(frm, 2, 1, out) != 1) {
+	    puts("Write error");
+	    break;
+	}
+
+	++count;
+    }
+
+    printf("%d samples converted\n", count);
+
+    fclose(in);
+    fclose(out);
+
+    return 0;
+}
+
+