Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove libre & baresip #385

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

remove libre & baresip #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
130ee2d
remove libre & baresip
kushaljain-apra Sep 4, 2024
24df6a3
Merge branch 'main' into ks/removeLibreAndBaresip
kushaljain-apra Sep 13, 2024
39c24b6
Update H264EncoderNVCodecHelper.cpp
kushaljain-apra Sep 16, 2024
e451b05
added fix to terminate the control module with the pipeline
kushaljain-apra Sep 17, 2024
94c9c0f
fix typo
kushaljain-apra Sep 17, 2024
b9a5ea2
revert changes
kushaljain-apra Sep 17, 2024
42550e3
update pipeline.cpp to stop and terminate control module with pipeline
kushaljain-apra Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ IF(ENABLE_CUDA)
find_library(NVBUFUTILSLIB nvbuf_utils REQUIRED)
find_library(EGLSTREAM_CAMCONSUMER_LIB nveglstream_camconsumer REQUIRED)
find_library(NVARGUS_SOCKETCLINET_LIB nvargus_socketclient REQUIRED)
find_library(LIBRE_LIB NAMES libre.so libre.a REQUIRED)
find_library(BARESIP_LIB NAMES libbaresip.so REQUIRED)
find_package(Curses REQUIRED)

set(VCPKG_GTK_INCLUDE_DIRS
Expand Down Expand Up @@ -127,8 +125,6 @@ IF(ENABLE_CUDA)
ELSEIF(ENABLE_LINUX)
find_library(LIBNVCUVID libnvcuvid.so PATHS /usr/lib/x86_64-linux-gnu NO_DEFAULT_PATH)
find_library(LIBNVENCODE libnvidia-encode.so PATHS /usr/lib/x86_64-linux-gnu NO_DEFAULT_PATH)
find_library(LIBRE_LIB NAMES libre.so libre.a REQUIRED)
find_library(BARESIP_LIB NAMES libbaresip.so REQUIRED)
SET(NVCODEC_LIB ${LIBNVCUVID} ${LIBNVENCODE})
SET(NVCUDAToolkit_LIBS
libcuda.so
Expand Down Expand Up @@ -519,8 +515,6 @@ target_include_directories ( aprapipes PRIVATE
${OpenCV_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${LIBMP4_INC_DIR}
${BARESIP_INC_DIR}
${LIBRE_INC_DIR}
${NVCODEC_INCLUDE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion base/include/PipeLine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class PipeLine {
void stop();
void term();
void wait_for_all(bool ignoreStatus = false);
void interrup_wait_for_all();
void interrupt_wait_for_all();
void flushAllQueues();
const char* getStatus();
};
Expand Down
4 changes: 2 additions & 2 deletions base/src/H264EncoderNVCodecHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ class H264EncoderNVCodecHelper::Detail
LOG_INFO << "Allocated <" << bufferLength << "> outputbitstreams to the encoder buffer.";
m_nvcodecResources->m_nFreeOutputBitstreams += bufferLength;
}
else
else if(!m_nvcodecResources->m_nFreeOutputBitstreams)
{
LOG_INFO << "waiting for free outputbitstream<> busy streams<" << m_nvcodecResources->m_nBusyOutputBitstreams << ">";
}
Expand Down Expand Up @@ -715,4 +715,4 @@ void H264EncoderNVCodecHelper::endEncode()
bool H264EncoderNVCodecHelper::getSPSPPS(void*& buffer, size_t& size, int& width, int& height)
{
return mDetail->getSPSPPS(buffer, size, width, height);
}
}
26 changes: 25 additions & 1 deletion base/src/PipeLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,11 @@ void PipeLine::stop()
i->get()->stop();
}
}

if ((modules[0]->controlModule) != nullptr)
{
modules[0]->controlModule->stop();
}
}

void PipeLine::wait_for_all(bool ignoreStatus)
Expand All @@ -242,6 +247,12 @@ void PipeLine::wait_for_all(bool ignoreStatus)
return;
}

if ((modules[0]->controlModule) != nullptr)
{
Module& m = *(modules[0]->controlModule);
m.myThread.join();
}

for (auto i = modules.begin(); i != modules.end(); i++)
{
Module& m = *(i->get());
Expand All @@ -250,25 +261,38 @@ void PipeLine::wait_for_all(bool ignoreStatus)
}


void PipeLine::interrup_wait_for_all()
void PipeLine::interrupt_wait_for_all()
{
if (myStatus > PL_STOPPING)
{
LOG_INFO << "Pipeline status " << getStatus() << " Can not be stopped !";
return;
}

if ((modules[0]->controlModule) != nullptr)
{
Module& m = *(modules[0]->controlModule);
m.myThread.interrupt();
}

for (auto i = modules.begin(); i != modules.end(); i++)
{
Module& m = *(i->get());
m.myThread.interrupt();
}

if ((modules[0]->controlModule) != nullptr)
{
Module& m = *(modules[0]->controlModule);
m.myThread.join();
}

for (auto i = modules.begin(); i != modules.end(); i++)
{
Module& m = *(i->get());
m.myThread.join();
}

myStatus = PL_STOPPED;
}

Expand Down
8 changes: 0 additions & 8 deletions base/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,6 @@
"name": "redis-plus-plus",
"platform": "!arm64"
},
{
"name": "re",
"platform": "!windows"
},
{
"name": "baresip",
"platform": "!windows"
},
{
"name": "libmp4"
}
Expand Down
Loading