Skip to content

Commit

Permalink
Merge pull request #83 from bitmovin/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
felix-hoc authored Apr 12, 2022
2 parents 344929d + 0712456 commit 188fe27
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 36 deletions.
3 changes: 2 additions & 1 deletion analytics/analytics-bitrate-ladder-validator/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
"testing",
"QOE"
],
"hide_github_link": true
"hide_github_link": true,
"priority": 1020
}
24 changes: 4 additions & 20 deletions player/ad-event-verification-omsdk/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<script src="https://cdn.bitmovin.com/content/player-web/lib/omsdk/omweb-js-1.3.25/Service/omweb-v1.js" type="text/javascript"></script>
<script src="https://cdn.bitmovin.com/content/player-web/lib/omsdk/omweb-js-1.3.25/Session-Client/omid-session-client-v1.js" type="text/javascript"></script>
<script src="https://cdn.bitmovin.com/player/web/8/bitmovinplayer.js" type="text/javascript"></script>
<script src="https://cdn.bitmovin.com/player/web/8/bitmovinplayer-ui.js" type="text/javascript"></script>
<script src="https://cdn.bitmovin.com/analytics/web/beta/2/bitmovinanalytics.min.js" type="text/javascript"></script>
Expand Down Expand Up @@ -35,7 +33,7 @@
<label for="partnerversion-input">
Partner Version
</label>
<input class="form-control" id="partnerversion-input" name="manifest-input" placeholder="1.3.25" type="text">
<input class="form-control" id="partnerversion-input" name="manifest-input" placeholder="1.0.0" type="text">
</div>
<div class="demo-input-box input mx-0">
<div class="demo-item-header">
Expand Down Expand Up @@ -72,38 +70,24 @@ <h2>
</h2>
</div>
<div class="w-100 my-4">
<p>
1. Acquire the OM SDK files from the
<a href="https://tools.iabtechlab.com/omsdk">
IAB Tech Lab Tools Portal
</a>
</p>
<p class="mb-3">
2. Include the following scripts in your page
1. Include Bitmovin Player Advertising module (BAM) and the Advertising OM SDK module in your page
</p>
<ul class="ml-4">
<li>
OM SDK Scripts: Service Script and JS Session Client
</li>
<li>
Bitmovin Player Scripts including the Bitmovin Advertising module (BAM) and the Advertising OM SDK module
</li>
</ul>
</div>
<div class="setup-code w-100">
${code:page.html}
</div>
<div class="w-100 my-4">
<p class="mb-3">
3. Set up the player instance for ad verification using OM SDK
2. Set up the player instance for ad verification using OM SDK
</p>
<ol class="ml-4" type="a">
<li>
Add player modules to player core
</li>
<li>
Create a player configuration including a
<a href="https://bitmovin.com/docs/player/api-reference/web/web-sdk-api-reference-v8#/player/web/8/docs/interfaces/advertising.verificationresource.html">
<a href="https://bitmovin.com/docs/player/api-reference/web/web-sdk-api-reference-v8#/player/web/8/docs/interfaces/advertising.omsdktracker.html">
OM SDK Tracker configuration
</a>
</li>
Expand Down
4 changes: 0 additions & 4 deletions player/ad-event-verification-omsdk/page.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!-- Open Measurement SDK Scripts -->
<script type="text/javascript" src="./omsdk/Service/omweb-v1.js"></script>
<script type="text/javascript" src="./omsdk/Session-Client/omid-session-client-v1.js"></script>

<!-- Bitmovin Modular Player Scripts -->
<script type="text/javascript" src="https://cdn.bitmovin.com/player/web/8/modules/bitmovinplayer-core.js"></script>
<script type="text/javascript" src="https://cdn.bitmovin.com/player/web/8/modules/bitmovinplayer-engine-bitmovin.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion player/ad-event-verification-omsdk/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var conf = {
trackers: {
omSdk: {
partnerName: 'awesome-company',
partnerVersion: '1.3.25',
partnerVersion: '1.0.0',
verificationResources: [{
validationScriptUrl: 'https://somewhere.com/validation-script.js',
}]
Expand Down
2 changes: 1 addition & 1 deletion player/drm/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ <h4 class="sdk-wrapper-title">Try our SDKs</h4>
</div>
</a>
</div>
<a target="_blank" class="sdk-item-url" href="https://play.google.com/store/apps/details?id=com.bitmovin.playerdemo">
<a target="_blank" class="sdk-item-url" href="https://play.google.com/store/apps/details?id=com.bitmovin.demo.player">
<img src="https://bitmovin-a.akamaihd.net/webpages/demo-fw/stream-test/GooglePlay.svg" />
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion player/drm/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
"widevine",
"playready"
],
"priority": 880
"priority": 1040
}
2 changes: 1 addition & 1 deletion player/native-sdks/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</a>
</div>
<div class="col-6">
<a href="https://play.google.com/store/apps/details?id=com.bitmovin.playerdemo" target="_blank"
<a href="https://play.google.com/store/apps/details?id=com.bitmovin.demo.player" target="_blank"
title="Bitmovin on Google Play" class="d-flex justify-content-start align-center">
<img src="//bitmovin-a.akamaihd.net/webpages/demo-fw/native-sdks/google-play-badge.svg"
alt="Bitmovin on Google Play">
Expand Down
4 changes: 4 additions & 0 deletions player/player-ui-styling/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ a {
/*background-color: #ff1237;*/
/*}*/

.bmpui-seekbar.bigseek > * {
font-size: 3em;
}

.bmpui-seekbar-backdrop.orange {
background-color: #ff931e !important;
}
Expand Down
4 changes: 2 additions & 2 deletions player/player-ui-styling/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
</button>
</div>
<div class="col-md-12">
<button class="ui-button btn btn-warning" id="bigseek" type="button">
<button class="ui-button btn btn-secondary" id="bigseek" type="button">
Toggle Big Seek Bar
</button>
</div>
<div class="col-md-12">
<button class="ui-button btn btn-secondary" id="color1" type="button">
<button class="ui-button btn btn-warning" id="color1" type="button">
Orange Seek Bar
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions player/player-ui-styling/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var source = {
poster: 'https://bitmovin-a.akamaihd.net/content/sintel/poster.png'
};

var currentUiManager, isBigSeekbar = false, isSmallscreen = false;
var currentUiManager, isSmallscreen = false;

var playerContainer = document.getElementById('player-container');
var player = new bitmovin.player.Player(playerContainer, conf);
Expand All @@ -43,8 +43,8 @@ document.getElementById('watermark').addEventListener('click', function() {


document.getElementById('bigseek').addEventListener('click', function() {
$('.bmpui-ui-seekbar').css('font-size', isBigSeekbar ? '1em' : '3em');
isBigSeekbar = !isBigSeekbar;
var seekbar = $('.bmpui-seekbar')[0];
seekbar.classList.toggle('bigseek');
});

document.getElementById('color2').addEventListener('click', function() {
Expand Down
4 changes: 4 additions & 0 deletions player/stream-test/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ body:not(.fullscreen) :not(.no-frame).notebook-frame::before {
margin-top: 47px;
}

#player, #player > * {
border-radius: 0 !important;
}

.sdk-wrapper-title {
font-size: 20px;
line-height: 23px;
Expand Down
2 changes: 1 addition & 1 deletion player/stream-test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ <h4 class="sdk-wrapper-title">Try our SDKs</h4>
</div>
</a>
</div>
<a target="_blank" class="sdk-item-url" href="https://play.google.com/store/apps/details?id=com.bitmovin.playerdemo">
<a target="_blank" class="sdk-item-url" href="https://play.google.com/store/apps/details?id=com.bitmovin.demo.player">
<img src="https://bitmovin-a.akamaihd.net/webpages/demo-fw/stream-test/GooglePlay.svg" />
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion player/stream-test/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
"test",
"player"
],
"priority": 900
"priority": 1060
}

0 comments on commit 188fe27

Please sign in to comment.