Merge pull request #316 from avTranscoder/fix/java_binding

valnoel · web-flow · commit 7972d6599feb · 2020-02-14T15:18:31.000+01:00
Fix: Java binding
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
@@ -122,9 +122,10 @@ void InputStream::addPacket(const AVPacket& packet)
         return;
     }
 
-    LOG_DEBUG("Add a packet data for the stream " << _streamIndex << " to the cache")
-    _streamCache.push(CodedData());
-    _streamCache.back().copyData(packet.data, packet.size);
+    LOG_DEBUG("Add a packet data for the stream " << _streamIndex << " to the cache");
+    CodedData codedData;
+    codedData.copyData(packet.data, packet.size);
+    _streamCache.push(codedData);
 }
 
 void InputStream::clearBuffering()
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -540,7 +540,7 @@ StreamTranscoder::~StreamTranscoder()
 {
     for(std::vector<IFrame*>::iterator it = _decodedData.begin(); it != _decodedData.end(); ++it)
     {
-       delete(*it);
+        delete(*it);
     }
 
     if(_filteredData != NULL && _filteredData->isDataAllocated())
diff --git a/test/pyTest/testCodedData.py b/test/pyTest/testCodedData.py
@@ -0,0 +1,35 @@
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+def testCodedDataConstructors():
+    """
+    Try to create a CodedData instances from different constructors.
+    """
+    dataSize = 1024
+    codedData = av.CodedData(dataSize)
+    assert_equals(dataSize, codedData.getSize())
+
+    codedDataCopy = av.CodedData(codedData)
+    assert_equals(dataSize, codedDataCopy.getSize())
+
+
+def testCodedDataManagement():
+    """
+    Try to resize and assign CodedData data.
+    """
+    dataSize = 1024
+    codedData = av.CodedData()
+    codedData.resize(dataSize)
+    assert_equals(dataSize, codedData.getSize())
+
+    newDataSize = 128
+    codedData.assign(newDataSize, 1)
+    assert_equals(newDataSize, codedData.getSize())
+    data = codedData.getData()
+    for i in range(0, newDataSize):
+        assert_equals('\x01', data[i])
+
+    newDataSize = 256
+    codedData.resize(newDataSize)
+    assert_equals(newDataSize, codedData.getSize())

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,10 @@ void InputStream::addPacket(const AVPacket& packet)`
`122`	`122`	`return;`
`123`	`123`	`}`
`124`	`124`
`125`		`- LOG_DEBUG("Add a packet data for the stream " << _streamIndex << " to the cache")`
`126`		`- _streamCache.push(CodedData());`
`127`		`- _streamCache.back().copyData(packet.data, packet.size);`
	`125`	`+ LOG_DEBUG("Add a packet data for the stream " << _streamIndex << " to the cache");`
	`126`	`+ CodedData codedData;`
	`127`	`+ codedData.copyData(packet.data, packet.size);`
	`128`	`+ _streamCache.push(codedData);`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`void InputStream::clearBuffering()`
Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ StreamTranscoder::~StreamTranscoder()`
`540`	`540`	`{`
`541`	`541`	`for(std::vector<IFrame*>::iterator it = _decodedData.begin(); it != _decodedData.end(); ++it)`
`542`	`542`	`{`
`543`		`- delete(*it);`
	`543`	`+ delete(*it);`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`if(_filteredData != NULL && _filteredData->isDataAllocated())`