diff --git a/spa/include/spa/buffer/meta.h b/spa/include/spa/buffer/meta.h index c9202e1b9..f27351266 100644 --- a/spa/include/spa/buffer/meta.h +++ b/spa/include/spa/buffer/meta.h @@ -78,10 +78,11 @@ struct spa_meta_header { #define SPA_META_HEADER_FLAG_GAP (1 << 4) /**< data contains media neutral data */ #define SPA_META_HEADER_FLAG_DELTA_UNIT (1 << 5) /**< cannot be decoded independently */ uint32_t flags; /**< flags */ - uint32_t seq; /**< sequence number, increments with a + uint32_t offset; /**< offset in current cycle */ + uint64_t seq; /**< sequence number, increments with a * media specific frequency */ int64_t pts; /**< presentation timestamp */ - int64_t dts_offset; /**< decoding timestamp and a difference with pts */ + int64_t dts_offset; /**< decoding timestamp as a difference with pts */ }; /** metadata structure for Region or an array of these for RegionArray */ diff --git a/spa/include/spa/debug/buffer.h b/spa/include/spa/debug/buffer.h index bc769bcf4..8a64ea1cc 100644 --- a/spa/include/spa/debug/buffer.h +++ b/spa/include/spa/debug/buffer.h @@ -57,7 +57,8 @@ static inline int spa_debug_buffer(int indent, const struct spa_buffer *buffer) struct spa_meta_header *h = (struct spa_meta_header*)m->data; spa_debug("%*s" " struct spa_meta_header:", indent, ""); spa_debug("%*s" " flags: %08x", indent, "", h->flags); - spa_debug("%*s" " seq: %u", indent, "", h->seq); + spa_debug("%*s" " offset: %u", indent, "", h->offset); + spa_debug("%*s" " seq: %" PRIu64, indent, "", h->seq); spa_debug("%*s" " pts: %" PRIi64, indent, "", h->pts); spa_debug("%*s" " dts_offset: %" PRIi64, indent, "", h->dts_offset); break; diff --git a/spa/tests/test-buffer.c b/spa/tests/test-buffer.c index 0e72689f9..3e0e01b67 100644 --- a/spa/tests/test-buffer.c +++ b/spa/tests/test-buffer.c @@ -51,7 +51,8 @@ static void test_abi(void) spa_assert(SPA_META_LAST == 7); spa_assert(sizeof(struct spa_meta) == 16); - spa_assert(sizeof(struct spa_meta_header) == 24); + fprintf(stderr, "%zd", sizeof(struct spa_meta_header)); + spa_assert(sizeof(struct spa_meta_header) == 32); spa_assert(sizeof(struct spa_meta_region) == 16); spa_assert(sizeof(struct spa_meta_bitmap) == 20); spa_assert(sizeof(struct spa_meta_cursor) == 28);