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

Fix AllocationNode javadoc and simplify internal state

Browse Source 
Remove wasInitialized in favor of using allocation's nullability to
represent the initialization state.

PiperOrigin-RevId: 420011311
This commit is contained in:
aquilescanta 2022-01-06 09:57:28 +00:00 committed by Oliver Woodman
parent 5b87cd0568
commit 9dbace132a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java
View File

@ -207,14 +207,14 @@ import java.util.Arrays;
* @param fromNode The node from which to clear. * @param fromNode The node from which to clear.
*/ */
private void clearAllocationNodes(AllocationNode fromNode) { private void clearAllocationNodes(AllocationNode fromNode) {
if (!fromNode.wasInitialized) { if (fromNode.allocation == null) {
return; return;
} }
// Bulk release allocations for performance (it's significantly faster when using // Bulk release allocations for performance (it's significantly faster when using
// DefaultAllocator because the allocator's lock only needs to be acquired and released once) // DefaultAllocator because the allocator's lock only needs to be acquired and released once)
// [Internal: See b/29542039]. // [Internal: See b/29542039].
int allocationCount = int allocationCount =
(writeAllocationNode.wasInitialized ? 1 : 0) (writeAllocationNode.allocation != null ? 1 : 0)
+ ((int) (writeAllocationNode.startPosition - fromNode.startPosition) + ((int) (writeAllocationNode.startPosition - fromNode.startPosition)
/ allocationLength); / allocationLength);
Allocation[] allocationsToRelease = new Allocation[allocationCount]; Allocation[] allocationsToRelease = new Allocation[allocationCount];
@ -235,7 +235,7 @@ import java.util.Arrays;
* {@code length}. * {@code length}.
*/ */
private int preAppend(int length) { private int preAppend(int length) {
if (!writeAllocationNode.wasInitialized) { if (writeAllocationNode.allocation == null) {
writeAllocationNode.initialize( writeAllocationNode.initialize(
allocator.allocate(), allocator.allocate(),
new AllocationNode(writeAllocationNode.endPosition, allocationLength)); new AllocationNode(writeAllocationNode.endPosition, allocationLength));
@ -472,13 +472,13 @@ import java.util.Arrays;
public final long startPosition; public final long startPosition;
/** The absolute position of the end of the data (exclusive). */ /** The absolute position of the end of the data (exclusive). */
public final long endPosition; public final long endPosition;
/** Whether the node has been initialized. Remains true after {@link #clear()}. */ /**
public boolean wasInitialized; * The {@link Allocation}, or {@code null} if the node is not {@link #initialize initialized}.
/** The {@link Allocation}, or {@code null} if the node is not initialized. */ */
@Nullable public Allocation allocation; @Nullable public Allocation allocation;
/** /**
* The next {@link AllocationNode} in the list, or {@code null} if the node has not been * The next {@link AllocationNode} in the list, or {@code null} if the node is not {@link
* initialized. Remains set after {@link #clear()}. * #initialize initialized}.
*/ */
@Nullable public AllocationNode next; @Nullable public AllocationNode next;
@ -501,7 +501,6 @@ import java.util.Arrays;
public void initialize(Allocation allocation, AllocationNode next) { public void initialize(Allocation allocation, AllocationNode next) {
this.allocation = allocation; this.allocation = allocation;
this.next = next; this.next = next;
wasInitialized = true;
} }
/** /**