From ad059dcc2042bc0bee4cf65ae16f43b63ea3f120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 19 Dec 2022 19:59:53 -0500
Subject: [PATCH] build: fix build without RING_ACCEL
Change-Id: I37819532d7b3033e233a391f570da3df77afe8a0
---
src/media/media_encoder.cpp | 6 ++++--
src/media/media_recorder.cpp | 8 ++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index 1470374e3a..b3ab0bb8c3 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -432,7 +432,7 @@ MediaEncoder::encode(const std::shared_ptr<VideoFrame>& input,
return -1;
}
#else
- output = getScaledSWFrame(input);
+ output = getScaledSWFrame(*input.get());
#endif // RING_ACCEL
if (!output) {
@@ -1267,7 +1267,7 @@ MediaEncoder::getHWFrame(const std::shared_ptr<VideoFrame>& input,
} else {
output = getScaledSWFrame(*input.get());
}
-#elif !defined(__APPLE__)
+#elif !defined(__APPLE__) && defined(RING_ACCEL)
// Other Platforms
auto desc = av_pix_fmt_desc_get(static_cast<AVPixelFormat>(input->format()));
bool isHardware = desc && (desc->flags & AV_PIX_FMT_FLAG_HWACCEL);
@@ -1297,6 +1297,7 @@ MediaEncoder::getHWFrame(const std::shared_ptr<VideoFrame>& input,
return 0;
}
+#ifdef RING_ACCEL
std::shared_ptr<VideoFrame>
MediaEncoder::getUnlinkedHWFrame(const VideoFrame& input)
{
@@ -1323,6 +1324,7 @@ MediaEncoder::getHWFrameFromSWFrame(const VideoFrame& input)
}
return framePtr;
}
+#endif
std::shared_ptr<VideoFrame>
MediaEncoder::getScaledSWFrame(const VideoFrame& input)
diff --git a/src/media/media_recorder.cpp b/src/media/media_recorder.cpp
index 3fd4f72122..36bd557455 100644
--- a/src/media/media_recorder.cpp
+++ b/src/media/media_recorder.cpp
@@ -272,7 +272,7 @@ MediaRecorder::onFrame(const std::string& name, const std::shared_ptr<MediaFrame
// copy frame to not mess with the original frame's pts (does not actually copy frame data)
std::unique_ptr<MediaFrame> clone;
const auto& ms = streams_[name]->info;
-#ifdef ENABLE_VIDEO
+#if defined(ENABLE_VIDEO) && defined(RING_ACCEL)
if (ms.isVideo) {
auto desc = av_pix_fmt_desc_get(
(AVPixelFormat) (std::static_pointer_cast<VideoFrame>(frame))->format());
@@ -290,12 +290,12 @@ MediaRecorder::onFrame(const std::string& name, const std::shared_ptr<MediaFrame
clone->copyFrom(*frame);
}
} else {
-#endif // ENABLE_VIDEO
+#endif // ENABLE_VIDEO && RING_ACCEL
clone = std::make_unique<MediaFrame>();
clone->copyFrom(*frame);
-#ifdef ENABLE_VIDEO
+#if defined(ENABLE_VIDEO) && defined(RING_ACCEL)
}
-#endif // ENABLE_VIDEO
+#endif // ENABLE_VIDEO && RING_ACCEL
clone->pointer()->pts = av_rescale_q_rnd(av_gettime() - startTimeStamp_,
{1, AV_TIME_BASE},
ms.timeBase,
--
GitLab