Changeset - 2c5e57ebc103
Parent rev.
Child rev.
[Not reviewed]
stream
0 4 0
Hasan Yavuz ÖZDERYA - 8 years ago 2018-04-03 16:08:38
hy@ozderya.net
remove ambiguity with `QObject::sink` method
4 files changed with 10 insertions and 10 deletions:
src/source.cpp
1
1
src/source.h
1
1
tests/test.cpp
3
3
tests/test_stream.cpp
5
5
0 comments (0 inline, 0 general)
src/source.cpp
➞
Show inline comments
 
@@ -20,25 +20,25 @@
 
#include <QtGlobal>
 

			




	
	
	
		
 
#include "source.h"

			




	
	
	
		
 

			




	
	
	
		
 
Source::~Source()

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (auto sink : sinks)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        sink->setSource(NULL);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Source::connect(Sink* sink)

			




	
	
	
		
 
void Source::connectSink(Sink* sink)

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_ASSERT(!sinks.contains(sink));

			




	
	
	
		
 
    Q_ASSERT(sink->connectedSource() == NULL);

			




	
	
	
		
 

			




	
	
	
		
 
    sinks.append(sink);

			




	
	
	
		
 
    sink->setSource(this);

			




	
	
	
		
 
    sink->setNumChannels(numChannels(), hasX());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Source::disconnect(Sink* sink)

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_ASSERT(sinks.contains(sink));

			




        

    


    
    

    

        

                

                    src/source.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,25 +30,25 @@ class Source

			




	
	
	
		
 
public:

			




	
	
	
		
 
    /// Virtual destructor. Must be called by implementors to notify sinks.

			




	
	
	
		
 
    virtual ~Source();

			




	
	
	
		
 

			




	
	
	
		
 
    /// Returns true if source has X data

			




	
	
	
		
 
    virtual bool hasX() const = 0;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Returns number of channels

			




	
	
	
		
 
    virtual unsigned numChannels() const = 0;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Connects a sink to this source. Trying to connect an already

			




	
	
	
		
 
    /// connected sink is an error.

			




	
	
	
		
 
    void connect(Sink* sink);

			




	
	
	
		
 
    void connectSink(Sink* sink);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Disconnects an already connected sink. Trying to disconnect an

			




	
	
	
		
 
    /// unconnected sink is an error.

			




	
	
	
		
 
    void disconnect(Sink* sink);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Disconnects all connected sinks.

			




	
	
	
		
 
    void disconnectSinks();

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
    /// Feeds "in" given data to connected sinks

			




	
	
	
		
 
    virtual void feedOut(const SamplePack& data) const;

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    tests/test.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -89,62 +89,62 @@ TEST_CASE("sink must be created unconnec

			




	
	
	
		
 
    REQUIRE(sink.connectedSource() == NULL);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
TEST_CASE("source", "[memory, stream]")

			




	
	
	
		
 
{

			




	
	
	
		
 
    TestSink sink;

			




	
	
	
		
 

			




	
	
	
		
 
    TestSource source(3, false);

			




	
	
	
		
 

			




	
	
	
		
 
    REQUIRE(source.numChannels() == 3);

			




	
	
	
		
 
    REQUIRE(source.hasX() == false);

			




	
	
	
		
 

			




	
	
	
		
 
    source.connect(&sink);

			




	
	
	
		
 
    source.connectSink(&sink);

			




	
	
	
		
 
    REQUIRE(sink.numChannels() == 3);

			




	
	
	
		
 
    REQUIRE(sink.hasX() == false);

			




	
	
	
		
 

			




	
	
	
		
 
    source._setNumChannels(5, true);

			




	
	
	
		
 
    REQUIRE(sink.numChannels() == 5);

			




	
	
	
		
 
    REQUIRE(sink.hasX() == true);

			




	
	
	
		
 

			




	
	
	
		
 
    SamplePack pack(100, 5, true);

			




	
	
	
		
 
    source._feed(pack);

			




	
	
	
		
 
    REQUIRE(sink.totalFed == 100);

			




	
	
	
		
 

			




	
	
	
		
 
    source.disconnect(&sink);

			




	
	
	
		
 
    source._feed(pack);

			




	
	
	
		
 
    REQUIRE(sink.totalFed == 100);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
TEST_CASE("source must set/unset sink 'source'", "[memory, stream]")

			




	
	
	
		
 
{

			




	
	
	
		
 
    TestSink sink;

			




	
	
	
		
 
    TestSource source(3, false);

			




	
	
	
		
 

			




	
	
	
		
 
    source.connect(&sink);

			




	
	
	
		
 
    source.connectSink(&sink);

			




	
	
	
		
 
    REQUIRE(sink.connectedSource() == &source);

			




	
	
	
		
 

			




	
	
	
		
 
    source.disconnect(&sink);

			




	
	
	
		
 
    REQUIRE(sink.connectedSource() == NULL);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
TEST_CASE("source disconnect all sinks", "[memory, stream]")

			




	
	
	
		
 
{

			




	
	
	
		
 
    TestSink sinks[3];

			




	
	
	
		
 
    TestSource source(3, false);

			




	
	
	
		
 

			




	
	
	
		
 
    // connect sinks

			




	
	
	
		
 
    for (int i = 0; i < 3; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        source.connect(&sinks[i]);

			




	
	
	
		
 
        source.connectSink(&sinks[i]);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    source.disconnectSinks();

			




	
	
	
		
 
    for (int i = 0; i < 3; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        REQUIRE(sinks[i].connectedSource() == NULL);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
TEST_CASE("IndexBuffer", "[memory, buffer]")

			




	
	
	
		
 
{

			




	
	
	
		
 
    IndexBuffer buf(10);

			




        

    


    
    

    

        

                

                    tests/test_stream.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,25 +43,25 @@ TEST_CASE("construction of stream with p

			




	
	
	
		
 
    for (unsigned i = 0; i < 4; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        const StreamChannel* c = s.channel(i);

			




	
	
	
		
 
        REQUIRE(c != NULL);

			




	
	
	
		
 
        REQUIRE(c->index() == i);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
TEST_CASE("changing stream number of channels via sink", "[memory, stream, sink]")

			




	
	
	
		
 
{

			




	
	
	
		
 
    Stream s;

			




	
	
	
		
 
    TestSource so(3, false);

			




	
	
	
		
 
    so.connect(&s);

			




	
	
	
		
 
    so.connectSink(&s);

			




	
	
	
		
 

			




	
	
	
		
 
    // nc=3, x= false

			




	
	
	
		
 
    REQUIRE(s.numChannels() == 3);

			




	
	
	
		
 
    REQUIRE(!s.hasX());

			




	
	
	
		
 
    for (unsigned i = 0; i < 3; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        const StreamChannel* c = s.channel(i);

			




	
	
	
		
 
        REQUIRE(c != NULL);

			




	
	
	
		
 
        REQUIRE(c->index() == i);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // increase nc value, add X

			




	
	
		
 
@@ -97,25 +97,25 @@ TEST_CASE("adding data to a stream with 

			




	
	
	
		
 

			




	
	
	
		
 
    // prepare data

			




	
	
	
		
 
    SamplePack pack(5, 3, false);

			




	
	
	
		
 
    for (unsigned ci = 0; ci < 3; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        for (unsigned i = 0; i < 5; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            pack.data(ci)[i] = i;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    TestSource so(3, false);

			




	
	
	
		
 
    so.connect(&s);

			




	
	
	
		
 
    so.connectSink(&s);

			




	
	
	
		
 

			




	
	
	
		
 
    // test

			




	
	
	
		
 
    so._feed(pack);

			




	
	
	
		
 

			




	
	
	
		
 
    for (unsigned ci = 0; ci < 3; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        const StreamChannel* c = s.channel(ci);

			




	
	
	
		
 
        const FrameBuffer* y = c->yData();

			




	
	
	
		
 

			




	
	
	
		
 
        for (unsigned i = 0; i < 5; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            REQUIRE(y->sample(i) == 0);

			




	
	
		
 
@@ -138,25 +138,25 @@ TEST_CASE("adding data to a stream with 

			




	
	
	
		
 
        for (unsigned i = 0; i < 5; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            pack.data(ci)[i] = i;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    // x data

			




	
	
	
		
 
    for (unsigned i = 0; i < 5; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        pack.xData()[i] = i+10;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    TestSource so(3, true);

			




	
	
	
		
 
    so.connect(&s);

			




	
	
	
		
 
    so.connectSink(&s);

			




	
	
	
		
 

			




	
	
	
		
 
    // test

			




	
	
	
		
 
    so._feed(pack);

			




	
	
	
		
 

			




	
	
	
		
 
    for (unsigned ci = 0; ci < 3; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        const StreamChannel* c = s.channel(ci);

			




	
	
	
		
 
        const FrameBuffer* y = c->yData();

			




	
	
	
		
 

			




	
	
	
		
 
        for (unsigned i = 0; i < 5; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            REQUIRE(y->sample(i) == 0);

			




	
	
		
 
@@ -185,25 +185,25 @@ TEST_CASE("paused stream shouldn't store

			




	
	
	
		
 

			




	
	
	
		
 
    // prepare data

			




	
	
	
		
 
    SamplePack pack(5, 3, false);

			




	
	
	
		
 
    for (unsigned ci = 0; ci < 3; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        for (unsigned i = 0; i < 5; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            pack.data(ci)[i] = i;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    TestSource so(3, false);

			




	
	
	
		
 
    so.connect(&s);

			




	
	
	
		
 
    so.connectSink(&s);

			




	
	
	
		
 

			




	
	
	
		
 
    // test

			




	
	
	
		
 
    s.pause(true);

			




	
	
	
		
 
    so._feed(pack);

			




	
	
	
		
 

			




	
	
	
		
 
    for (unsigned ci = 0; ci < 3; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        const StreamChannel* c = s.channel(ci);

			




	
	
	
		
 
        const FrameBuffer* y = c->yData();

			




	
	
	
		
 

			




	
	
	
		
 
        for (unsigned i = 0; i < 10; i++)

			




	
	
	
		
 
        {

			




	
	
		
 
@@ -218,25 +218,25 @@ TEST_CASE("clear stream data", "[memory,

			




	
	
	
		
 

			




	
	
	
		
 
    // prepare data

			




	
	
	
		
 
    SamplePack pack(5, 3, false);

			




	
	
	
		
 
    for (unsigned ci = 0; ci < 3; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        for (unsigned i = 0; i < 5; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            pack.data(ci)[i] = i;

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    TestSource so(3, false);

			




	
	
	
		
 
    so.connect(&s);

			




	
	
	
		
 
    so.connectSink(&s);

			




	
	
	
		
 

			




	
	
	
		
 
    // test

			




	
	
	
		
 
    so._feed(pack);

			




	
	
	
		
 
    s.clear();

			




	
	
	
		
 

			




	
	
	
		
 
    for (unsigned ci = 0; ci < 3; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        const StreamChannel* c = s.channel(ci);

			




	
	
	
		
 
        const FrameBuffer* y = c->yData();

			




	
	
	
		
 

			




	
	
	
		
 
        for (unsigned i = 0; i < 10; i++)

			




	
	
	
		
 
        {

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support