Transcoder: Refactor sample writer to not block clients.
This commit fixes an issue with hangs in the transcoder
by not letting samples from all tracks go directly to the
backing muxer. This relies on tracks being synchronized by
the sample reader and that the muxer buffers and interleaves
samples internally.
Test: Transcoder unit tests.
Fixes: 165374867
Change-Id: I99d2dbfa4eb094b7364848a1a8aa3d3d8742140d
diff --git a/media/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp b/media/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp
index a2ffbe4..9713e17 100644
--- a/media/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp
+++ b/media/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp
@@ -165,21 +165,23 @@
ASSERT_TRUE(transcoder.start());
// Pull transcoder's output samples and compare against input checksums.
+ bool eos = false;
uint64_t sampleCount = 0;
- std::shared_ptr<MediaSample> sample;
- std::shared_ptr<MediaSampleQueue> outputQueue = transcoder.getOutputQueue();
- while (!outputQueue->dequeue(&sample)) {
- ASSERT_NE(sample, nullptr);
+ transcoder.setSampleConsumer(
+ [&sampleCount, &sampleChecksums, &eos](const std::shared_ptr<MediaSample>& sample) {
+ ASSERT_NE(sample, nullptr);
+ EXPECT_FALSE(eos);
- if (sample->info.flags & SAMPLE_FLAG_END_OF_STREAM) {
- break;
- }
+ if (sample->info.flags & SAMPLE_FLAG_END_OF_STREAM) {
+ eos = true;
+ } else {
+ SampleID sampleId{sample->buffer, static_cast<ssize_t>(sample->info.size)};
+ EXPECT_TRUE(sampleId == sampleChecksums[sampleCount]);
+ ++sampleCount;
+ }
+ });
- SampleID sampleId{sample->buffer, static_cast<ssize_t>(sample->info.size)};
- EXPECT_TRUE(sampleId == sampleChecksums[sampleCount]);
- ++sampleCount;
- }
-
+ callback->waitUntilFinished();
EXPECT_EQ(sampleCount, sampleChecksums.size());
EXPECT_TRUE(transcoder.stop());
}