Fix multiobject streams

Summary: In Fwd track mode, data was sent in different streams Reviewed By: afrind Differential Revision: D60086722 fbshipit-source-id: aee56007711a88a077bccb0c9896d577403d40bd
facebookexperimental · Jul 23, 2024 · ff2b823 · ff2b823
1 parent dbb101f
commit ff2b823
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/moxygen/MoQSession.cpp b/moxygen/MoQSession.cpp
@@ -549,7 +549,7 @@ void MoQSession::publishImpl(
     // - Next portion of the object calls this function again with payloadOffset
     // > 0
     if (payloadOffset != 0) {
-      XLOG(DBG1)
+      XLOG(WARN)
           << __func__
           << " Can't start publishing in the middle. Disgregard data for this new obj with payloadOffset = "
           << payloadOffset;
@@ -566,6 +566,7 @@ void MoQSession::publishImpl(
         return;
       }
       stream = *res;
+      XLOG(DBG4) << "New stream created, id: " << stream->getID();
     }
 
     // Add publishing key

diff --git a/moxygen/MoQSession.h b/moxygen/MoQSession.h
@@ -326,10 +326,9 @@ class MoQSession : public MoQCodec::Callback {
               ook.subscribeID, ook.group, ook.sendOrder, ook.object);
         } else if (ook.pref == ForwardPreference::Group) {
           return folly::hash::hash_combine(
-              ook.subscribeID, ook.group, ook.sendOrder, ook.group);
+              ook.subscribeID, ook.group, ook.sendOrder);
         } // else if (ook.pref == ForwardPreference::Track) {
-        return folly::hash::hash_combine(
-            ook.subscribeID, ook.group, ook.sendOrder);
+        return folly::hash::hash_combine(ook.subscribeID, ook.sendOrder);
       }
     };
   };