Skip to content

Commit f9de7e7

Browse files
committed
Format update
1 parent 0ba3ab0 commit f9de7e7

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

io/src/main/java/org/red5/codec/AVCVideo.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ public boolean addData(IoBuffer data, int timestamp) {
6868
if (enhanced) {
6969
// get the packet type
7070
packetType = VideoPacketType.valueOf(flg & IoConstants.MASK_VIDEO_CODEC);
71-
if(frameType.getValue() < 5 && packetType.getPacketType() < 5 ) {
71+
if (frameType.getValue() < 5 && packetType.getPacketType() < 5) {
7272
// get the fourcc
73-
fourcc = data.getInt();
73+
fourcc = data.getInt();
7474
result = (codec.getFourcc() == fourcc);
75-
if(!result) {
75+
if (!result) {
7676
data.reset();
7777
return result;
7878
}
@@ -184,9 +184,8 @@ public boolean addData(IoBuffer data, int timestamp) {
184184
// not handled
185185
break;
186186
}
187-
188-
189-
} else if((flg & IoConstants.MASK_VIDEO_CODEC) == codec.getId()){
187+
188+
} else if ((flg & IoConstants.MASK_VIDEO_CODEC) == codec.getId()) {
190189
result = true;
191190
// get the codecs frame type
192191
byte avcType = data.get();
@@ -196,11 +195,11 @@ public boolean addData(IoBuffer data, int timestamp) {
196195
log.debug("AVC type: {}", avcType);
197196
}
198197
switch (avcType) {
199-
case 1: // VCL video coding layer,
198+
case 1: // VCL video coding layer,
200199
frameType = VideoFrameType.valueOf((flg & IoConstants.MASK_VIDEO_FRAMETYPE) >> 4);
201200
switch (frameType) {
202201
case KEYFRAME: // keyframe
203-
202+
204203
if (isDebug) {
205204
log.debug("Keyframe - keyframeTimestamp: {}", keyframeTimestamp);
206205
}
@@ -236,7 +235,7 @@ public boolean addData(IoBuffer data, int timestamp) {
236235
//log.trace("Interframes: {}", interframes.size());
237236
}
238237
break;
239-
}
238+
}
240239
break;
241240
case 0: // configuration
242241
if (isDebug) {

io/src/main/java/org/red5/codec/AbstractVideo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ public boolean addData(IoBuffer data, int timestamp) {
186186
if (multitrackType != AvMultitrackType.ManyTracksManyCodecs) {
187187
// The tracks are encoded with the same codec identified by the FOURCC
188188
trackCodec = getTrackCodec(data);
189-
}
190-
}else {
189+
}
190+
} else {
191191
trackCodec = getTrackCodec(data);
192192
}
193193
log.debug("Multitrack: {} multitrackType: {} packetType: {}", multitrack, multitrackType, packetType);
@@ -248,10 +248,10 @@ public boolean addData(IoBuffer data, int timestamp) {
248248
// break out of the loop
249249
break;
250250
}
251-
if(command != null && trackCodec == null) {
251+
if (command != null && trackCodec == null) {
252252
result = true;
253-
}else {
254-
result = multitrack?true:codec == trackCodec.getCodec();
253+
} else {
254+
result = multitrack ? true : codec == trackCodec.getCodec();
255255
}
256256
} else {
257257
// read the first byte verify the codec matches

0 commit comments

Comments
 (0)