diff --git a/include/gapk/procqueue.h b/include/gapk/procqueue.h
index 18a644f..2b1f1d1 100644
--- a/include/gapk/procqueue.h
+++ b/include/gapk/procqueue.h
@@ -44,4 +44,8 @@ int			pq_execute(struct pq *pq);
 int pq_queue_file_input(struct pq *pq, FILE *src, unsigned int block_len);
 int pq_queue_file_output(struct pq *pq, FILE *dst, unsigned int block_len);
 
+/* Format */
+struct format_desc;
+int pq_queue_fmt_convert(struct pq *pq, const struct format_desc *fmt, int to_from_n);
+
 #endif /* __GAPK_PROCQUEUE_H__ */
diff --git a/src/Makefile.am b/src/Makefile.am
index 43d046e..7eed04d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,6 @@ AM_LDFLAGS=$(LIBOSMOCODEC_LIBS) ${OPENCORE_AMRNB_LIBS} ${LIBGSM_LIBS}
 
 bin_PROGRAMS = gapk
 gapk_SOURCES =	main.c	\
-		procqueue.c pq_file.c \
+		procqueue.c pq_file.c pq_format.c \
 		formats.c fmt_amr.c fmt_gsm.c fmt_hr_ref.c fmt_racal.c \
 		codecs.c codec_pcm.c codec_hr.c codec_fr.c codec_efr.c
diff --git a/src/pq_format.c b/src/pq_format.c
new file mode 100644
index 0000000..876ac19
--- /dev/null
+++ b/src/pq_format.c
@@ -0,0 +1,61 @@
+/* Process Queue: Format handling tasks */
+
+/*
+ * This file is part of gapk (GSM Audio Pocket Knife).
+ *
+ * gapk 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * gapk 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 gapk.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <errno.h>
+#include <stdint.h>
+
+#include <gapk/codecs.h>
+#include <gapk/formats.h>
+#include <gapk/procqueue.h>
+
+
+static int
+pq_cb_fmt_convert(void *_state, uint8_t *out, const uint8_t *in)
+{
+	fmt_conv_cb_t f = _state;
+	return f(out, in);
+}
+
+int
+pq_queue_fmt_convert(struct pq *pq, const struct format_desc *fmt, int to_from_n)
+{
+	struct pq_item *item;
+	const struct codec_desc *codec = codec_get_from_type(fmt->codec_type);
+
+	if (!codec)
+		return -EINVAL;
+
+	item = pq_add_item(pq);
+	if (!item)
+		return -ENOMEM;
+
+	if (to_from_n) {
+		item->len_in  = codec->canon_frame_len;
+		item->len_out = fmt->frame_len;
+		item->state   = fmt->conv_from_canon;
+	} else {
+		item->len_in  = fmt->frame_len;
+		item->len_out = codec->canon_frame_len;
+		item->state   = fmt->conv_to_canon;
+	}
+
+	item->proc = pq_cb_fmt_convert;
+
+	return 0;
+}