tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

custom aspect ratios (#21)

Browse Source 
* Working on proper resizing of AA

* allow for custom aspect ratios
This commit is contained in:
Cole Brinsfield 2021-05-21 19:59:57 -07:00 committed by GitHub
parent 94ee66acd7
commit e940b8036e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/openauto/Projection/GSTVideoOutput.hpp
View File

@ -79,6 +79,7 @@ private:
QGst::ElementPtr videoSink_; QGst::ElementPtr videoSink_;
QQuickWidget* videoWidget_; QQuickWidget* videoWidget_;
GstElement* vidPipeline_; GstElement* vidPipeline_;
GstVideoFilter* vidCrop_;
GstAppSrc* vidSrc_; GstAppSrc* vidSrc_;
QWidget* videoContainer_; QWidget* videoContainer_;
QGst::Quick::VideoSurface* surface_; QGst::Quick::VideoSurface* surface_;

50
openauto/Projection/GSTVideoOutput.cpp
View File

@ -15,7 +15,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with openauto. If not, see <http://www.gnu.org/licenses/>. * along with openauto. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef USE_GST #ifdef USE_GST
#include "aasdk/Common/Data.hpp" #include "aasdk/Common/Data.hpp"
@ -27,6 +26,7 @@ namespace openauto
namespace projection namespace projection
{ {
GSTVideoOutput::GSTVideoOutput(configuration::IConfiguration::Pointer configuration, QWidget* videoContainer, std::function<void(bool)> activeCallback) GSTVideoOutput::GSTVideoOutput(configuration::IConfiguration::Pointer configuration, QWidget* videoContainer, std::function<void(bool)> activeCallback)
: VideoOutput(std::move(configuration)) : VideoOutput(std::move(configuration))
, videoContainer_(videoContainer) , videoContainer_(videoContainer)
@ -53,7 +53,7 @@ GSTVideoOutput::GSTVideoOutput(configuration::IConfiguration::Pointer configurat
#else #else
"avdec_h264 ! " "avdec_h264 ! "
#endif #endif
"capsfilter caps=video/x-raw name=mycapsfilter"; "videocrop top=0 bottom=0 name=videocropper ! capsfilter caps=video/x-raw name=mycapsfilter";
#ifdef RPI #ifdef RPI
OPENAUTO_LOG(info) << "[GSTVideoOutput] RPI Build, running with " << OPENAUTO_LOG(info) << "[GSTVideoOutput] RPI Build, running with " <<
#ifdef PI4 #ifdef PI4
@ -80,6 +80,8 @@ GSTVideoOutput::GSTVideoOutput(configuration::IConfiguration::Pointer configurat
vidSrc_ = GST_APP_SRC(gst_bin_get_by_name(GST_BIN(vidPipeline_), "mysrc")); vidSrc_ = GST_APP_SRC(gst_bin_get_by_name(GST_BIN(vidPipeline_), "mysrc"));
gst_app_src_set_stream_type(vidSrc_, GST_APP_STREAM_TYPE_STREAM); gst_app_src_set_stream_type(vidSrc_, GST_APP_STREAM_TYPE_STREAM);
vidCrop_ = GST_VIDEO_FILTER(gst_bin_get_by_name(GST_BIN(vidPipeline_), "videocropper"));
connect(this, &GSTVideoOutput::startPlayback, this, &GSTVideoOutput::onStartPlayback, Qt::QueuedConnection); connect(this, &GSTVideoOutput::startPlayback, this, &GSTVideoOutput::onStartPlayback, Qt::QueuedConnection);
connect(this, &GSTVideoOutput::stopPlayback, this, &GSTVideoOutput::onStopPlayback, Qt::QueuedConnection); connect(this, &GSTVideoOutput::stopPlayback, this, &GSTVideoOutput::onStopPlayback, Qt::QueuedConnection);
} }
@ -222,6 +224,50 @@ void GSTVideoOutput::resize()
{ {
videoWidget_->resize(videoContainer_->size()); videoWidget_->resize(videoContainer_->size());
} }
int width = 0;
int height = 0;
int containerWidth = videoContainer_->width();
int containerHeight = videoContainer_->height();
switch(this->getVideoResolution()){
case aasdk::proto::enums::VideoResolution_Enum__1080p:
width = 1920;
height = 1080;
break;
case aasdk::proto::enums::VideoResolution_Enum__720p:
width = 1280;
height = 720;
break;
case aasdk::proto::enums::VideoResolution_Enum__480p:
width = 800;
height = 480;
break;
}
double marginWidth = 0;
double marginHeight = 0;
double widthRatio = (double)containerWidth / width;
double heightRatio = (double)containerHeight / height;
if(widthRatio > heightRatio){
//cropping height
marginHeight = (widthRatio * height - containerHeight)/widthRatio;
marginHeight /= 2;
}else{
//cropping width
marginWidth = (heightRatio * width - containerWidth)/heightRatio;
marginWidth /= 2;
}
OPENAUTO_LOG(info) << "[GSTVideoOutput] Android Auto is "<< width << "x" << height << ", calculated margins of: " << marginWidth << "x" << marginHeight;
g_object_set(vidCrop_, "top", (int)marginHeight, nullptr);
g_object_set(vidCrop_, "bottom", (int)marginHeight, nullptr);
g_object_set(vidCrop_, "left", (int)marginWidth, nullptr);
g_object_set(vidCrop_, "right", (int)marginWidth, nullptr);
this->configuration_->setVideoMargins(QRect(0,0,(int)(marginWidth*2), (int)(marginHeight*2)));
} }
} }

5
openauto/Service/ServiceFactory.cpp
View File

@ -145,6 +145,11 @@ IService::Pointer ServiceFactory::createInputService(aasdk::messenger::IMessenge
break; break;
} }
//account for margins being applied to android auto
videoGeometry.setWidth(videoGeometry.width()-configuration_->getVideoMargins().width());
videoGeometry.setHeight(videoGeometry.height()-configuration_->getVideoMargins().height());
QObject* inputObject = activeArea_ == nullptr ? qobject_cast<QObject*>(QApplication::instance()) : qobject_cast<QObject*>(activeArea_); QObject* inputObject = activeArea_ == nullptr ? qobject_cast<QObject*>(QApplication::instance()) : qobject_cast<QObject*>(activeArea_);
inputDevice_ = std::make_shared<projection::InputDevice>(*inputObject, configuration_, std::move(screenGeometry_), std::move(videoGeometry)); inputDevice_ = std::make_shared<projection::InputDevice>(*inputObject, configuration_, std::move(screenGeometry_), std::move(videoGeometry));