From db1ef33dff98f9434f9aba88a380a21e7bd1e4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 24 Nov 2018 23:23:58 -0500
Subject: [PATCH] mediaframe: add const pointer method
Change-Id: Ifeaf66cf06d8859be25642064ce09761a1552894
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
src/dring/videomanager_interface.h | 3 ++-
src/media/media_decoder.cpp | 2 +-
src/media/media_decoder.h | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/dring/videomanager_interface.h b/src/dring/videomanager_interface.h
index 876df5fb45..1713d157fe 100644
--- a/src/dring/videomanager_interface.h
+++ b/src/dring/videomanager_interface.h
@@ -80,7 +80,8 @@ public:
virtual ~MediaFrame() = default;
// Return a pointer on underlaying buffer
- AVFrame* pointer() const noexcept { return frame_.get(); }
+ const AVFrame* pointer() const noexcept { return frame_.get(); }
+ AVFrame* pointer() noexcept { return frame_.get(); }
// Fill this MediaFrame with data from o
void copyFrom(const MediaFrame& o);
diff --git a/src/media/media_decoder.cpp b/src/media/media_decoder.cpp
index 9ebc6ea562..41ba6f227f 100644
--- a/src/media/media_decoder.cpp
+++ b/src/media/media_decoder.cpp
@@ -310,7 +310,7 @@ MediaDecoder::decode(VideoFrame& result)
#endif // RING_VIDEO
MediaDecoder::Status
-MediaDecoder::decode(const AudioFrame& decodedFrame)
+MediaDecoder::decode(AudioFrame& decodedFrame)
{
const auto frame = decodedFrame.pointer();
diff --git a/src/media/media_decoder.h b/src/media/media_decoder.h
index c1c560c61b..8405dd18f6 100644
--- a/src/media/media_decoder.h
+++ b/src/media/media_decoder.h
@@ -89,7 +89,7 @@ class MediaDecoder {
#endif // RING_VIDEO
int setupFromAudioData();
- Status decode(const AudioFrame&);
+ Status decode(AudioFrame&);
void writeToRingBuffer(const AudioFrame&, RingBuffer&, const AudioFormat);
int getWidth() const;
--
GitLab