Fix frame PTS when decoder returns multiple frames in a row

Fixes garbled audio for certain codes (e.g. G.729)

Also adds some additional debug output

Fixes #410

Change-Id: I1dbae2638f1e55bf80bb96549a75b9c4b82d08bf

recording-daemon/decoder.c

@@ -174,6 +174,12 @@ err:
 
 
 static int decoder_got_frame(decoder_t *dec, output_t *output, metafile_t *metafile, AVFrame *frame) {
+	dbg("got frame pts %llu samples %u contents %02x%02x%02x%02x...", (unsigned long long) frame->pts, frame->nb_samples,
+			(unsigned int) frame->extended_data[0][0],
+			(unsigned int) frame->extended_data[0][1],
+			(unsigned int) frame->extended_data[0][2],
+			(unsigned int) frame->extended_data[0][3]);
+
 	// determine and save sample type
 	if (G_UNLIKELY(dec->in_format.format == -1))
 		dec->in_format.format = dec->out_format.format = frame->format;
@@ -312,11 +318,15 @@ int decoder_input(decoder_t *dec, const str *data, unsigned long ts, output_t *o
 #endif
 
 		if (got_frame) {
+			dbg("raw frame from decoder pts %llu samples %u", (unsigned long long) frame->pts, frame->nb_samples);
+
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 36, 0)
 			frame->pts = frame->pkt_pts;
 #endif
 			if (G_UNLIKELY(frame->pts == AV_NOPTS_VALUE))
 				frame->pts = dec->avpkt.pts;
+			dec->avpkt.pts += frame->nb_samples;
+
 			if (decoder_got_frame(dec, output, metafile, frame))
 				return -1;
 			frame = NULL;

recording-daemon/log.h

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define dbg(fmt, ...) ilog(LOG_DEBUG, fmt, ##__VA_ARGS__)
+#define dbg(fmt, ...) ilog(LOG_DEBUG, "[%s:%i] " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
 
 void __ilog(int prio, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));