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

Application4 basic implementation #274

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

Application4 basic implementation #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3471641
Change folder name (audioRoutingMixing) according to package name
hnlocher Mar 30, 2020
0ba5257
Application 4 basic support
Jul 5, 2019
4152e69
Implement App#4 CompositionPlaylist constraints
Jul 10, 2019
4ec9bc1
Avoid loop on contentVersion if contentVersionList is empty (and null)
hnlocher Apr 27, 2020
21b75eb
Replace jdk.nashorn.internal.ir.annotations.Immutable imports
hnlocher Apr 27, 2020
7da21ab
Merge pull request #1 from hnlocher/immutable_annotation_no_internal_…
hnlocher Jun 3, 2020
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
2 changes: 2 additions & 0 deletions src/main/java/com/netflix/imflibrary/Colorimetry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public enum Colorimetry {
Color5(ColorPrimaries.ITU2020, TransferCharacteristic.ITU2020, CodingEquation.ITU2020NCL),
Color6(ColorPrimaries.P3D65, TransferCharacteristic.SMPTEST2084, CodingEquation.None),
Color7(ColorPrimaries.ITU2020, TransferCharacteristic.SMPTEST2084, CodingEquation.ITU2020NCL),
Color_App4_Lin(ColorPrimaries.XYZ, TransferCharacteristic.Linear, CodingEquation.None),
Color_App5_AP0(ColorPrimaries.ACES, TransferCharacteristic.Linear, CodingEquation.None),
Unknown(ColorPrimaries.Unknown, TransferCharacteristic.Unknown, CodingEquation.Unknown);

Expand Down Expand Up @@ -115,6 +116,7 @@ public static enum ColorPrimaries {
ITU2020(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0E.2B.34.04.01.01.0D.04.01.01.01.03.04.00.00")),
P3D65(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0E.2B.34.04.01.01.0D.04.01.01.01.03.06.00.00")),
ACES(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0e.2b.34.04.01.01.0d.04.01.01.01.03.07.00.00")),
XYZ(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0e.2b.34.04.01.01.0d.04.01.01.01.03.08.00.00")),
Unknown(null);

private final UL colorPrimariesUL;
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/netflix/imflibrary/st2067_100/OutputProfileListModel_st2067_100_2014.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.netflix.imflibrary.st2067_100.macro.scale.ScaleInputImageSequence;
import com.netflix.imflibrary.st2067_100.macro.scale.ScaleMacro;
import com.netflix.imflibrary.st2067_100.macro.scale.ScaleOutputImageSequence;
import jdk.nashorn.internal.ir.annotations.Immutable;

import org.smpte_ra.schemas._2067_100._2014.OutputProfileListType.AliasList.Alias;
import org.smpte_ra.schemas._2067_100._2014.PresetMacroType;
import org.smpte_ra.schemas._2067_101._2014.crop_macro.ImageCropMacroType;
Expand All @@ -38,6 +38,7 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.concurrent.Immutable;

/**
* A class that models OutputProfileList as per specification st2067-100:2014.
Expand Down Expand Up @@ -126,7 +127,7 @@ private CropMacro createCropMacro(ImageCropMacroType imageCropMacroType) {
inputImageSequence.getInset().getTop().intValue(),
inputImageSequence.getInset().getBottom().intValue());

CropInputImageSequence input = new CropInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
CropInputImageSequence input = new CropInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
inputImageSequence.getHandle(), mxfRectangleEnum, inset);

if(imageCropMacroType.getOutputImageSequence() == null) {
Expand Down Expand Up @@ -156,7 +157,7 @@ private ScaleMacro createScaleMacro(ImageScaleMacroType imageScaleMacroType) {
String.format("Missing InputImageSequence in %s macro", imageScaleMacroType.getName()));
}
ImageScaleMacroType.InputImageSequence inputImageSequence = imageScaleMacroType.getInputImageSequence();
ScaleInputImageSequence input = new ScaleInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
ScaleInputImageSequence input = new ScaleInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
inputImageSequence.getHandle());

if(imageScaleMacroType.getOutputImageSequence() == null) {
Expand Down Expand Up @@ -188,7 +189,7 @@ private PixelDecoderMacro createPixelDecoderMacro(PixelDecoderType pixelDecoderT
String.format("Missing InputImageSequence in %s macro", pixelDecoderType.getName()));
}
PixelDecoderType.InputImageSequence inputImageSequence = pixelDecoderType.getInputImageSequence();
PixelDecoderInputImageSequence input = new PixelDecoderInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
PixelDecoderInputImageSequence input = new PixelDecoderInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
inputImageSequence.getHandle());

if(pixelDecoderType.getOutputReferenceImageSequence() == null) {
Expand All @@ -210,7 +211,7 @@ private PixelEncoderMacro createPixelEncoderMacro(PixelEncoderType pixelEncoderT
String.format("Missing InputImageSequence in %s macro", pixelEncoderType.getName()));
}
PixelEncoderType.InputReferenceImageSequence inputImageSequence = pixelEncoderType.getInputReferenceImageSequence();
PixelEncoderInputImageSequence input = new PixelEncoderInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
PixelEncoderInputImageSequence input = new PixelEncoderInputImageSequence(inputImageSequence.getAnnotation() != null ? inputImageSequence.getAnnotation().getValue() : null,
inputImageSequence.getHandle());

if(pixelEncoderType.getOutputImageSequence() == null) {
Expand Down
0 ...outingMixing/AudioRoutingMixingMacro.java → ...outingMixing/AudioRoutingMixingMacro.java
View file
Open in desktop
File renamed without changes.
0 ...macro/AudioRoutingMixing/InputEntity.java → ...macro/audioRoutingMixing/InputEntity.java
View file
Open in desktop
File renamed without changes.
0 ...udioRoutingMixing/OutputAudioChannel.java → ...udioRoutingMixing/OutputAudioChannel.java
View file
Open in desktop
File renamed without changes.
Loading