Skip to content

Commit

Permalink
Merge branch 'sprint/24Q2' into DAB-Displayinfo-rdkservices
Browse files Browse the repository at this point in the history
  • Loading branch information
@smuthu065
smuthu065 authored Jun 21, 2024
2 parents a5eeee1 + c8eac4f commit 116d653
Show file tree
Hide file tree
Showing 35 changed files with 6,731 additions and 2,920 deletions.
404 changes: 404 additions & 0 deletions .github/workflows/L2-tests-R4-4-1.yml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/L2-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
l2-tests:
name: Build and run L2 tests
name: Run L2 with Thunder R2
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down
3,524 changes: 690 additions & 2,834 deletions AVOutput/AVOutputTV.cpp
View file

Large diffs are not rendered by default.

45 changes: 23 additions & 22 deletions AVOutput/AVOutputTV.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,35 +87,35 @@ class AVOutputTV : public AVOutputBase {
DECLARE_JSON_RPC_METHOD(getColorTemperature )
DECLARE_JSON_RPC_METHOD(getBacklightDimmingMode )
DECLARE_JSON_RPC_METHOD(getSupportedDolbyVisionModes )
DECLARE_JSON_RPC_METHOD(getDolbyVisionMode)
DECLARE_JSON_RPC_METHOD(getSupportedPictureModes )
DECLARE_JSON_RPC_METHOD(getVideoSourceCaps)
DECLARE_JSON_RPC_METHOD(getVideoFormatCaps)
DECLARE_JSON_RPC_METHOD(getVideoFrameRateCaps)
DECLARE_JSON_RPC_METHOD(getVideoResolutionCaps)
DECLARE_JSON_RPC_METHOD(getPictureMode )
DECLARE_JSON_RPC_METHOD(getVideoFormat)
DECLARE_JSON_RPC_METHOD(getVideoSource)
DECLARE_JSON_RPC_METHOD(getVideoFrameRate)
DECLARE_JSON_RPC_METHOD(getVideoResolution)
DECLARE_JSON_RPC_METHOD(getLowLatencyState)
DECLARE_JSON_RPC_METHOD(getDolbyVisionMode)
DECLARE_JSON_RPC_METHOD(getZoomMode)
DECLARE_JSON_RPC_METHOD(getVideoContentType)


/*Get Capability API's*/
DECLARE_JSON_RPC_METHOD(getBacklightCaps)
DECLARE_JSON_RPC_METHOD(getContrastCaps)
DECLARE_JSON_RPC_METHOD(getBrightnessCaps)
DECLARE_JSON_RPC_METHOD(getContrastCaps)
DECLARE_JSON_RPC_METHOD(getSharpnessCaps)
DECLARE_JSON_RPC_METHOD(getSaturationCaps)
DECLARE_JSON_RPC_METHOD(getHueCaps)
DECLARE_JSON_RPC_METHOD(getColorTemperatureCaps)
DECLARE_JSON_RPC_METHOD(getBacklightDimmingModeCaps )
DECLARE_JSON_RPC_METHOD(getDolbyVisionModeCaps )
DECLARE_JSON_RPC_METHOD(getZoomModeCaps)
DECLARE_JSON_RPC_METHOD(getLowLatencyStateCaps)
DECLARE_JSON_RPC_METHOD(getPictureModeCaps)
DECLARE_JSON_RPC_METHOD(getVideoFormatCaps)
DECLARE_JSON_RPC_METHOD(getVideoSourceCaps)
DECLARE_JSON_RPC_METHOD(getVideoFrameRateCaps)
DECLARE_JSON_RPC_METHOD(getVideoResolutionCaps)
DECLARE_JSON_RPC_METHOD(getLowLatencyStateCaps)
DECLARE_JSON_RPC_METHOD(getZoomModeCaps)

/*Set API's*/
DECLARE_JSON_RPC_METHOD(setBacklight)
Expand All @@ -127,11 +127,12 @@ class AVOutputTV : public AVOutputBase {
DECLARE_JSON_RPC_METHOD(setColorTemperature )
DECLARE_JSON_RPC_METHOD(setBacklightDimmingMode )
DECLARE_JSON_RPC_METHOD(setDolbyVisionMode )
DECLARE_JSON_RPC_METHOD(setWBCtrl )
DECLARE_JSON_RPC_METHOD(setPictureMode )
DECLARE_JSON_RPC_METHOD(signalFilmMakerMode)
DECLARE_JSON_RPC_METHOD(setZoomMode)
DECLARE_JSON_RPC_METHOD(setLowLatencyState)
DECLARE_JSON_RPC_METHOD(setZoomMode)
DECLARE_JSON_RPC_METHOD(setWBCtrl )
DECLARE_JSON_RPC_METHOD(signalFilmMakerMode)

/*Reset API's*/
DECLARE_JSON_RPC_METHOD(resetBacklight)
DECLARE_JSON_RPC_METHOD(resetBrightness )
Expand All @@ -143,8 +144,8 @@ class AVOutputTV : public AVOutputBase {
DECLARE_JSON_RPC_METHOD(resetBacklightDimmingMode )
DECLARE_JSON_RPC_METHOD(resetDolbyVisionMode )
DECLARE_JSON_RPC_METHOD(resetPictureMode )
DECLARE_JSON_RPC_METHOD(resetZoomMode)
DECLARE_JSON_RPC_METHOD(resetLowLatencyState)
DECLARE_JSON_RPC_METHOD(resetZoomMode)

private:

Expand All @@ -155,7 +156,7 @@ class AVOutputTV : public AVOutputBase {
int getFormatIndex(std::string format);
int getPqParamIndex();
int getParamIndex(string source,string pqmode,string format,int& sourceIndex,int& pqmodeIndex,int& formatIndex);
int GetDolbyModeIndex(const char * dolbyMode);
int getDolbyModeIndex(const char * dolbyMode);
tvDimmingMode_t getDimmingModeIndex(string mode);

bool isIncluded(const std::set<string> set1,const std::set<string> set2);
Expand All @@ -168,13 +169,13 @@ class AVOutputTV : public AVOutputBase {
int parsingGetInputArgument(const JsonObject& parameters, std::string pqparam,std::string & source, std::string & pqmode, std::string & format);
void spliltStringsAndConvertToSet( std::string pqmodeInfo,std::string formatInfo,std::string sourceInfo,std::set<string> &pqmode, std::set<string> &format, std::set<string> &source);
int validateIntegerInputParameter(std::string param, int inputValue);
int FetchCapablities(string pqparam, string & source, string & pqmode, string & format);
int fetchCapablities(string pqparam, string & source, string & pqmode, string & format);
int validateInputParameter(std::string param, std::string inputValue);

/* AVoutput ini file default entries */
void LocatePQSettingsFile(void);
void locatePQSettingsFile(void);
/* Intialise the last set picture mode at bootup */
tvError_t InitializePictureMode();
tvError_t initializePictureMode();


std::string convertToString(std::vector<std::string> vec_strings);
Expand All @@ -183,23 +184,23 @@ class AVOutputTV : public AVOutputBase {
string convertSourceIndexToString(int source);
string convertVideoFormatToString(int format);
string convertPictureIndexToString(int pqmode);
tvContentFormatType_t ConvertFormatStringToTVContentFormat(const char *format);
tvContentFormatType_t convertFormatStringToTVContentFormat(const char *format);
//std::string convertSourceIndexToString(int sourceIndex);
//std::string convertVideoFormatToString( int formatIndex );
void convertUserScaleBacklightToDriverScale(int format,int * params);

/* Update TR181 with new values when app calls set/reset calls */
tvError_t UpdateAVoutputTVParamToHAL(std::string forParam, int source, int pqmode, int format, int value,bool setNotDelete);
tvError_t updateAVoutputTVParamToHAL(std::string forParam, int source, int pqmode, int format, int value,bool setNotDelete);
/* updatePQParamsToCache will call updatePQParamToLocalCache for writing to TR181.
* it will call TVSettings HAL for setting/saving the value
* Will be called whenever the application invokes set/reset call
*/
int UpdateAVoutputTVParam( std::string action, std::string tr181ParamName, std::string pqmode, std::string source, std::string format, tvPQParameterIndex_t pqParamIndex, int params[] );
int updateAVoutputTVParam( std::string action, std::string tr181ParamName, std::string pqmode, std::string source, std::string format, tvPQParameterIndex_t pqParamIndex, int params[] );

/* Every bootup this function is called to sync TR181 to TVSettings HAL for saving the value */
tvError_t SyncAvoutputTVParamsToHAL(std::string pqmode, std::string source, std::string format);
tvError_t syncAvoutputTVParamsToHAL(std::string pqmode, std::string source, std::string format);
/* Every Bootup this function is called to sync TR181 to TVSettings HAL for saving the picture mode assiocation to source */
int SyncAvoutputTVPQModeParamsToHAL(std::string pqmode, std::string source, std::string format);
int syncAvoutputTVPQModeParamsToHAL(std::string pqmode, std::string source, std::string format);

uint32_t generateStorageIdentifier(std::string &key, std::string forParam,int contentFormat, int pqmode, int source);
uint32_t generateStorageIdentifierDirty(std::string &key, std::string forParam,uint32_t contentFormat, int pqmode);
Expand Down Expand Up @@ -229,7 +230,7 @@ class AVOutputTV : public AVOutputBase {
void getDynamicAutoLatencyConfig();
tvError_t getUserSelectedAspectRatio (tvDisplayMode_t* mode);

void BroadcastLowLatencyModeChangeEvent(bool lowLatencyMode);
void broadcastLowLatencyModeChangeEvent(bool lowLatencyMode);
tvError_t setAspectRatioZoomSettings(tvDisplayMode_t mode);
tvError_t setDefaultAspectRatio(std::string pqmode="all",std::string format="all",std::string source="all");

Expand Down
Loading

0 comments on commit 116d653

Please sign in to comment.