Commit 8da0e27d by olly Committed by Oliver Woodman

Fix premature nullness assertions

Issue: #6910
PiperOrigin-RevId: 291721229
parent 4dddad83
...@@ -560,12 +560,16 @@ public final class H264Reader implements ElementaryStreamReader { ...@@ -560,12 +560,16 @@ public final class H264Reader implements ElementaryStreamReader {
} }
private boolean isFirstVclNalUnitOfPicture(SliceHeaderData other) { private boolean isFirstVclNalUnitOfPicture(SliceHeaderData other) {
if (!isComplete) {
return false;
}
if (!other.isComplete) {
return true;
}
// See ISO 14496-10 subsection 7.4.1.2.4. // See ISO 14496-10 subsection 7.4.1.2.4.
SpsData spsData = Assertions.checkStateNotNull(this.spsData); SpsData spsData = Assertions.checkStateNotNull(this.spsData);
SpsData otherSpsData = Assertions.checkStateNotNull(other.spsData); SpsData otherSpsData = Assertions.checkStateNotNull(other.spsData);
return isComplete return frameNum != other.frameNum
&& (!other.isComplete
|| frameNum != other.frameNum
|| picParameterSetId != other.picParameterSetId || picParameterSetId != other.picParameterSetId
|| fieldPicFlag != other.fieldPicFlag || fieldPicFlag != other.fieldPicFlag
|| (bottomFieldFlagPresent || (bottomFieldFlagPresent
...@@ -581,7 +585,7 @@ public final class H264Reader implements ElementaryStreamReader { ...@@ -581,7 +585,7 @@ public final class H264Reader implements ElementaryStreamReader {
&& (deltaPicOrderCnt0 != other.deltaPicOrderCnt0 && (deltaPicOrderCnt0 != other.deltaPicOrderCnt0
|| deltaPicOrderCnt1 != other.deltaPicOrderCnt1)) || deltaPicOrderCnt1 != other.deltaPicOrderCnt1))
|| idrPicFlag != other.idrPicFlag || idrPicFlag != other.idrPicFlag
|| (idrPicFlag && idrPicId != other.idrPicId)); || (idrPicFlag && idrPicId != other.idrPicId);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment