From 9cbb5d2b3979383bfcd93b9ae242569bff03be4b Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 18 Jun 2017 13:15:35 +0200 Subject: [PATCH] fix compile Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ad24fab431a4f0cc4c8b1ceff119cbf5664bba12 Author: Jacek Jendrzej Date: 2017-06-18 (Sun, 18 Jun 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- generic-pc/video.cpp | 12 ++++++++++++ generic-pc/video_lib.h | 1 + 2 files changed, 13 insertions(+) diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp index 208cc57..bf54a27 100644 --- a/generic-pc/video.cpp +++ b/generic-pc/video.cpp @@ -203,6 +203,18 @@ int cVideo::SetVideoSystem(int system, bool) return 0; } +int cVideo::GetVideoSystem() +{ + int current_video_system = VIDEO_STD_1080I50; + + if(dec_w < 720) + current_video_system = VIDEO_STD_PAL; + else if(dec_w > 720 && dec_w <= 1280) + current_video_system = VIDEO_STD_720P50; + + return 0; +} + int cVideo::getPlayState(void) { return VIDEO_PLAYING; diff --git a/generic-pc/video_lib.h b/generic-pc/video_lib.h index 3b075d4..e48aa71 100644 --- a/generic-pc/video_lib.h +++ b/generic-pc/video_lib.h @@ -177,6 +177,7 @@ class cVideo : public Thread /* set video_system */ int SetVideoSystem(int video_system, bool remember = true); + int GetVideoSystem(); int SetStreamType(VIDEO_FORMAT type); void SetSyncMode(AVSYNC_TYPE mode); bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };