From 2be8e0307cafe1164de8deb1d9f324f133dc58ce Mon Sep 17 00:00:00 2001 From: Jordi Cenzano Ferret Date: Thu, 9 Jan 2025 09:29:40 -0800 Subject: [PATCH] Fixes OSS build Summary: - Fixes OSS build broken in this stack D67775633 (end diff) Reviewed By: afrind Differential Revision: D67971641 fbshipit-source-id: fec7b32bca1f9c4a02ce90cd5bb62b5b4bb26c56 --- moxygen/flv_parser/CMakeLists.txt | 2 ++ moxygen/flv_parser/test/CMakeLists.txt | 1 + moxygen/moq_mi/MoQMi.cpp | 24 ++++++++++++++++++++++++ moxygen/moq_mi/MoQMi.h | 24 ------------------------ moxygen/moq_mi/test/CMakeLists.txt | 2 ++ 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/moxygen/flv_parser/CMakeLists.txt b/moxygen/flv_parser/CMakeLists.txt index d914a016..09727ec8 100644 --- a/moxygen/flv_parser/CMakeLists.txt +++ b/moxygen/flv_parser/CMakeLists.txt @@ -6,7 +6,9 @@ # flvparser add_library(flvparser + FlvCommon.cpp FlvReader.cpp + FlvWriter.cpp FlvSequentialReader.cpp ) diff --git a/moxygen/flv_parser/test/CMakeLists.txt b/moxygen/flv_parser/test/CMakeLists.txt index e280848e..0b490e79 100644 --- a/moxygen/flv_parser/test/CMakeLists.txt +++ b/moxygen/flv_parser/test/CMakeLists.txt @@ -14,5 +14,6 @@ moxygen_add_test(TARGET FlvParserTests FlvSequentialReaderTest.cpp DEPENDS flvparser + moqmi Folly::folly ) diff --git a/moxygen/moq_mi/MoQMi.cpp b/moxygen/moq_mi/MoQMi.cpp index 19bc2a7f..587203fd 100644 --- a/moxygen/moq_mi/MoQMi.cpp +++ b/moxygen/moq_mi/MoQMi.cpp @@ -206,4 +206,28 @@ void MoQMi::writeVarint( } } +std::ostream& operator<<( + std::ostream& os, + MoQMi::VideoH264AVCCWCPData const& v) { + auto metadataSize = + v.metadata != nullptr ? v.metadata->computeChainDataLength() : 0; + auto dataSize = v.data != nullptr ? v.data->computeChainDataLength() : 0; + os << "VideoH264. id: " << v.seqId << ", pts: " << v.pts << ", dts: " << v.dts + << ", timescale: " << v.timescale << ", duration: " << v.duration + << ", wallclock: " << v.wallclock << ", metadata length: " << metadataSize + << ", data length: " << dataSize; + return os; +} + +std::ostream& operator<<( + std::ostream& os, + MoQMi::AudioAACMP4LCWCPData const& a) { + auto dataSize = a.data != nullptr ? a.data->computeChainDataLength() : 0; + os << "AudioAAC. id: " << a.seqId << ", pts: " << a.pts + << ", sampleFreq: " << a.sampleFreq << ", numChannels: " << a.numChannels + << ", timescale: " << a.timescale << ", duration: " << a.duration + << ", wallclock: " << a.wallclock << ", data length: " << dataSize; + return os; +} + } // namespace moxygen diff --git a/moxygen/moq_mi/MoQMi.h b/moxygen/moq_mi/MoQMi.h index ea6cbcb0..850f3b9c 100644 --- a/moxygen/moq_mi/MoQMi.h +++ b/moxygen/moq_mi/MoQMi.h @@ -185,28 +185,4 @@ class MoQMi { bool& error) noexcept; }; -std::ostream& operator<<( - std::ostream& os, - MoQMi::VideoH264AVCCWCPData const& v) { - auto metadataSize = - v.metadata != nullptr ? v.metadata->computeChainDataLength() : 0; - auto dataSize = v.data != nullptr ? v.data->computeChainDataLength() : 0; - os << "VideoH264. id: " << v.seqId << ", pts: " << v.pts << ", dts: " << v.dts - << ", timescale: " << v.timescale << ", duration: " << v.duration - << ", wallclock: " << v.wallclock << ", metadata length: " << metadataSize - << ", data length: " << dataSize; - return os; -} - -std::ostream& operator<<( - std::ostream& os, - MoQMi::AudioAACMP4LCWCPData const& a) { - auto dataSize = a.data != nullptr ? a.data->computeChainDataLength() : 0; - os << "AudioAAC. id: " << a.seqId << ", pts: " << a.pts - << ", sampleFreq: " << a.sampleFreq << ", numChannels: " << a.numChannels - << ", timescale: " << a.timescale << ", duration: " << a.duration - << ", wallclock: " << a.wallclock << ", data length: " << dataSize; - return os; -} - } // namespace moxygen diff --git a/moxygen/moq_mi/test/CMakeLists.txt b/moxygen/moq_mi/test/CMakeLists.txt index 54ef9555..fb4c26bc 100644 --- a/moxygen/moq_mi/test/CMakeLists.txt +++ b/moxygen/moq_mi/test/CMakeLists.txt @@ -13,5 +13,7 @@ moxygen_add_test(TARGET MoQMiTests MoQMiTest.cpp DEPENDS moqmi + flvparser + proxygen::proxygen Folly::folly )