Add WrappingMediaSource #10446

stoyicker · 2022-07-16T08:38:40Z

This is a CompositeMediaSource with a slightly simpler API. I thought it was a bit more readable than the current usage of CompositeMediaSource to signify a single-source one.

PiperOrigin-RevId: 459106221

This is to be consistent with what cast `QueueMediaItem` is doing. If a contentId is not available the contentUrl is used as the ID. #minor-release PiperOrigin-RevId: 459133323

This profile is declared as supported although it isn't. Issue: google#10345 Issue: google#3537 #minor-release PiperOrigin-RevId: 459205512

HDR editing is not supported under API 31 PiperOrigin-RevId: 459211106

PiperOrigin-RevId: 459215225

PiperOrigin-RevId: 459215618

The SDR constant also specified a color space and range, in addition to C.COLOR_TRANSFER_SDR. However, it turns out that SDR videos may use different color space and range values, so following prior ExoPlayer conventions to have `null` mean "generic SDR" is preferable here. PiperOrigin-RevId: 459296746

@OverRide

We wait until a previous AudioTrack has been released before creating a new one. This is currently done with a thread block operation, which may cause ANRs in the extreme case when someone attempts to release the player while this is still blocked. The problem can be avoided by just returning false from DefaultAudioSink.handleBuffer to try again until the previous AudioTrack is released. Reproduction steps to force the issue: 1. Add Thread.sleep(10000); to the AudioTrack release thread. 2. Add this to the demo app: private int positionMs = 0; Handler handler = new Handler(); handler.post(new Runnable() { @OverRide public void run() { player.seekTo(positionMs++); if (positionMs == 10) { player.release(); } else { handler.postDelayed(this, 1000); } } 3. Observe Player release timeout exception. These steps can't be easily captured in a unit test as we can't artifically delay the AudioTrack release from the test. Issue: google#10057 PiperOrigin-RevId: 459468912

PiperOrigin-RevId: 459485334

Some other minor nits and adjustments to the API logic. PiperOrigin-RevId: 459490431

Also added the test to `MP4PlaybackTest`. PiperOrigin-RevId: 459492188

#minor-release Issue: google#10420 PiperOrigin-RevId: 460223064

- Added setter to disable this feature. - Added accompanying tests. - Plan to run tests on the same set of settings on H265. PiperOrigin-RevId: 460238673

This saves an intermediate texture copy step for use-cases where matrix transformations are the first or only effects in the chain. PiperOrigin-RevId: 460239403

The media item needs to be assigned to `Window.mediaItem` in `CastTimeline.setWindow`. For this the `MediaItem` needs to be available in the timeline. When a `MediaItem` is passed to the `set/addMediaItems` method, we can't yet know the Cast `MediaQueueItem.itemId` that is generated on the device and arrives with an async update of the `RemoteMediaClient` state. Hence in the `CastTimelineTracker`, we need to store the `MediaItem` by Casts's `MediaItem.contentId`. When we then receive the updated queue, we look the media item up by the content ID to augment the `ItemData` that is available in the `CastTimeline`. Issue: androidx/media#25 Issue: google#8212 #minor-release PiperOrigin-RevId: 460325235

This extension is needed for editing HDR input with OpenGL, as the ExternalTextureProcessor samples raw YUV values from the external texture for HDR and converts them to RGB itself rather than relying on the OpenGL driver to do this automatically as for SDR. PiperOrigin-RevId: 460424154

Pass the color info and HDR static metadata when configuring the decoder using MediaFormatUtil.maybeSetColorInfo. PiperOrigin-RevId: 460424985

I don't think it's useful to keep these in numerical order, it makes more sense to keep them grouped into a 'logical' ordering. #minor-release PiperOrigin-RevId: 460453464

PiperOrigin-RevId: 460459378

Some calls to handleBuffer return false while a previous flush is still handled in the background. Fix this by either asserting the method returns true if we don't expect any delay, or calling it repeatedly until it returns true (within a timeout). PiperOrigin-RevId: 460474419

Issue: androidx/media#25 PiperOrigin-RevId: 460476841

Issue: google#2518 PiperOrigin-RevId: 460482615

`HevcConfig.parse` misreads reserved bit to determine NAL unit type. This is currently meant to be always set to 0, but could be given some kind of meaning in a future revision. Issue: google#10366 PiperOrigin-RevId: 460487613

PiperOrigin-RevId: 460500666

PiperOrigin-RevId: 460513413

Leaving the media item that has been passed in unchanged, ensures that the media item in the timeline is equal to the media item that the user has passed into the player. The value of the tag is the uid of the window, meaning this is redundant information. #minor-release PiperOrigin-RevId: 460542246

Note: This was already reviewed in <unknown commit>. This doesn't mean we cannot apply further changes though. PiperOrigin-RevId: 460542835

PiperOrigin-RevId: 460662425

#cleanup #minor-release PiperOrigin-RevId: 460688226

PiperOrigin-RevId: 460689252

Add test that verifies SSIM with API enabled. #minor-release PiperOrigin-RevId: 460692420

We currently start a simple Thread to release AudioTracks asynchronously. If many AudioTracks are released at the same time, this may lead to OOM situations because we attempt to create multiple new threads. This can be improved by using a shared SingleThreadExecutor. In the simple case of one simmultaneous release, it's exactly the same behavior as before: create a thread and release it as soon as it's done. For multiple simultanous releases we get the advantage of sharing a single thread to avoid creating more than one at the same time. Issue: google#10057 PiperOrigin-RevId: 460698942

The call doesn't currently reset the already loaded suppliers and factories. Also fix the supplier loading code to use a local copy of the current dataSourceFactory to avoid leaking an updated instance to a later invocation. Issue: androidx/media#116 #minor-release PiperOrigin-RevId: 460721541

Also remove VideoEncoderSettings.colorProfile as there are no concrete use cases for customizing this and it clashes with picking the color format automatically based on SDR vs. HDR. PiperOrigin-RevId: 460746987

These are providing more variety and complexity. All files are okay to be public. PiperOrigin-RevId: 460935247

#minor-release PiperOrigin-RevId: 461162552

PiperOrigin-RevId: 461165173

tonihei · 2022-07-18T10:59:43Z

library/core/src/main/java/com/google/android/exoplayer2/source/SimpleMediaSource.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project


This should be 2022 :)

tonihei · 2022-07-18T11:02:28Z

library/core/src/main/java/com/google/android/exoplayer2/source/SimpleMediaSource.java

+/**
+ * Single-child {@link CompositeMediaSource}.
+ */
+public abstract class SimpleMediaSource extends CompositeMediaSource<Void> {


I think it might be caller to call this class WrappingMediaSource because "simple" doesn't really tell anyone what it's for.

tonihei · 2022-07-18T11:08:05Z

library/core/src/main/java/com/google/android/exoplayer2/source/SimpleMediaSource.java

+   * @param timeline The timeline of the source.
+   */
+  protected abstract void onChildSourceInfoRefreshed(
+      MediaSource mediaSource, Timeline timeline


The implementation of this class knows the wrapped inner mediaSource, so no need to pass it back here I think.

Not sure I agree 100% - it of course knew when it called prepareChildSource, but for it to know when this is called it'd have to have kept a reference to it somehow. And that is possible, but so is that a regular CompositeMediaSource inheritor keeps a mapping between ids and mediasources itself, so that it could retrieve the child just by using the id parameter on CompositeMediaSource.onChildSourceInfoRefreshed, and therefore applying this same argument then the MediaSource parameter wouldn't be needed there either. Without wanting to create a discussion on whether that argument should be removed in CompositeMediaSource.onChildSourceInfoRefreshed, I think for the sake of consistency with CompositeMediaSource the argument is better kept here too. Am I making sense?

It does make sense generally, but I think all implementations of this WrappingMediaSource will need to have a local reference to the wrapped child media source in any case. For example, the implementation couldn't create MediaPeriod from createPeriod if it doesn't have a reference to the child source.

I think for the sake of consistency with CompositeMediaSource

We are already changing the method signature by removing the useless argument, so there is no consistency to start with?

tonihei · 2022-07-18T11:16:02Z

library/core/src/main/java/com/google/android/exoplayer2/source/SimpleMediaSource.java

+  }
+
+  /**
+   * @deprecated - Use {@link #getWindowIndexForChildWindowIndex(int)}.


This method isn't really deprecated and you can just remove the comment entirely. Same for the other cases below.

Why not deprecate it? Would receivers of this class really want a method that takes an id?

The difference is that our libraries never use @deprecated for cases where the method itself is redirected. There also shouldn't be any caller besides CompositeMediaSource itself, so it seems easier to the deprecated tag.

tonihei · 2022-07-18T11:18:24Z

Thanks for the contribution!

For reference: I believe this is solving #7279.

Is there any chance you can rebase this change on the main branch of the Media3 repo? This would make the merging process a lot easier for us.

stoyicker · 2022-07-18T12:47:52Z

I've rebased on top of 9271572 from media3, feel free to change the PR base for a simpler diff if you have a more fitting one

tonihei · 2022-07-19T11:57:11Z

I've rebased on top of 9271572 from media3

Sorry, I think my question was a bit unclear. I actually meant to file a new PR against the main branch of the Media3 project . The files look exactly the same, but have different package names.

This is a CompositeMediaSource<Void> with a slightly simpler API.

stoyicker · 2022-07-19T12:22:38Z

androidx/media#123

dway123 and others added 30 commits July 7, 2022 16:39

HDR: Remove unused EGL_GL_COLORSPACE_KHR attribute.

1869855

PiperOrigin-RevId: 459106221

Use mediaId as contentId if available

0a9f900

This is to be consistent with what cast `QueueMediaItem` is doing. If a contentId is not available the contentUrl is used as the ID. #minor-release PiperOrigin-RevId: 459133323

Exclude HEVC 10bit profile on Pixel 1.

656eaf7

This profile is declared as supported although it isn't. Issue: google#10345 Issue: google#3537 #minor-release PiperOrigin-RevId: 459205512

HDR: Throw error if attempting HDR editing under API 31.

ab7747d

HDR editing is not supported under API 31 PiperOrigin-RevId: 459211106

Merge pull request google#10260 from sr1990:clearkey_parse_licenseurl

f00f93a

PiperOrigin-RevId: 459215225

Fix incorrect link tags

87adb88

PiperOrigin-RevId: 459215618

Add missing Nullable annotation

cb87b74

PiperOrigin-RevId: 459485334

Move Encoder quality API to VideoEncoderSettings.

91f1777

Some other minor nits and adjustments to the API logic. PiperOrigin-RevId: 459490431

Add tests for extracting MP4 with large bitrates

05e728a

Also added the test to `MP4PlaybackTest`. PiperOrigin-RevId: 459492188

Listen to playWhenReady changes in LeanbackPlayerAdapter

4eb34e4

#minor-release Issue: google#10420 PiperOrigin-RevId: 460223064

Apply priority/operating rate settings for video encoding.

18f4068

- Added setter to disable this feature. - Added accompanying tests. - Plan to run tests on the same set of settings on H265. PiperOrigin-RevId: 460238673

Merge MatrixTransformationProcessor and ExternalTextureProcessor.

7dc54ef

This saves an intermediate texture copy step for use-cases where matrix transformations are the first or only effects in the chain. PiperOrigin-RevId: 460239403

Set ColorInfo in decoder configuration format.

66e1229

Pass the color info and HDR static metadata when configuring the decoder using MediaFormatUtil.maybeSetColorInfo. PiperOrigin-RevId: 460424985

Group COMMAND_SET_MEDIA_ITEM and COMMAND_CHANGE_MEDIA_ITEMS together

ad46cb1

I don't think it's useful to keep these in numerical order, it makes more sense to keep them grouped into a 'logical' ordering. #minor-release PiperOrigin-RevId: 460453464

Verified encoding performance, removing TODO.

776c8a5

PiperOrigin-RevId: 460459378

Enable onMediaMetadataChanged in CastPlayer

6922bd5

Issue: androidx/media#25 PiperOrigin-RevId: 460476841

Add method to check if tunneling is enabled.

549496f

Issue: google#2518 PiperOrigin-RevId: 460482615

Ignore reserved bit in parsing NAL unit type

704aa25

`HevcConfig.parse` misreads reserved bit to determine NAL unit type. This is currently meant to be always set to 0, but could be given some kind of meaning in a future revision. Issue: google#10366 PiperOrigin-RevId: 460487613

Fix a mis-match in encoder priority.

e56219f

PiperOrigin-RevId: 460500666

Merge pull request google#110 from ittiam-systems:rtp_vp8_test

9d9bbe3

PiperOrigin-RevId: 460513413

Add migration script

f9a3920

Note: This was already reviewed in <unknown commit>. This doesn't mean we cannot apply further changes though. PiperOrigin-RevId: 460542835

Fix two typos in RtpVp8Reader and test

40fd3ff

PiperOrigin-RevId: 460662425

Clarify format is supported by encoder.

a88426a

#cleanup #minor-release PiperOrigin-RevId: 460688226

Merge pull request google#10185 from TiVo:p-custom-logger

bd8723e

PiperOrigin-RevId: 460689252

Samrobbo and others added 7 commits July 13, 2022 17:46

Fix assertion error when using high quality targeting API.

f903869

Add test that verifies SSIM with API enabled. #minor-release PiperOrigin-RevId: 460692420

Use COLOR_Format32bitABGR2101010 for HDR encoder configuration.

7954eeb

Also remove VideoEncoderSettings.colorProfile as there are no concrete use cases for customizing this and it clashes with picking the color format automatically based on SDR vs. HDR. PiperOrigin-RevId: 460746987

Add additional video files.

b87fa45

These are providing more variety and complexity. All files are okay to be public. PiperOrigin-RevId: 460935247

Version bump to exoplayer:2.18.1 and media3:1.0.0-beta02

be27dae

#minor-release PiperOrigin-RevId: 461162552

Add TODOs for registerReceiver calls without flag

9271572

PiperOrigin-RevId: 461165173

tonihei self-assigned this Jul 18, 2022

tonihei reviewed Jul 18, 2022

View reviewed changes

stoyicker force-pushed the simple_media_source branch from 1b29f58 to acb2732 Compare July 18, 2022 12:45

stoyicker changed the title ~~Add SimpleMediaSource~~ Add WrappingMediaSource Jul 18, 2022

stoyicker added 2 commits July 19, 2022 14:15

Add WrappingMediaSource

951b131

This is a CompositeMediaSource<Void> with a slightly simpler API.

Replace usages of CompositeMediaSource<Void> with WrappingMediaSource

ba9f3d8

stoyicker force-pushed the simple_media_source branch from acb2732 to ba9f3d8 Compare July 19, 2022 12:19

stoyicker mentioned this pull request Jul 19, 2022

Add WrappingMediaSource androidx/media#123

Merged

stoyicker closed this Jul 19, 2022

stoyicker mentioned this pull request Jul 25, 2022

DownloadManager task sync creates too many concurrently-running threads for moderate amounts of STATE_RESTARTING or STATE_REMOVING downloads in index #10458

Closed

1 task

tonihei mentioned this pull request Aug 2, 2022

Allow playlist items to specify a start position #6373

Open

tonihei mentioned this pull request Aug 30, 2022

Play ads repeatedly for media items that are repeated #10439

Open

google locked and limited conversation to collaborators Sep 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add WrappingMediaSource #10446

Add WrappingMediaSource #10446

stoyicker commented Jul 16, 2022

tonihei Jul 18, 2022

stoyicker Jul 18, 2022

tonihei Jul 18, 2022

stoyicker Jul 18, 2022

tonihei Jul 18, 2022

stoyicker Jul 18, 2022

tonihei Jul 19, 2022

tonihei Jul 18, 2022

stoyicker Jul 18, 2022

tonihei Jul 19, 2022

tonihei commented Jul 18, 2022

stoyicker commented Jul 18, 2022

tonihei commented Jul 19, 2022

stoyicker commented Jul 19, 2022

		@@ -0,0 +1,124 @@
		/*
		* Copyright (C) 2018 The Android Open Source Project

Add WrappingMediaSource #10446

Add WrappingMediaSource #10446

Conversation

stoyicker commented Jul 16, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tonihei commented Jul 18, 2022

stoyicker commented Jul 18, 2022

tonihei commented Jul 19, 2022

stoyicker commented Jul 19, 2022