this may fix #607 fixing nalu size when offset is not 0

mpromonet · Aug 6, 2023 · 1018b11 · 1018b11
1 parent a4a794d
commit 1018b11
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/inc/livevideosource.h b/inc/livevideosource.h
@@ -117,7 +117,7 @@ class LiveVideoSource : public VideoSourceWithDecoder, public T::Callback
                 {
                     RTC_LOG(LS_VERBOSE) << "LiveVideoSource:onData SPS";
                     m_cfg.clear();
-                    m_cfg.insert(m_cfg.end(), buffer + index.start_offset, buffer + index.payload_size + index.payload_start_offset - index.start_offset);
+                    m_cfg.insert(m_cfg.end(), buffer + index.start_offset, buffer + index.payload_size + index.payload_start_offset);
 
                     absl::optional<webrtc::SpsParser::SpsState> sps = webrtc::SpsParser::ParseSps(buffer + index.payload_start_offset, index.payload_size);
                     if (!sps)
@@ -136,7 +136,7 @@ class LiveVideoSource : public VideoSourceWithDecoder, public T::Callback
                 else if (nalu_type == webrtc::H264::NaluType::kPps)
                 {
                     RTC_LOG(LS_VERBOSE) << "LiveVideoSource:onData PPS";
-                    m_cfg.insert(m_cfg.end(), buffer + index.start_offset, buffer + index.payload_size + index.payload_start_offset - index.start_offset);
+                    m_cfg.insert(m_cfg.end(), buffer + index.start_offset, buffer + index.payload_size + index.payload_start_offset);
                 }
                 else if (nalu_type == webrtc::H264::NaluType::kSei) 
                 {
@@ -160,7 +160,7 @@ class LiveVideoSource : public VideoSourceWithDecoder, public T::Callback
                         RTC_LOG(LS_ERROR) << "LiveVideoSource:onData drop frame in past for FFmpeg:" << (m_prevTimestamp-ts);
 
                     } else {
-                        content.insert(content.end(), buffer + index.start_offset, buffer + index.payload_size + index.payload_start_offset - index.start_offset);
+                        content.insert(content.end(), buffer + index.start_offset, buffer + index.payload_size + index.payload_start_offset);
                         rtc::scoped_refptr<webrtc::EncodedImageBuffer> frame = webrtc::EncodedImageBuffer::Create(content.data(), content.size());
                         m_decoder.PostFrame(frame, ts, frameType);
                     }