From 80b905965e35dea585c71ace5b7ab6ed88dff1a4 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 19 Jun 2014 16:51:02 +0200
Subject: [PATCH] Various tweaks and fixes from Erik.

---
 src/input/input.cpp        | 1 +
 src/output/output_hss.cpp  | 5 -----
 src/output/output_rtmp.cpp | 9 ++-------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/input/input.cpp b/src/input/input.cpp
index ccfc523d..bf5fcb25 100644
--- a/src/input/input.cpp
+++ b/src/input/input.cpp
@@ -346,6 +346,7 @@ namespace Mist {
         break;
       }
     }
+    DEBUG_MSG(DLVL_DEVEL, "Done buffering page %d for track %d", pageNum, track);
     return true;
   }
   
diff --git a/src/output/output_hss.cpp b/src/output/output_hss.cpp
index 2c0a8817..db021b16 100644
--- a/src/output/output_hss.cpp
+++ b/src/output/output_hss.cpp
@@ -75,7 +75,6 @@ namespace Mist {
 
   void OutHSS::sendNext() {
     if (currentPacket.getTime() >= playUntil) {
-      DEBUG_MSG(DLVL_HIGH, "(%d) Done sending fragment %d:%d", getpid(), myTrackStor, myKeyStor);
       stop();
       wantRequest = true;
       HTTP_S.Chunkify("", 0, myConn);
@@ -163,10 +162,8 @@ namespace Mist {
         return;
       }
     }
-    DEBUG_MSG(DLVL_HIGH, "(%d) Seeking to time %lld on track %d", getpid(), seekTime, tid);
     seek(seekTime);
     playUntil = (*(keyTimes[tid].upper_bound(seekTime)));
-    DEBUG_MSG(DLVL_HIGH, "Set playUntil to %lld", playUntil);
     myTrackStor = tid;
     myKeyStor = seekTime;
     keysToSend = 1;
@@ -299,7 +296,6 @@ namespace Mist {
     HTTP_S.Chunkify("mdat", 4, myConn);
     sentHeader = true;
     HTTP_R.Clean();
-    DEBUG_MSG(DLVL_HIGH, "(%d) Sent full header", getpid());
   }
 
 
@@ -451,7 +447,6 @@ namespace Mist {
   void OutHSS::onRequest() {
     sentHeader = false;
     while (HTTP_R.Read(myConn)) {
-      DEBUG_MSG(DLVL_DEVEL, "(%d) Received request %s", getpid(), HTTP_R.getUrl().c_str());
       initialize();
       if (HTTP_R.url.find("Manifest") != std::string::npos) {
         //Manifest, direct reply
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 9b3c88ce..10815cfa 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -76,11 +76,7 @@ namespace Mist {
       if (track.codec == "H264"){
         dheader_len += 4;
         dataheader[0] = 7;
-        if (currentPacket.getFlag("nalu")){
-          dataheader[1] = 1;
-        }else{
-          dataheader[1] = 2;
-        }
+        dataheader[1] = 1;
         if (currentPacket.getInt("offset") > 0){
           long long offset = currentPacket.getInt("offset");
           dataheader[2] = (offset >> 16) & 0xFF;
@@ -93,8 +89,7 @@ namespace Mist {
       }
       if (currentPacket.getFlag("keyframe")){
         dataheader[0] |= 0x10;
-      }
-      if (currentPacket.getFlag("interframe")){
+      }else{
         dataheader[0] |= 0x20;
       }
       if (currentPacket.getFlag("disposableframe")){