Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 51c8bd9

Browse files
authored
Bugfix and minor code improvement (#122)
1 parent 05d78cc commit 51c8bd9

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

modules/video_coding/session_info.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,8 @@ int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
519519
IsNewerSequenceNumber(packet.seqNum, last_packet_seq_num_))) {
520520
last_packet_seq_num_ = packet.seqNum;
521521
}
522-
#else
523-
} else {
524522
#endif
523+
} else {
525524
// Only insert media packets between first and last packets (when
526525
// available).
527526
// Placing check here, as to properly account for duplicate packets.

sdk/objc/native/src/objc_video_encoder_factory.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ int32_t RegisterEncodeCompleteCallback(EncodedImageCallback *callback) override
6464
[(RTC_OBJC_TYPE(RTCCodecSpecificInfoH264) *)info nativeCodecSpecificInfo];
6565
#ifndef DISABLE_H265
6666
} else if ([info isKindOfClass:[RTC_OBJC_TYPE(RTCCodecSpecificInfoH265) class]]) {
67-
// if ([info isKindOfClass:[RTCCodecSpecificInfoH265 class]]) {
6867
codecSpecificInfo = [(RTCCodecSpecificInfoH265 *)info nativeCodecSpecificInfo];
6968
#endif
7069
}

video/rtp_video_stream_receiver.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -628,9 +628,8 @@ void RtpVideoStreamReceiver::OnReceivedPayloadData(
628628
packet->video_payload = std::move(fixed.bitstream);
629629
break;
630630
}
631-
}
632631
#ifndef DISABLE_H265
633-
else if (packet->codec() == kVideoCodecH265) {
632+
} else if (packet->codec() == kVideoCodecH265) {
634633
// Only when we start to receive packets will we know what payload type
635634
// that will be used. When we know the payload type insert the correct
636635
// sps/pps into the tracker.
@@ -657,7 +656,7 @@ void RtpVideoStreamReceiver::OnReceivedPayloadData(
657656
}
658657
}
659658
#endif
660-
else {
659+
} else {
661660
packet->video_payload = std::move(codec_payload);
662661
}
663662

0 commit comments

Comments
 (0)