Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: detect duplicate resource ids in virtual track #350

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Feature: detect duplicate resource ids in virtual track #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a235508
Detecting duplicate resource ids for non-identical resource entries.
danielhdz13-netflix Jun 14, 2023
f0a2cae
Updating the definition of equality for IMFTrackFileResourceType to n…
danielhdz13-netflix Jun 14, 2023
64ba98f
Updating test CPL to keep error count consistent in existing tests.
danielhdz13-netflix Jun 14, 2023
585aa32
Removing utility method used during debugging
danielhdz13-netflix Jun 14, 2023
95d3b6c
Updating error severity to NON_FATAL
danielhdz13-netflix Jun 14, 2023
76d6ff6
Removing unnecessary import
danielhdz13-netflix Jun 14, 2023
8b1675e
Removing draft code
danielhdz13-netflix Jun 14, 2023
67a6a52
Using all elements except id for equivalence check
danielhdz13-netflix Jun 16, 2023
84bff19
Using all elements of trackFileResourceType for equals and hashcode
danielhdz13-netflix Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions src/main/java/com/netflix/imflibrary/st2067_2/AbstractApplicationComposition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,7 @@
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;

/**
Expand Down Expand Up @@ -236,6 +226,25 @@ private static Map<UUID, List<IMFBaseResourceType>> getVirtualTrackResourceMap(@
if (virtualTrackResourceMap.get(uuid) == null) {
virtualTrackResourceMap.put(uuid, new ArrayList<IMFBaseResourceType>());
}
/*
Ensure that no two resources use the same ID, unless they are the same resource. ST-2067-3:2020, 6.11.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on this statement the equals and hashcode methods for the resource should include all the elements defined in the resource.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the PR so that the equals and hashcode methods include all elements.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would interpret 6.11.1 as meaning that Resource IDs are unique throughout the entire composition:
"No two Resouces shall have the same ID value unless they are identical."

It looks like this check is limited to detecting duplicates only within the same Sequence.
As a practical matter, that is generally good enough. But I believe there are other possible scenarios that this check would still miss.

*/
Set<String> resourceIdSet = new HashSet<>();
Set<IMFBaseResourceType> resourceSet = new HashSet<>();
for (IMFBaseResourceType baseResource : sequence.getResourceList()) {
String resourceId = baseResource.getId();
if (!resourceIdSet.contains(resourceId)) {
resourceIdSet.add(resourceId);
resourceSet.add(baseResource);
} else {
if (!resourceSet.contains(baseResource)) {
imfErrorLogger.addError(IMFErrorLogger.IMFErrors.ErrorCodes.IMF_CPL_ERROR,
IMFErrorLogger.IMFErrors.ErrorLevels.NON_FATAL, String.format("The CPL contains different resources with the same ID %s in virtual track %s",
resourceId,
sequence.getTrackId()));
}
}
}

for (IMFBaseResourceType baseResource : sequence.getResourceList()) {
/* Ignore track file resource with zero or negative duration */
Expand Down Expand Up @@ -579,7 +588,6 @@ public static List<ResourceIdTuple> getVirtualTrackResourceIDs(@Nonnull Composit
return Collections.unmodifiableList(virtualTrackResourceIDs);
}


/**
* This class is a representation of a Resource SourceEncoding element and trackFileId tuple.
*/
Expand Down Expand Up @@ -1070,6 +1078,4 @@ private Map<UUID, List<Node>> createEssenceDescriptorDomNodeMap() {
public Map<UUID, List<Node>> getEssenceDescriptorDomNodeMap() {
return this.essenceDescriptorDomNodeMap;
}


}
35 changes: 35 additions & 0 deletions src/main/java/com/netflix/imflibrary/st2067_2/IMFTrackFileResourceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,39 @@ public boolean equivalent(IMFBaseResourceType other)

return result;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
IMFTrackFileResourceType otherImfTrackFileResourceType = (IMFTrackFileResourceType) o;
boolean result = equivalent(otherImfTrackFileResourceType);
result &= sourceEncoding.equals(otherImfTrackFileResourceType.getSourceEncoding());
result &= Arrays.equals(hash, otherImfTrackFileResourceType.getHash());
result &= hashAlgorithm.equals(otherImfTrackFileResourceType.getHashAlgorithm());
result &= id.equals(otherImfTrackFileResourceType.getId());

return result;
}

@Override
public int hashCode() {
int hash = 7;
hash = 31 * hash * id.hashCode();
hash = 31 * hash * trackFileId.hashCode();
hash = 31 * hash * editRate.hashCode();
hash = 31 * hash * intrinsicDuration.hashCode();
hash = 31 * hash * entryPoint.hashCode();
hash = 31 * hash * sourceDuration.hashCode();
hash = 31 * hash * repeatCount.hashCode();
hash = 31 * hash * sourceEncoding.hashCode();
hash = 31 * hash * Arrays.hashCode(getHash());
hash = 31 * hash * hashAlgorithm.hashCode();
return hash;
}

}
2 changes: 1 addition & 1 deletion ...es/TestIMP/Application2/CPL_0eb3d1b9-b77b-4d3f-bbe5-7c69b15dca85_rgba_coding_equation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@
<TrackFileId>urn:uuid:61d91654-2650-4abf-abbc-ad2c7f640bf8</TrackFileId>
</Resource>
<Resource xsi:type="TrackFileResourceType">
<Id>urn:uuid:a5586a0b-1e3f-4c99-9de5-5a66f20cbaf8</Id>
<Id>urn:uuid:a5586a0b-1e3f-4c99-9de5-5a66f20cbaf9</Id>
<EditRate>60000 1001</EditRate>
<IntrinsicDuration>40</IntrinsicDuration>
<EntryPoint>20</EntryPoint>
Expand Down