Skip to content
This repository was archived by the owner on Jan 26, 2023. It is now read-only.
/ rdk-aamp Public archive

Commit b068226

Browse files
nkader321Paulpandian Mariappan
nkader321
authored and
Paulpandian Mariappan
committed
RDKAAMP-267 AAMP acronym (ADVANCED ADAPTIVE MEDIA PLAYER) wrongly printed by aampcli.exe as "MICRO" PLAYER
Reason for change: AAMP acronym and spelling mistakes corrected Test Procedure: Test aampcli and check AAMP acronym printed as ADVANCED ADAPTIVE MEDIA PLAYER Risks: Low Signed-off-by: nkader321 <[email protected]> Change-Id: I2af6321e96a202d18da47ef39381a66f671f552e (cherry picked from commit faa0e0c)
1 parent 9a8ccbc commit b068226

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

README.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ preFetchIframePlaylist Enable prefetching of I-Frame playlist.Default false
6060
preservePipeline Flush instead of teardown.Default false
6161
demuxHlsAudioTrack Demux Audio track from HLS transport stream.Default true
6262
demuxHlsVideoTrack Demux Video track from HLS transport stream.Default true
63-
demuxHlsVideoTrackTrickMode Demux Video track from HLS transport stream during TrickMode.Defaut true
63+
demuxHlsVideoTrackTrickMode Demux Video track from HLS transport stream during TrickMode.Default true
6464
throttle Regulate output data flow,used with restamping. Default false
6565
demuxAudioBeforeVideo Demux video track from HLS transport stream track mode.Default false
6666
stereoOnly Enable selection of stereo only audio.It Overrides forceEC3/disableEC3/disableATMOS.Default false
@@ -109,7 +109,7 @@ client-dai Enable/Disable Client-DAI.Default false
109109
cdnAdsOnly Enable/Disable picking Ads from Fog or CDN . Default false
110110
appSrcForProgressivePlayback Enables appsrc for playing progressive AV type.Default false
111111
seekMidFragment Enable/Disable Mid-Fragment seek .Default false
112-
wifiCurlHeader Enable/Disble wifi custom curl header inclusion.Default true
112+
wifiCurlHeader Enable/Disable wifi custom curl header inclusion.Default true
113113
removeAVEDRMPersistent Enable/Disable code in ave drm to avoid crash when majorerror 3321, 3328 occurs.Default false.
114114
reportBufferEvent Enables Buffer event reporting.Default is true.
115115
info Enable/Disable logging of requested urls.Default is false
@@ -184,22 +184,22 @@ linearTrickPlayFps Specify the framerate for Linear trickplay (defaults to
184184
fragmentRetryLimit Set fragment rampdown/retry limit for video fragment failure (default is -1).
185185
initRampdownLimit Maximum number of rampdown/retries for initial playlist retrieval at tune/seek time. Default is 0 (disabled).
186186
initFragmentRetryCount Max retry attempts for init frag curl timeout failures, default count is 1 (which internally means 1 download attempt and "1 retry attempt after failure").
187-
langCodePreference prefered format for normalizing language code.Default is 0.
187+
langCodePreference preferred format for normalizing language code.Default is 0.
188188
initialBuffer cached duration before playback start, in seconds. Default is 0.
189189
maxTimeoutForSourceSetup Timeout value wait for GStreamer appsource setup to complete.default is 1000.
190190
drmDecryptFailThreshold Retry count on drm decryption failure, default is 10.
191-
segmentInjectFailThreshold Retry count for segment injection discard/failue, default is 10.
191+
segmentInjectFailThreshold Retry count for segment injection discard/failure, default is 10.
192192
preCachePlaylistTime Max time to complete PreCaching default is 0 in minutes
193193
thresholdSizeABR ABR threshold size. Default 6000.
194194
stallTimeout Stall detection timeout. Default is 10sec
195195
stallErrorCode Stall error code.Default is 7600
196-
minABRBufferRampdown Mininum ABR Buffer for Rampdown.Default is 10sec
196+
minABRBufferRampdown Minimum ABR Buffer for Rampdown.Default is 10sec
197197
maxABRBufferRampup Maximum ABR Buffer for Rampup.Default is 15sec
198198
preplayBuffercount Count of segments to be downloaded until play state.Default is 2
199199
downloadDelay Delay for downloads to simulate network latency.Default is 0
200200
onTuneRate Tune rate.Default is INT_MAX
201201
dashMaxDrmSessions Max drm sessions that can be cached by AampDRMSessionManager.Default is 3
202-
log New Configuration to overide info/debug/trace.Default is 0
202+
log New Configuration to override info/debug/trace.Default is 0
203203
livePauseBehavior Player paused state behavior.Default is 0(ePAUSED_BEHAVIOR_AUTOPLAY_IMMEDIATE)
204204
latencyMonitorDelay Low Latency Monitor delay.Default is 5(DEFAULT_LATENCY_MONITOR_DELAY)
205205
latencyMonitorInterval Low Latency Monitor Interval.Default is 2(DEFAULT_LATENCY_MONITOR_INTERVAL)
@@ -212,7 +212,7 @@ licenseServerUrl URL to be used for license requests for encrypted(PR/WV) asset
212212
mapMPD <domain / host to map> Remap HLS playback url to DASH url for matching domain/host string (.m3u8 to .mpd) mapM3U8 <domain / host to map> Remap DASH MPD playback url to HLS m3u8 url for matching domain/host string (.mpd to .m3u8)
213213
harvestPath Specify the path where fragments has to be harvested,check folder permissions specifying the path
214214
networkProxy proxy address to set for all file downloads. Default None
215-
licenseProxy proxy address to set for licese fetch . Default None
215+
licenseProxy proxy address to set for license fetch . Default None
216216
AuthToken SessionToken string to override from Application . Default None
217217
userAgent Curl user-agent string.Default is {Mozilla/5.0 (Linux; x86_64 GNU/Linux) AppleWebKit/601.1 (KHTML, like Gecko) Version/8.0 Safari/601.1 WPE}
218218
customHeader custom header data to be appended to curl request. Default None
@@ -241,7 +241,7 @@ manifestTimeout Specify manifest download time out in seconds, default is 10 s
241241
playlistTimeout Playlist download time out in sec.Default is 10 seconds.
242242

243243
*File Harvest Config :
244-
By default aamp will dump all the type of data, set 0 for desabling harvest
244+
By default aamp will dump all the type of data, set 0 for disabling harvest
245245
0x00000001 (1) - Enable Harvest Video fragments - set 1st bit
246246
0x00000002 (2) - Enable Harvest audio - set 2nd bit
247247
0x00000004 (4) - Enable Harvest subtitle - set 3rd bit
@@ -259,13 +259,13 @@ playlistTimeout Playlist download time out in sec.Default is 10 seconds.
259259
0x00004000 (16384) - Enable Harvest auxiliary audio playlist - set 15th bit
260260
0x00008000 (32768) - Enable Harvest Iframe playlist - set 16th bit
261261
0x00010000 (65536) - Enable Harvest IFRAME init fragment - set 17th bit
262-
example :- if you want harvest only manifest and vide0 fragments , set value like 0x00000001 + 0x00000010 = 0x00000011 = 17
262+
example :- if you want harvest only manifest and video fragments , set value like 0x00000001 + 0x00000010 = 0x00000011 = 17
263263
harvest-config=17
264264
=================================================================================================================
265265
3. Channel Override Settings
266266

267267
Overriding channels in aamp.cfg
268-
aamp.cfg allows to map channnels to custom urls as follows
268+
aamp.cfg allows to map channels to custom urls as follows
269269

270270
*<Token> <Custom url>
271271
This will make aamp tune to the <Custom url> when ever aamp gets tune request to any url with <Token> in it.
@@ -323,7 +323,7 @@ live Seek to live point
323323
exit Gracefully exit application
324324
sap <lang> Select alternate audio language track.
325325
bps <val> Set video bitrate in bps
326-
harvest <harvestConfiguration> Initiate harvesting for space seperated harvest configuration such as
326+
harvest <harvestConfiguration> Initiate harvesting for space separated harvest configuration such as
327327
harvestMode=Master harvestUrl=<url> harvestPath=<path> for Master mode(To download all available profiles)
328328
harvestMode=Slave harvestUrl=<url> harvestConfig=65535 defaultBitrate=400000 defaultBitrate4K=400000 disableDecode=true harvestPath=<path> for Slave mode(To download selective profile)
329329

@@ -395,7 +395,7 @@ in version 2.0
395395
28(0) - Curl 28 occured, network connectivity is down
396396
28(1) = Curl 28 occured, network connectivity is up
397397
404, 42, 7, etc.. = http/curl error code occured during download.
398-
Example : "S":{"200":341,"404":6} - 341 success attemps and 4 attempts with 404
398+
Example : "S":{"200":341,"404":6} - 341 success attempts and 4 attempts with 404
399399
"S":{"200":116,"28(1)":1,"404":114} - 115 success attempts, 114 attempts with 404 and 1 attempt with curl-28
400400
T0
401401
T1

jsbindings/jscontroller-jsbindings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ static const JSClassDefinition AAMP_JSController_class_def =
456456
};
457457

458458
/**
459-
* @brief Sets the custom http headers from recieved json string
459+
* @brief Sets the custom http headers from received json string
460460
* @param[in] headerJson http headers json in string format
461461
*/
462462
void aamp_SetPageHttpHeaders(const char* headerJson)

main_aamp.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ void PlayerInstanceAAMP::SetRateInternal(float rate,int overshootcorrection)
592592
//Hack For DELIA-51318 convert the incoming rates into acceptable rates
593593
if(ISCONFIGSET(eAAMPConfig_RepairIframes))
594594
{
595-
AAMPLOG_WARN("mRepairIframes is true, setting actual rate %d for the recieved rate %f", getWorkingTrickplayRate(rate), rate);
595+
AAMPLOG_WARN("mRepairIframes is true, setting actual rate %d for the received rate %f", getWorkingTrickplayRate(rate), rate);
596596
rate = getWorkingTrickplayRate(rate);
597597
}
598598

@@ -1163,7 +1163,7 @@ void PlayerInstanceAAMP::SetRateAndSeek(int rate, double secondsRelativeToTuneTi
11631163
//Hack For DELIA-51318 convert the incoming rates into acceptable rates
11641164
if(ISCONFIGSET(eAAMPConfig_RepairIframes))
11651165
{
1166-
AAMPLOG_WARN("mRepairIframes is true, setting actual rate %d for the recieved rate %d", getWorkingTrickplayRate(rate), rate);
1166+
AAMPLOG_WARN("mRepairIframes is true, setting actual rate %d for the received rate %d", getWorkingTrickplayRate(rate), rate);
11671167
rate = getWorkingTrickplayRate(rate);
11681168
}
11691169

priv_aamp.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -10445,7 +10445,7 @@ void PrivateInstanceAAMP::SetPreferredLanguages(const char *languageList, const
1044510445
jsObject = new AampJsonObject(languageList);
1044610446
if (jsObject)
1044710447
{
10448-
AAMPLOG_INFO("Preferred Language Properties recieved as json : %s", languageList);
10448+
AAMPLOG_INFO("Preferred Language Properties received as json : %s", languageList);
1044910449
isJson = true;
1045010450
}
1045110451
}
@@ -10486,8 +10486,8 @@ void PrivateInstanceAAMP::SetPreferredLanguages(const char *languageList, const
1048610486
AAMPLOG_ERR("Preferred Audio Language Field Only support String or String Array");
1048710487
}
1048810488

10489-
AAMPLOG_INFO("Number of preferred languages recieved: %d", inputLanguagesList.size());
10490-
AAMPLOG_INFO("Preferred language string recieved: %s", inputLanguagesString.c_str());
10489+
AAMPLOG_INFO("Number of preferred languages received: %d", inputLanguagesList.size());
10490+
AAMPLOG_INFO("Preferred language string received: %s", inputLanguagesString.c_str());
1049110491

1049210492
std::string inputLabelsString;
1049310493
/** Get Label Properties*/
@@ -10834,7 +10834,7 @@ void PrivateInstanceAAMP::SetPreferredTextLanguages(const char *param )
1083410834
jsObject = new AampJsonObject(param);
1083510835
if (jsObject)
1083610836
{
10837-
AAMPLOG_INFO("Preferred Text Language Properties recieved as json : %s", param);
10837+
AAMPLOG_INFO("Preferred Text Language Properties received as json : %s", param);
1083810838
isJson = true;
1083910839
}
1084010840
}

test/aampcli/Aampcli.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ int main(int argc, char **argv)
325325
mAbrManager.setLogDirectory(driveName);
326326

327327
printf("**************************************************************************\n");
328-
printf("** ADVANCED ADAPTIVE MICRO PLAYER (AAMP) - COMMAND LINE INTERFACE (CLI) **\n");
328+
printf("** ADVANCED ADAPTIVE MEDIA PLAYER (AAMP) - COMMAND LINE INTERFACE (CLI) **\n");
329329
printf("**************************************************************************\n");
330330

331331
mAampcli.initPlayerLoop(0,NULL);

0 commit comments

Comments
 (0)