From 5720dfd49a965a9f45a0cdc930ab33f2408e9a5b Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Sat, 28 Mar 2015 15:31:39 +0100 Subject: [PATCH] MediaKit: Update NodeTest * Update it to actual API and restore build. * Add SyncToNode test. --- src/tests/kits/media/nodetest/ConsumerNode.cpp | 4 ++-- src/tests/kits/media/nodetest/Jamfile | 2 +- src/tests/kits/media/nodetest/ProducerNode.cpp | 4 ++-- src/tests/kits/media/nodetest/main.cpp | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/tests/kits/media/nodetest/ConsumerNode.cpp b/src/tests/kits/media/nodetest/ConsumerNode.cpp index 6b39adcbfc..e9fb7a9d27 100644 --- a/src/tests/kits/media/nodetest/ConsumerNode.cpp +++ b/src/tests/kits/media/nodetest/ConsumerNode.cpp @@ -11,9 +11,9 @@ ConsumerNode::ConsumerNode() : + BMediaNode("ConsumerNode"), BBufferConsumer(B_MEDIA_RAW_AUDIO), - BMediaEventLooper(), - BMediaNode("ConsumerNode") + BMediaEventLooper() { out("ConsumerNode::ConsumerNode\n"); } diff --git a/src/tests/kits/media/nodetest/Jamfile b/src/tests/kits/media/nodetest/Jamfile index ad9f63364a..f47790973b 100644 --- a/src/tests/kits/media/nodetest/Jamfile +++ b/src/tests/kits/media/nodetest/Jamfile @@ -7,6 +7,6 @@ SimpleTest NodeTest ConsumerNode.cpp ProducerNode.cpp - : be media + : be media [ TargetLibsupc++ ] ; diff --git a/src/tests/kits/media/nodetest/ProducerNode.cpp b/src/tests/kits/media/nodetest/ProducerNode.cpp index 9465e8ba5b..13e47b4db8 100644 --- a/src/tests/kits/media/nodetest/ProducerNode.cpp +++ b/src/tests/kits/media/nodetest/ProducerNode.cpp @@ -14,9 +14,9 @@ ProducerNode::ProducerNode() : + BMediaNode("ProducerNode"), BBufferProducer(B_MEDIA_RAW_AUDIO), BMediaEventLooper(), - BMediaNode("ProducerNode"), mBufferGroup(0), mBufferProducerSem(-1), mBufferProducer(-1), @@ -443,7 +443,7 @@ ProducerNode::BufferProducer() buffer->Header()->start_time = TimeSource()->Now() + DELAY / 2; out("ProducerNode: SendBuffer, sheduled time = %5.4f\n", buffer->Header()->start_time / 1E6); - rv = SendBuffer(buffer, mOutput.destination); + rv = SendBuffer(buffer, mOutput.source, mOutput.destination); if (rv != B_OK) { } } diff --git a/src/tests/kits/media/nodetest/main.cpp b/src/tests/kits/media/nodetest/main.cpp index a6f686d386..481277e763 100644 --- a/src/tests/kits/media/nodetest/main.cpp +++ b/src/tests/kits/media/nodetest/main.cpp @@ -210,6 +210,12 @@ int main() rv = roster->StartNode(sourceNode, start); val(rv); + out("Testing SyncToNode performance time set is 5 sec\n"); + rv = roster->SyncToNode(sourceNode, + producer->TimeSource()->PerformanceTimeFor( + BTimeSource::RealTime() + 5000000), B_INFINITE_TIMEOUT); + val(rv); + out("########################## PRESS ENTER TO QUIT ##########################\n"); getchar();