Skip to content

Fix oss build #309

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

Closed
wants to merge 1 commit into from
Closed

Fix oss build #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ jobs:
python -m pip install pybind11[global]

elif [ "$RUNNER_OS" == "macOS" ]; then
brew install cmake git ninja googletest glog fmt \
# Update or install cmake
brew upgrade cmake || brew install cmake
brew install git ninja googletest glog fmt \
jpeg-turbo libpng \
lz4 zstd xxhash \
boost \
Expand Down
4 changes: 3 additions & 1 deletion cmake/LibrariesSetup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ if (EXISTS "$ENV{HOME}/homebrew")
list(APPEND CMAKE_FIND_ROOT_PATH "$ENV{HOME}/homebrew")
endif()

find_package(Boost REQUIRED
find_package(Boost
COMPONENTS
filesystem
chrono
date_time
system
thread
CONFIG
REQUIRED
)
find_package(Eigen REQUIRED)
find_package(FmtLib REQUIRED)
Expand Down
8 changes: 6 additions & 2 deletions csrc/reader/Reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@

#include <vrs/os/Platform.h>
#include <vrs/utils/AudioTrackExtractor.h>

#if IS_VRS_FB_INTERNAL()
#include <vrs/utils/cli/DataExtraction.h>
#endif

#include "AsyncVRSReader.h"
#include "FilteredFileReader.h"
Expand All @@ -33,10 +36,12 @@ string extractAudioTrack(pyvrs::FilteredFileReader& filteredReader, const string
return vrs::utils::extractAudioTrack(filteredReader.getFilteredReader(), wavFilePath);
}

#if IS_VRS_FB_INTERNAL()
int extractAudio(const string& path, pyvrs::FilteredFileReader& filteredReader) {
initVrsBindings();
return vrs::utils::extractAudio(path, filteredReader.getFilteredReader());
}
#endif

void pybind_reader(py::module& m) {
py::enum_<pyvrs::ImageConversion>(m, "ImageConversion")
Expand All @@ -54,13 +59,12 @@ void pybind_reader(py::module& m) {

#if IS_VRS_FB_INTERNAL()
pybind_filtered_filereader(m);
m.def("extract_audio", &extractAudio, "Extract all audio tracks from given FilteredFileReader");
#endif

m.def(
"extract_audio_track",
&extractAudioTrack,
"Extract audio track from given FilteredFileReader");

m.def("extract_audio", &extractAudio, "Extract all audio tracks from given FilteredFileReader");
}
} // namespace pyvrs
Loading