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

Add luma & chroma bit depths to Format #491

Merged
merged 15 commits into from
Oct 17, 2023
Merged

Add luma & chroma bit depths to Format #491

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e71ca5a
Add luma and chroma bit depths to Format, set them as signalled in co…
dsparano Jun 28, 2023
c7fe066
Set bitdepths in test Format
dsparano Jun 28, 2023
fc61d96
Replace literal with constant variable
dsparano Jun 29, 2023
d454bd0
Set luma and chroma bit depths in Format from Rtsp
dsparano Jul 19, 2023
59ff0db
Improve isobmff atom parsing changes
dsparano Jul 25, 2023
f8d9886
Move luma and chroma bitdepths to ColorInfo class
dsparano Jul 27, 2023
ee1b150
Format with google-java-format
microkatz Aug 17, 2023
c72ec74
Format with google-java-format
microkatz Aug 17, 2023
1fe9c33
Resume toLogString() in ColorInfo; revert DebugTextViewHelper
dsparano Aug 17, 2023
f147328
Change isColorValid with isDataSpaceValid
dsparano Aug 17, 2023
bbcf37d
Format with google-java-format
microkatz Sep 1, 2023
d206be7
Updated to use ColorInfo.Builder() and formatting issues
microkatz Sep 6, 2023
212e138
Removed deprecated ColorInfo constructor call and fixed formatting
microkatz Sep 7, 2023
e28288f
Updated golden file tests and removed deprecated ColorInfo constructo…
microkatz Sep 21, 2023
7162407
Updated golden file tests and readded constructor
microkatz Sep 21, 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
Prev Previous commit
Next Next commit
Change isColorValid with isDataSpaceValid
  • Loading branch information
@dsparano @microkatz
dsparano authored and microkatz committed Oct 17, 2023
commit f14732873f51607e5b99977d666e5630b1d79a4b
14 changes: 7 additions & 7 deletions libraries/common/src/main/java/androidx/media3/common/ColorInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,10 @@ public Builder buildUpon() {
/**
* Returns whether this instance is valid.
*
* <p>This instance is valid if at least one between bitdepths and color info are valid.
* <p>This instance is valid if at least one between bitdepths and DataSpace info are valid.
*/
public boolean isValid() {
return isBitdepthValid() || isColorValid();
return isBitdepthValid() || isDataSpaceValid();
}

/**
Expand All @@ -304,11 +304,11 @@ public boolean isBitdepthValid() {
}

/**
* Returns whether this instance is color valid.
* Returns whether this instance has valid DataSpace members.
*
* <p>This instance is valid if no color members are {@link Format#NO_VALUE}.
* <p>This instance is valid if no DataSpace members are {@link Format#NO_VALUE}.
*/
public boolean isColorValid() {
public boolean isDataSpaceValid() {
return colorSpace != Format.NO_VALUE
&& colorRange != Format.NO_VALUE
&& colorTransfer != Format.NO_VALUE;
Expand All @@ -325,11 +325,11 @@ public String toLogString() {
}

String bitdepthsString = isBitdepthValid() ? lumaBitdepth + "/" + chromaBitdepth : "NA";
String colorString = isColorValid() ? Util.formatInvariant("%s/%s/%s",
String dataspaceString = isDataSpaceValid() ? Util.formatInvariant("%s/%s/%s",
colorSpaceToString(colorSpace),
colorRangeToString(colorRange),
colorTransferToString(colorTransfer)) : "NA";
return bitdepthsString + "/" + colorString;
return bitdepthsString + "/" + dataspaceString;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ public DefaultVideoFrameProcessor create(
throws VideoFrameProcessingException {
// TODO(b/261188041) Add tests to verify the Listener is invoked on the given Executor.

checkArgument(inputColorInfo.isColorValid());
checkArgument(inputColorInfo.isDataSpaceValid());
checkArgument(inputColorInfo.colorTransfer != C.COLOR_TRANSFER_LINEAR);
checkArgument(outputColorInfo.isColorValid());
checkArgument(outputColorInfo.isDataSpaceValid());
checkArgument(outputColorInfo.colorTransfer != C.COLOR_TRANSFER_LINEAR);
if (ColorInfo.isTransferHdr(inputColorInfo) || ColorInfo.isTransferHdr(outputColorInfo)) {
checkArgument(enableColorTransfers);
Expand Down
2 changes: 1 addition & 1 deletion libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public VideoSampleExporter(
finalFramePresentationTimeUs = C.TIME_UNSET;

ColorInfo decoderInputColor;
if (firstInputFormat.colorInfo == null || !firstInputFormat.colorInfo.isColorValid()) {
if (firstInputFormat.colorInfo == null || !firstInputFormat.colorInfo.isDataSpaceValid()) {
Log.d(TAG, "colorInfo is null or invalid. Defaulting to SDR_BT709_LIMITED.");
decoderInputColor = ColorInfo.SDR_BT709_LIMITED;
} else {
Expand Down