Merge branch 'sort_packets' into storageareas

src/zm_ffmpeg.cpp

@@ -571,3 +571,27 @@ void dumpPacket(AVStream *stream, AVPacket *pkt, const char *text) {
            pkt->duration);
   Debug(2, "%s:%d:%s: %s", __FILE__, __LINE__, text, b);
 }
+
+void dumpPacket(AVPacket *pkt, const char *text) {
+  char b[10240];
+
+  snprintf(b, sizeof(b),
+           " pts: %" PRId64 ", dts: %" PRId64
+           ", size: %d, stream_index: %d, flags: %04x, keyframe(%d) pos: %" PRId64
+           ", duration: %"
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+           PRId64
+#else
+           "d"
+#endif
+           "\n",
+           pkt->pts,
+           pkt->dts,
+           pkt->size,
+           pkt->stream_index,
+           pkt->flags,
+           pkt->flags & AV_PKT_FLAG_KEY,
+           pkt->pos,
+           pkt->duration);
+  Debug(2, "%s:%d:%s: %s", __FILE__, __LINE__, text, b);
+}

src/zm_ffmpeg.h

@@ -333,4 +333,5 @@ bool is_audio_context(AVCodec *);
 
 int zm_receive_frame( AVCodecContext *context, AVFrame *frame, AVPacket &packet );
 void dumpPacket(AVStream *, AVPacket *,const char *text="");
+void dumpPacket(AVPacket *,const char *text="");
 #endif // ZM_FFMPEG_H

src/zm_packetqueue.cpp

@@ -35,19 +35,73 @@ zm_packetqueue::~zm_packetqueue() {
 }
 
 bool zm_packetqueue::queuePacket(ZMPacket* zm_packet) {
+
+  if (
+      ( zm_packet->packet.dts == AV_NOPTS_VALUE )
+      ||
+      ( packet_counts[zm_packet->packet.stream_index] <= 0 ) 
+    ) {
+    Debug(2,"Inserting packet with dts %" PRId64 " because queue is empty or invalid dts", zm_packet->packet.dts);
+    // No dts value, can't so much with it
     pktQueue.push_back(zm_packet);
     packet_counts[zm_packet->packet.stream_index] += 1;
     return true;
-}
+  }
+
+  std::list<ZMPacket *>::reverse_iterator it = pktQueue.rbegin();
+
+  // Scan through the queue looking for a packet for our stream with a dts <= ours.
+  while ( it != pktQueue.rend() ) {
+    AVPacket *av_packet = &((*it)->packet);
+
+    Debug(2, "Looking at packet with stream index (%d) with dts %" PRId64,
+        av_packet->stream_index, av_packet->dts);
+    if (
+        ( av_packet->stream_index == zm_packet->packet.stream_index )
+        &&
+        ( av_packet->dts != AV_NOPTS_VALUE )
+        &&
+        ( av_packet->dts <= zm_packet->packet.dts) 
+       ) {
+    Debug(2, "break  packet with stream index (%d) with dts %" PRId64,
+        (*it)->packet.stream_index, (*it)->packet.dts);
+      break;
+    }
+    it++;
+  } // end while not the end of the queue
+
+  if ( it != pktQueue.rend() ) {
+    Debug(2, "Found packet with stream index (%d) with dts %" PRId64,
+        (*it)->packet.stream_index, (*it)->packet.dts);
+    //it --;
+    //Debug(2, "Found packet with stream index (%d) with dts %" PRId64,
+        //(*it)->packet.stream_index, (*it)->packet.dts);
+    if ( it == pktQueue.rbegin() ) {
+       Debug(2,"Inserting packet with dts %" PRId64 " at end", zm_packet->packet.dts);
+      // No dts value, can't so much with it
+      pktQueue.push_back(zm_packet);
+      packet_counts[zm_packet->packet.stream_index] += 1;
+      return true;
+    }
+    // Convert to a forward iterator so that we can insert at end
+    std::list<ZMPacket *>::iterator f_it = it.base();
+
+    Debug(2, "Insert packet with stream index (%d) with dts %" PRId64 " for dts %" PRId64,
+        (*f_it)->packet.stream_index, (*f_it)->packet.dts, zm_packet->packet.dts);
+
+    pktQueue.insert(f_it, zm_packet);
+
+    packet_counts[zm_packet->packet.stream_index] += 1;
+    return true;
+  }
+  Warning("Unable to insert packet for stream %d with dts %" PRId64 " into queue.",
+      zm_packet->packet.stream_index, zm_packet->packet.dts);
+  return false;
+} // end bool zm_packetqueue::queuePacket(ZMPacket* zm_packet)
 
 bool zm_packetqueue::queuePacket(AVPacket* av_packet) {
-    
   ZMPacket *zm_packet = new ZMPacket(av_packet);
- 
-	pktQueue.push_back(zm_packet);
-  packet_counts[zm_packet->packet.stream_index] += 1;
-
-	return true;
+  return queuePacket(zm_packet);
 }
 
 ZMPacket* zm_packetqueue::popPacket( ) {