From 0da903b28efcbe6d78bde433e53c7debb7984328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 27 Feb 2018 12:04:23 -0500
Subject: [PATCH] Revert "video: don't blacken frame if not needed"
This reverts commit c4b580a2deeb1f780e9b1be0a97cb3fa3ad389ba.
Change-Id: If4a00bde338aa657c482ae18cc59902ed1be593c
---
src/media/media_encoder.cpp | 5 +++++
src/media/video/video_mixer.cpp | 2 ++
2 files changed, 7 insertions(+)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index 506f5dc8ae..ccbae447ef 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -273,6 +273,11 @@ int
MediaEncoder::encode(VideoFrame& input, bool is_keyframe,
int64_t frame_number)
{
+ /* Prepare a frame suitable to our encoder frame format,
+ * keeping also the input aspect ratio.
+ */
+ yuv422_clear_to_black(scaledFrame_); // to fill blank space left by the "keep aspect"
+
scaler_.scale_with_aspect(input, scaledFrame_);
auto frame = scaledFrame_.pointer();
diff --git a/src/media/video/video_mixer.cpp b/src/media/video/video_mixer.cpp
index 85f6cbe790..654a06f780 100644
--- a/src/media/video/video_mixer.cpp
+++ b/src/media/video/video_mixer.cpp
@@ -189,6 +189,8 @@ VideoMixer::setDimensions(int width, int height)
// cleanup the previous frame to have a nice copy in rendering method
std::shared_ptr<VideoFrame> previous_p(obtainLastFrame());
+ if (previous_p)
+ yuv422_clear_to_black(*previous_p);
start_sink();
}
--
GitLab