Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
ca1b22ee
Commit
ca1b22ee
authored
Nov 09, 2019
by
Wieland Morgenstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
readerControllerTest: new load API with std::list
parent
b651b927
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
readerControllerAsyncTest.cpp
lib/src/test/readerControllerAsyncTest.cpp
+1
-1
readerControllerTest.cpp
lib/src/test/readerControllerTest.cpp
+13
-13
No files found.
lib/src/test/readerControllerAsyncTest.cpp
View file @
ca1b22ee
...
...
@@ -113,7 +113,7 @@ void testAsyncLoading() {
ENSURE
(
preloadedFrames
>=
numReaders
,
"Controller init should start pre-loading at least one frame per reader"
);
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
Input
::
MetadataChunk
metadata
;
mtime_t
date
;
...
...
lib/src/test/readerControllerTest.cpp
View file @
ca1b22ee
...
...
@@ -117,7 +117,7 @@ void testLoadedDate() {
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
Input
::
MetadataChunk
metadata
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
readerController
->
load
(
date
,
frames
,
audio
,
metadata
);
...
...
@@ -198,7 +198,7 @@ void testLoadedDateWithAudioReader() {
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
Input
::
MetadataChunk
metadata
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
readerController
->
load
(
date
,
frames
,
audio
,
metadata
);
...
...
@@ -240,7 +240,7 @@ void testSeekWithImage() {
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
Input
::
MetadataChunk
metadata
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
readerController
->
load
(
date
,
frames
,
audio
,
metadata
);
...
...
@@ -294,7 +294,7 @@ void testEOSAudio() {
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
Input
::
MetadataChunk
metadata
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
std
::
tuple
<
Input
::
ReadStatus
,
Input
::
ReadStatus
,
Input
::
ReadStatus
>
status
=
...
...
@@ -326,7 +326,7 @@ void testTryAgainAudio() {
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
Input
::
MetadataChunk
metadata
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
std
::
tuple
<
Input
::
ReadStatus
,
Input
::
ReadStatus
,
Input
::
ReadStatus
>
status
=
...
...
@@ -357,7 +357,7 @@ void testAudioVideoResync() {
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
Input
::
MetadataChunk
metadata
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
std
::
tuple
<
Input
::
ReadStatus
,
Input
::
ReadStatus
,
Input
::
ReadStatus
>
status
=
...
...
@@ -378,7 +378,7 @@ void testAudioVideoResync() {
}
iBlk
++
;
}
ENSURE_EQ
(
date
,
audio
[
0
]
[
0
][
0
].
getTimestamp
(),
"audio and video should be synchro"
);
ENSURE_EQ
(
date
,
audio
.
front
()
[
0
][
0
].
getTimestamp
(),
"audio and video should be synchro"
);
readerController
->
releaseBuffer
(
frames
);
}
...
...
@@ -421,7 +421,7 @@ void testInputGroups(int fps, ReaderClockResolution clockResolution) {
}
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
Input
::
MetadataChunk
metadata
;
...
...
@@ -536,7 +536,7 @@ void testCurrentFrame() {
ENSURE
(
readerController
.
status
());
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
date
;
Input
::
MetadataChunk
metadata
;
...
...
@@ -660,7 +660,7 @@ void testAudioVideoSynchro() {
auto
readerController
=
Core
::
ReaderController
::
create
(
*
panoDef
,
*
audioPipe
,
readerFactory
);
ENSURE
(
readerController
.
status
());
std
::
map
<
readerid_t
,
Input
::
PotentialFrame
>
frames
;
std
::
vector
<
Audio
::
audioBlockGroupMap_t
>
audio
;
std
::
list
<
Audio
::
audioBlockGroupMap_t
>
audio
;
mtime_t
videoDate
;
Input
::
MetadataChunk
metadata
;
...
...
@@ -675,11 +675,11 @@ void testAudioVideoSynchro() {
1.5
);
ENSURE_EQ
(
nbAudioBlocksExpected
,
audio
.
size
(),
"Check number of audio blocks at the first load"
);
// Check that the first audio frame of the audio video group are well synchronized
ENSURE_EQ
(
videoDate
,
audio
[
0
]
.
at
(
audioVideoGrId
).
at
(
0
).
getTimestamp
(),
ENSURE_EQ
(
videoDate
,
audio
.
front
()
.
at
(
audioVideoGrId
).
at
(
0
).
getTimestamp
(),
"Check audio video synchronization of the audio video group"
);
ENSURE_EQ
(
videoDate
,
audio
[
0
]
.
at
(
audioVideoGrId
).
at
(
1
).
getTimestamp
(),
ENSURE_EQ
(
videoDate
,
audio
.
front
()
.
at
(
audioVideoGrId
).
at
(
1
).
getTimestamp
(),
"Check audio video synchronization of the audio video group"
);
ENSURE_EQ
(
videoDate
,
audio
[
0
]
.
at
(
audioOnlyGrId
).
at
(
2
).
getTimestamp
(),
ENSURE_EQ
(
videoDate
,
audio
.
front
()
.
at
(
audioOnlyGrId
).
at
(
2
).
getTimestamp
(),
"Check audio video synchronization of the audio video group"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment