From 6b0d81f4b05718145c504900c85623c4ec24eff0 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Mon, 29 Apr 2019 12:16:07 -0400
Subject: [PATCH] encoder: fix unit test compilation
Change-Id: Iaac2793ce2a6e0d32027afe168b1511ef0575016
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
src/media/media_encoder.cpp | 5 +----
test/unitTest/media/test_media_encoder.cpp | 13 ++++---------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index c3f56439b1..8da58dae68 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -726,10 +726,7 @@ MediaEncoder::enableAccel(bool enableAccel)
unsigned
MediaEncoder::getStreamCount() const
{
- if (outputCtx_)
- return outputCtx_->nb_streams;
- else
- return 0;
+ return (audioOpts_.isValid() + videoOpts_.isValid());
}
MediaStream
diff --git a/test/unitTest/media/test_media_encoder.cpp b/test/unitTest/media/test_media_encoder.cpp
index d7e60e790c..ec3877974f 100644
--- a/test/unitTest/media/test_media_encoder.cpp
+++ b/test/unitTest/media/test_media_encoder.cpp
@@ -146,23 +146,19 @@ MediaEncoderTest::testMultiStream()
const constexpr int nbChannels = 2;
const constexpr int width = 320;
const constexpr int height = 240;
- std::map<std::string, std::string> options;
- options["title"] = "Encoder Unit Test";
- options["description"] = "Description goes here";
- options["sample_rate"] = std::to_string(sampleRate);
- options["channels"] = std::to_string(nbChannels);
- options["width"] = std::to_string(width);
- options["height"] = std::to_string(height);
auto vp8Codec = std::static_pointer_cast<jami::SystemVideoCodecInfo>(
getSystemCodecContainer()->searchCodecByName("VP8", jami::MEDIA_VIDEO)
);
auto opusCodec = std::static_pointer_cast<SystemAudioCodecInfo>(
getSystemCodecContainer()->searchCodecByName("opus", jami::MEDIA_AUDIO)
);
+ auto v = MediaStream("v", AV_PIX_FMT_YUV420P, rational<int>(1, 30), width, height, 1, 30);
+ auto a = MediaStream("a", AV_SAMPLE_FMT_S16, rational<int>(1, sampleRate), sampleRate, nbChannels, 960);
try {
encoder_->openOutput("test.mkv");
- encoder_->setOptions(options);
+ encoder_->setOptions(v);
+ encoder_->setOptions(a);
int videoIdx = encoder_->addStream(*vp8Codec.get());
CPPUNIT_ASSERT(videoIdx >= 0);
CPPUNIT_ASSERT(encoder_->getStreamCount() == 1);
@@ -171,7 +167,6 @@ MediaEncoderTest::testMultiStream()
CPPUNIT_ASSERT(videoIdx != audioIdx);
CPPUNIT_ASSERT(encoder_->getStreamCount() == 2);
encoder_->setIOContext(nullptr);
- encoder_->startIO();
int sentSamples = 0;
AVFrame* audio = nullptr;
AVFrame* video = nullptr;
--
GitLab