Skip to content

Commit f04c156

Browse files
slkanthiarjunbinu
authored andcommitted
Update tvAspectRatio_t to tvDisplayMode_t
1 parent 423d1e8 commit f04c156

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

AVOutput/AVOutputTV.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ namespace Plugin {
755755
}
756756

757757
uint32_t AVOutputTV::getAspectRatioCapsV2(const JsonObject& parameters, JsonObject& response) {
758-
tvAspectRatio_t* aspect_ratio = nullptr;
758+
tvDisplayMode_t* aspect_ratio = nullptr;
759759
size_t num_aspect_ratio = 0;
760760
tvContextCaps_t* context_caps = nullptr;
761761

@@ -769,13 +769,14 @@ namespace Plugin {
769769
JsonArray optionsArray;
770770
for (size_t i = 0; i < num_aspect_ratio; ++i) {
771771
switch (aspect_ratio[i]) {
772-
case tvAspectRatio_Auto: optionsArray.Add("TV AUTO"); break;
773-
case tvAspectRatio_Direct: optionsArray.Add("TV DIRECT"); break;
774-
case tvAspectRatio_Normal: optionsArray.Add("TV NORMAL"); break;
775-
case tvAspectRatio_16X9_Stretch: optionsArray.Add("TV 16X9 STRETCH"); break;
776-
case tvAspectRatio_4X3_Pillarbox: optionsArray.Add("TV 4X3 PILLARBOX"); break;
777-
case tvAspectRatio_Zoom: optionsArray.Add("TV ZOOM"); break;
778-
default: break;
772+
case tvDisplayMode_AUTO: optionsArray.Add("TV AUTO"); break;
773+
case tvDisplayMode_DIRECT: optionsArray.Add("TV DIRECT"); break;
774+
case tvDisplayMode_NORMAL: optionsArray.Add("TV NORMAL"); break;
775+
case tvDisplayMode_16x9: optionsArray.Add("TV 16X9 STRETCH"); break;
776+
case tvDisplayMode_4x3: optionsArray.Add("TV 4X3 PILLARBOX"); break;
777+
case tvDisplayMode_ZOOM: optionsArray.Add("TV ZOOM"); break;
778+
case tvDisplayMode_FULL: optionsArray.Add("TV FULL"); break;
779+
default: break;
779780
}
780781
}
781782
rangeInfo["options"] = optionsArray;

AVOutput/AVOutputTV.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ class AVOutputTV : public AVOutputBase {
450450
tvError_t GetColorTemperatureCaps(tvColorTemp_t** color_temp, size_t* num_color_temp, tvContextCaps_t** context_caps);
451451
tvError_t GetSdrGammaCaps(tvSdrGamma_t** sdr_gamma, size_t* num_sdr_gamma, tvContextCaps_t** context_caps);
452452
tvError_t GetTVDimmingModeCaps(tvDimmingMode_t** dimming_mode, size_t* num_dimming_mode, tvContextCaps_t** context_caps);
453-
tvError_t GetAspectRatioCaps(tvAspectRatio_t** aspect_ratio, size_t* num_aspect_ratio, tvContextCaps_t** context_caps);
453+
tvError_t GetAspectRatioCaps(tvDisplayMode_t** aspect_ratio, size_t* num_aspect_ratio, tvContextCaps_t** context_caps);
454454
tvError_t GetDVCalibrationCaps(tvDVCalibrationSettings_t **min_values, tvDVCalibrationSettings_t **max_values, tvContextCaps_t **context_caps);
455455
tvError_t GetTVPictureModeCaps( tvContextCaps_t** context_caps);
456456
uint32_t getCapsV2(

AVOutput/AVOutputTVHelper.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2669,7 +2669,7 @@ tvError_t AVOutputTV::GetTVDimmingModeCaps(tvDimmingMode_t** dimming_mode, size_
26692669

26702670
}
26712671

2672-
tvError_t AVOutputTV::GetAspectRatioCaps(tvAspectRatio_t** aspect_ratio, size_t* num_aspect_ratio, tvContextCaps_t** context_caps) {
2672+
tvError_t AVOutputTV::GetAspectRatioCaps(tvDisplayMode_t** aspect_ratio, size_t* num_aspect_ratio, tvContextCaps_t** context_caps) {
26732673
LOGINFO("Entry\n");
26742674
JsonObject root;
26752675
if (ReadJsonFile(root) != tvERROR_NONE) {
@@ -2692,7 +2692,7 @@ tvError_t AVOutputTV::GetAspectRatioCaps(tvAspectRatio_t** aspect_ratio, size_t*
26922692
JsonArray optionsArray = rangeInfo["options"].Array();
26932693

26942694
*num_aspect_ratio = optionsArray.Length();
2695-
*aspect_ratio = static_cast<tvAspectRatio_t*>(malloc(*num_aspect_ratio * sizeof(tvAspectRatio_t)));
2695+
*aspect_ratio = static_cast<tvDisplayMode_t*>(malloc(*num_aspect_ratio * sizeof(tvDisplayMode_t)));
26962696
if (!(*aspect_ratio)) {
26972697
return tvERROR_GENERAL;
26982698
}
@@ -2706,7 +2706,7 @@ tvError_t AVOutputTV::GetAspectRatioCaps(tvAspectRatio_t** aspect_ratio, size_t*
27062706
else if (aspectStr == "TV 16X9 STRETCH") (*aspect_ratio)[i] = tvDisplayMode_16x9;
27072707
else if (aspectStr == "TV 4X3 PILLARBOX") (*aspect_ratio)[i] = tvDisplayMode_4x3;
27082708
else if (aspectStr == "TV ZOOM") (*aspect_ratio)[i] = tvDisplayMode_ZOOM;
2709-
else (*aspect_ratio)[i] = tvAspectRatio_MAX;
2709+
else (*aspect_ratio)[i] = tvDisplayMode_MAX;
27102710
}
27112711

27122712
if (ExtractContextCaps(data, context_caps) != tvERROR_NONE) {

0 commit comments

Comments
 (0)