X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=session.c;h=e1bb4f9880d36a8f64f8603827a7df8585d088bc;hp=0c864059f60af76ae28e168dd4a29ba308ef1850;hb=e9a3c933ea8d77a46b881e525c2cfaf71b23041d;hpb=077fa8acbcb8b585af6f5323f16221940a27a72e

diff --git a/session.c b/session.c
index 0c86405..e1bb4f9 100644
--- a/session.c
+++ b/session.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include "config.h"
 #include <inttypes.h>
 #include <glib.h>
 
@@ -128,19 +128,27 @@ static int srd_inst_send_meta(struct srd_decoder_inst *di, int key,
 		GVariant *data)
 {
 	PyObject *py_ret;
+	GSList *l;
+	struct srd_decoder_inst *next_di;
+	int ret;
 
 	if (key != SRD_CONF_SAMPLERATE)
 		/* This is the only key we pass on to the decoder for now. */
 		return SRD_OK;
 
-	if (!PyObject_HasAttrString(di->py_inst, "metadata"))
-		/* This decoder doesn't want metadata, that's fine. */
-		return SRD_OK;
+	if (PyObject_HasAttrString(di->py_inst, "metadata")) {
+		py_ret = PyObject_CallMethod(di->py_inst, "metadata", "lK",
+				(long)SRD_CONF_SAMPLERATE,
+				(unsigned long long)g_variant_get_uint64(data));
+		Py_XDECREF(py_ret);
+	}
 
-	py_ret = PyObject_CallMethod(di->py_inst, "metadata", "lK",
-			(long)SRD_CONF_SAMPLERATE,
-			(unsigned long long)g_variant_get_uint64(data));
-	Py_XDECREF(py_ret);
+	/* Push metadata to all the PDs stacked on top of this one. */
+	for (l = di->next_di; l; l = l->next) {
+		next_di = l->data;
+		if ((ret = srd_inst_send_meta(next_di, key, data)) != SRD_OK)
+			return ret;
+	}
 
 	return SRD_OK;
 }
@@ -212,23 +220,24 @@ SRD_API int srd_session_metadata_set(struct srd_session *sess, int key,
  * in channel order, in the least amount of space possible. The default
  * channel set consists of all required channels + all optional channels.
  *
- * The size of a sample in inbuf is the unit size passed to
- * srd_inst_channel_set_all(). If no channel map has been configured, it is
- * the minimum number of bytes needed to store the default channels.
+ * The size of a sample in inbuf is 'unitsize' bytes. If no channel map
+ * has been configured, it is the minimum number of bytes needed to store
+ * the default channels.
  *
- * @param sess The session to use.
+ * @param sess The session to use. Must not be NULL.
  * @param start_samplenum The sample number of the first sample in this chunk.
  * @param end_samplenum The sample number of the last sample in this chunk.
- * @param inbuf Pointer to sample data.
- * @param inbuflen Length in bytes of the buffer.
+ * @param inbuf Pointer to sample data. Must not be NULL.
+ * @param inbuflen Length in bytes of the buffer. Must be > 0.
+ * @param unitsize The number of bytes per sample. Must be > 0.
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *
- * @since 0.3.0
+ * @since 0.4.0
  */
 SRD_API int srd_session_send(struct srd_session *sess,
 		uint64_t start_samplenum, uint64_t end_samplenum,
-		const uint8_t *inbuf, uint64_t inbuflen)
+		const uint8_t *inbuf, uint64_t inbuflen, uint64_t unitsize)
 {
 	GSList *d;
 	int ret;
@@ -238,13 +247,9 @@ SRD_API int srd_session_send(struct srd_session *sess,
 		return SRD_ERR_ARG;
 	}
 
-	srd_dbg("Calling decode() on all instances with starting sample "
-			"number %" PRIu64 ", %" PRIu64 " bytes at 0x%p",
-			start_samplenum, inbuflen, inbuf);
-
 	for (d = sess->di_list; d; d = d->next) {
 		if ((ret = srd_inst_decode(d->data, start_samplenum,
-				end_samplenum, inbuf, inbuflen)) != SRD_OK)
+				end_samplenum, inbuf, inbuflen, unitsize)) != SRD_OK)
 			return ret;
 	}