From b05f515cccddb130dd99e9e894a5a3b3d157e74b Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Fri, 22 Mar 2024 20:37:51 +0800
Subject: [PATCH] Revert "Fix the issue of failing to push streams to FMS 3.0
 server"

This reverts commit 3b7f16b75557a552d6907c60f87f4c06028c5f62.
---
 src/Rtmp/RtmpProtocol.cpp | 19 +------------------
 src/Rtmp/RtmpProtocol.h   |  4 ----
 src/Rtmp/RtmpPusher.cpp   | 30 ++++++++----------------------
 3 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/src/Rtmp/RtmpProtocol.cpp b/src/Rtmp/RtmpProtocol.cpp
index f98468bf..010e30d4 100644
--- a/src/Rtmp/RtmpProtocol.cpp
+++ b/src/Rtmp/RtmpProtocol.cpp
@@ -165,14 +165,7 @@ void RtmpProtocol::sendResponse(int type, const string &str) {
 
 void RtmpProtocol::sendInvoke(const string &cmd, const AMFValue &val) {
     AMFEncoder enc;
-    if (val.type() == AMFType::AMF_OBJECT || val.type() == AMFType::AMF_NULL)
-    {
-        enc << cmd << ++_send_req_id << val;
-    }
-    else
-    {
-        enc << cmd << ++_send_req_id << AMFValue() << val;
-    }
+    enc << cmd << ++_send_req_id << val;
     sendRequest(MSG_CMD, enc.data());
 }
 
@@ -626,22 +619,12 @@ const char* RtmpProtocol::handle_rtmp(const char *data, size_t len) {
             case 12:
                 chunk_data.is_abs_stamp = true;
                 chunk_data.stream_index = load_le32(header->stream_index);
-                _last_stream_index = chunk_data.stream_index;
             case 8:
                 chunk_data.body_size = load_be24(header->body_size);
                 chunk_data.type_id = header->type_id;
-                _last_body_size = chunk_data.body_size;
-                _last_type_id = chunk_data.type_id;
             case 4:
                 chunk_data.ts_field = load_be24(header->time_stamp);
         }
-        switch (header->fmt) {
-            case 2:
-                chunk_data.type_id = _last_type_id;
-                chunk_data.body_size = _last_body_size;
-            case 1:
-                chunk_data.stream_index = _last_stream_index;
-        }
 
         auto time_stamp = chunk_data.ts_field;
         if (chunk_data.ts_field == 0xFFFFFF) {
diff --git a/src/Rtmp/RtmpProtocol.h b/src/Rtmp/RtmpProtocol.h
index 2b7adfff..7ace93eb 100644
--- a/src/Rtmp/RtmpProtocol.h
+++ b/src/Rtmp/RtmpProtocol.h
@@ -11,7 +11,6 @@
 #ifndef SRC_RTMP_RTMPPROTOCOL_H_
 #define SRC_RTMP_RTMPPROTOCOL_H_
 
-#include <cstdint>
 #include <memory>
 #include <string>
 #include <functional>
@@ -88,9 +87,6 @@ protected:
 private:
     bool _data_started = false;
     int _now_chunk_id = 0;
-    uint32_t _last_stream_index = 0;
-    size_t _last_body_size = 0;
-    uint8_t _last_type_id = 0;
     ////////////ChunkSize////////////
     size_t _chunk_size_in = DEFAULT_CHUNK_LEN;
     size_t _chunk_size_out = DEFAULT_CHUNK_LEN;
diff --git a/src/Rtmp/RtmpPusher.cpp b/src/Rtmp/RtmpPusher.cpp
index 8f3596fc..92363241 100644
--- a/src/Rtmp/RtmpPusher.cpp
+++ b/src/Rtmp/RtmpPusher.cpp
@@ -163,28 +163,14 @@ void RtmpPusher::send_connect() {
 }
 
 void RtmpPusher::send_createStream() {
-    // Workaround : 兼容较旧的 FMS3.0
-    {
-        {
-            AMFValue obj(_stream_id);
-            sendInvoke("releaseStream", obj);
-        }
-        {
-            AMFValue obj(_stream_id);
-            sendInvoke("FCPublish", obj);
-        }
-    }
-    {
-        AMFValue obj(AMF_NULL);
-        sendInvoke("createStream", obj);
-        addOnResultCB([this](AMFDecoder &dec) {
-            //TraceL << "createStream result";
-            dec.load<AMFValue>();
-            _stream_index = dec.load<int>();
-            send_publish();
-        });
-    }
-
+    AMFValue obj(AMF_NULL);
+    sendInvoke("createStream", obj);
+    addOnResultCB([this](AMFDecoder &dec) {
+        //TraceL << "createStream result";
+        dec.load<AMFValue>();
+        _stream_index = dec.load<int>();
+        send_publish();
+    });
 }
 
 #define RTMP_STREAM_LIVE    "live"