loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set MIME type from IMA SDK on ads MediaItem

Browse Source 
This helps to play ads where the file extension is not sufficient
to deduce the correct source in DefaultMediaSourceFactory.

PiperOrigin-RevId: 582340114
This commit is contained in:
tonihei 2023-11-14 09:04:05 -08:00 committed by Copybara-Service
parent 03a23bef8f
commit 9bf1852069
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -48,6 +48,8 @@
* Effect: * Effect:
* Muxers: * Muxers:
* IMA extension: * IMA extension:
* Fix issue where DASH and HLS ads without the appropriate file extension
can't be played.
* Session: * Session:
* Put the custom keys and values in `MediaMetadataCompat` to * Put the custom keys and values in `MediaMetadataCompat` to
`MediaMetadata.extras` `MediaMetadata.extras`

10
libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/AdTagLoader.java
View File

@ -183,6 +183,9 @@ import java.util.Map;
/** Whether IMA has been notified that playback of content has finished. */ /** Whether IMA has been notified that playback of content has finished. */
private boolean sentContentComplete; private boolean sentContentComplete;
/** The MIME type of the ad pod that is next requested via an {@link AdEventType#LOADED} event. */
@Nullable private String pendingAdMimeType;
// Fields tracking the player/loader state. // Fields tracking the player/loader state.
/** Whether the player is playing an ad. */ /** Whether the player is playing an ad. */
@ -775,6 +778,9 @@ import java.util.Map;
String message = "AdEvent: " + adData; String message = "AdEvent: " + adData;
Log.i(TAG, message); Log.i(TAG, message);
break; break;
case LOADED:
pendingAdMimeType = adEvent.getAd().getContentType();
break;
default: default:
break; break;
} }
@ -981,6 +987,10 @@ import java.util.Map;
} }
MediaItem.Builder adMediaItem = new MediaItem.Builder().setUri(adMediaInfo.getUrl()); MediaItem.Builder adMediaItem = new MediaItem.Builder().setUri(adMediaInfo.getUrl());
if (pendingAdMimeType != null) {
adMediaItem.setMimeType(pendingAdMimeType);
pendingAdMimeType = null;
}
adPlaybackState = adPlaybackState =
adPlaybackState.withAvailableAdMediaItem( adPlaybackState.withAvailableAdMediaItem(
adInfo.adGroupIndex, adInfo.adIndexInAdGroup, adMediaItem.build()); adInfo.adGroupIndex, adInfo.adIndexInAdGroup, adMediaItem.build());

25
libraries/exoplayer_ima/src/test/java/androidx/media3/exoplayer/ima/ImaAdsLoaderTest.java
View File

@ -283,6 +283,31 @@ public final class ImaAdsLoaderTest {
adsMediaSource, /* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, new IOException()); adsMediaSource, /* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, new IOException());
} }
@Test
public void loadAd_withAdContentTypeSet_setsMimeTypeInAdPlaybackState() {
// Load the preroll ad with content type set. Intentionally use all lower-case HLS MIME type as
// this is what the IMA SDK sets.
when(mockPrerollSingleAd.getContentType()).thenReturn("application/x-mpegurl");
imaAdsLoader.start(
adsMediaSource, TEST_DATA_SPEC, TEST_ADS_ID, adViewProvider, adsLoaderListener);
adEventListener.onAdEvent(getAdEvent(AdEventType.LOADED, mockPrerollSingleAd));
videoAdPlayer.loadAd(TEST_AD_MEDIA_INFO, mockAdPodInfo);
// Verify that the preroll ad has been marked with the expected MIME type.
assertThat(getAdPlaybackState(/* periodIndex= */ 0))
.isEqualTo(
new AdPlaybackState(TEST_ADS_ID, /* adGroupTimesUs...= */ 0)
.withContentDurationUs(CONTENT_PERIOD_DURATION_US)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
.withAvailableAdMediaItem(
/* adGroupIndex= */ 0,
/* adIndexInAdGroup= */ 0,
TEST_MEDIA_ITEM.buildUpon().setMimeType(MimeTypes.APPLICATION_M3U8).build())
.withAdDurationsUs(new long[][] {{TEST_AD_DURATION_US}})
.withAdResumePositionUs(/* adResumePositionUs= */ 0));
}
@Test @Test
public void playback_withPrerollAd_marksAdAsPlayed() { public void playback_withPrerollAd_marksAdAsPlayed() {
// Load the preroll ad. // Load the preroll ad.