Changeset 105 for trunk/sources/thelib/src/protocols/ts/innettsstream.cpp

Timestamp:

08/25/10 19:30:12 (21 months ago)

Author:

shiretu

Message:

-- added another version for handling NAL units

File:

• trunk/sources/thelib/src/protocols/ts/innettsstream.cpp (modified) (4 diffs)

trunk/sources/thelib/src/protocols/ts/innettsstream.cpp

@@ -47 +47 @@
         _feedTime = 0;
         _cursor = 0;
+
+        _firstNAL = true;
 }
 
@@ -150 +152 @@
                 }
         }
+
+        //#define HandleVideoData HandleVideoData_version1
+#define HandleVideoData HandleVideoData_version2
 
         if (isAudio)
@@ -277 +282 @@
 }
 
-bool InNetTSStream::HandleVideoData(uint8_t *pBuffer, uint32_t length,
+bool InNetTSStream::HandleVideoData_version1(uint8_t *pBuffer, uint32_t length,
                 double timestamp, bool packetStart) {
         //1. Store the data inside our buffer
@@ -327 +332 @@
 }
 
+bool InNetTSStream::HandleVideoData_version2(uint8_t *pBuffer, uint32_t length,
+                double timestamp, bool packetStart) {
+        //1. Store the data inside our buffer
+        _currentNal.ReadFromBuffer(pBuffer, length);
+
+        uint32_t size = GETAVAILABLEBYTESCOUNT(_currentNal);
+        if (size < 4)
+                return true;
+
+        uint8_t *pNalBuffer = GETIBPOINTER(_currentNal);
+
+        _cursor = 0;
+        if (_firstNAL) {
+                while (_cursor < size - 4) {
+                        if (ntohlp(pNalBuffer + _cursor) == 1) {
+                                _currentNal.Ignore(_cursor + 4);
+                                _firstNAL = false;
+                                _cursor += 4;
+                                break;
+                        }
+                        _cursor++;
+                }
+        }
+
+        while (_cursor < size - 4) {
+                if (ntohlp(pNalBuffer + _cursor) == 1) {
+                        if (!ProcessNal(timestamp)) {
+                                FATAL("Unable to process NALU");
+                                return false;
+                        }
+                        _currentNal.Ignore(_cursor + 4);
+                        pNalBuffer = GETIBPOINTER(_currentNal);
+                        size = GETAVAILABLEBYTESCOUNT(_currentNal);
+                        _cursor = 0;
+                        if (size < 4)
+                                break;
+                } else {
+                        _cursor++;
+                }
+        }
+
+        return true;
+}
+
 bool InNetTSStream::ProcessNal(double timestamp) {
         InitializeVideoCapabilities(GETIBPOINTER(_currentNal), _cursor);