Commit 1f9c191b authored by Adrien Béraud's avatar Adrien Béraud

av_utils: cleanup

Change-Id: I6f888fb7432c1a8bb8b3bae90f675e65f40903d5
parent 6c20ddc5
......@@ -425,7 +425,7 @@ Manager::ManagerPimpl::ManagerPimpl(Manager& base)
, videoManager_(new VideoManager)
#endif
{
jami::libav_utils::ring_avcodec_init();
jami::libav_utils::av_init();
ioContextRunner_ = std::thread([context = ioContext_](){
try {
......
......@@ -178,7 +178,7 @@ init_once()
static std::once_flag already_called;
void ring_avcodec_init()
void av_init()
{
std::call_once(already_called, init_once);
}
......
......@@ -33,7 +33,7 @@ struct AVPixFmtDescriptor;
namespace jami { namespace libav_utils {
void ring_avcodec_init();
void av_init();
const char *const DEFAULT_H264_PROFILE_LEVEL_ID = "profile-level-id=428029";
const char *const MAX_H264_PROFILE_LEVEL_ID = "profile-level-id=640034";
......
......@@ -38,33 +38,33 @@ namespace jami {
*/
class LocalRecorder : public Recordable {
public:
public:
LocalRecorder(const bool& audioOnly);
~LocalRecorder();
LocalRecorder(const bool& audioOnly);
~LocalRecorder();
/**
* Start local recording. Return true if recording was successfully
* started, false otherwise.
*/
bool startRecording();
/**
* Start local recording. Return true if recording was successfully
* started, false otherwise.
*/
bool startRecording();
/**
* Stops recording.
*/
void stopRecording();
/**
* Stops recording.
*/
void stopRecording();
/**
* Set recording path
*/
void setPath(const std::string& path);
/**
* Set recording path
*/
void setPath(const std::string& path);
private:
std::string path_;
private:
std::string path_;
// media inputs
std::shared_ptr<jami::video::VideoInput> videoInput_;
std::shared_ptr<jami::AudioInput> audioInput_;
// media inputs
std::shared_ptr<jami::video::VideoInput> videoInput_;
std::shared_ptr<jami::AudioInput> audioInput_;
};
} // namespace jami
......@@ -60,7 +60,7 @@ void
MediaDecoderTest::setUp()
{
DRing::init(DRing::InitFlag(DRing::DRING_FLAG_DEBUG | DRing::DRING_FLAG_CONSOLE_LOG));
libav_utils::ring_avcodec_init();
libav_utils::av_init();
}
void
......
......@@ -57,7 +57,7 @@ void
MediaEncoderTest::setUp()
{
DRing::init(DRing::InitFlag(DRing::DRING_FLAG_DEBUG | DRing::DRING_FLAG_CONSOLE_LOG));
libav_utils::ring_avcodec_init();
libav_utils::av_init();
encoder_.reset(new MediaEncoder);
files_.push_back("test.mkv");
}
......
......@@ -62,7 +62,7 @@ void
MediaFilterTest::setUp()
{
DRing::init(DRing::InitFlag(DRing::DRING_FLAG_DEBUG | DRing::DRING_FLAG_CONSOLE_LOG));
libav_utils::ring_avcodec_init();
libav_utils::av_init();
filter_.reset(new MediaFilter);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment