From 5c3c38684b25acce0cc749b4989501a49310607b Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 10 Mar 2015 17:04:02 +0800
Subject: [PATCH] fix the bug of flv stream, metadata type should be 18

---
 trunk/ide/srs_upp/init              | 4 ++--
 trunk/src/app/srs_app_http_conn.cpp | 2 +-
 trunk/src/kernel/srs_kernel_flv.cpp | 5 +++--
 trunk/src/kernel/srs_kernel_flv.hpp | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/trunk/ide/srs_upp/init b/trunk/ide/srs_upp/init
index 0f46817f4..cf8175cb4 100755
--- a/trunk/ide/srs_upp/init
+++ b/trunk/ide/srs_upp/init
@@ -1,3 +1,3 @@
-#ifndef _srs_upp_icpp_init_stub
-#define _srs_upp_icpp_init_stub
+#ifndef _ide_srs_upp_icpp_init_stub
+#define _ide_srs_upp_icpp_init_stub
 #endif
diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index 1ceb7cb15..eee1708df 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -394,7 +394,7 @@ int SrsFlvStreamEncoder::write_video(int64_t timestamp, char* data, int size)
 
 int SrsFlvStreamEncoder::write_metadata(int64_t timestamp, char* data, int size)
 {
-    return enc->write_metadata(timestamp, data, size);
+    return enc->write_metadata(SrsCodecFlvTagScript, data, size);
 }
 
 bool SrsFlvStreamEncoder::has_cache()
diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp
index 13e923ef5..4d1464ad9 100644
--- a/trunk/src/kernel/srs_kernel_flv.cpp
+++ b/trunk/src/kernel/srs_kernel_flv.cpp
@@ -36,6 +36,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_kernel_file.hpp>
+#include <srs_kernel_codec.hpp>
 
 #define SRS_FLV_TAG_HEADER_SIZE 11
 #define SRS_FLV_PREVIOUS_TAG_SIZE 4
@@ -149,7 +150,7 @@ int SrsFlvEncoder::write_audio(int64_t timestamp, char* data, int size)
     
     // 11bytes tag header
     static char tag_header[] = {
-        (char)8, // TagType UB [5], 8 = audio
+        (char)SrsCodecFlvTagAudio, // TagType UB [5], 8 = audio
         (char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message.
         (char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies.
         (char)0x00, // TimestampExtended UI8
@@ -183,7 +184,7 @@ int SrsFlvEncoder::write_video(int64_t timestamp, char* data, int size)
     
     // 11bytes tag header
     static char tag_header[] = {
-        (char)9, // TagType UB [5], 9 = video
+        (char)SrsCodecFlvTagVideo, // TagType UB [5], 9 = video
         (char)0x00, (char)0x00, (char)0x00, // DataSize UI24 Length of the message.
         (char)0x00, (char)0x00, (char)0x00, // Timestamp UI24 Time in milliseconds at which the data in this tag applies.
         (char)0x00, // TimestampExtended UI8
diff --git a/trunk/src/kernel/srs_kernel_flv.hpp b/trunk/src/kernel/srs_kernel_flv.hpp
index 52a30837f..957bfc63b 100644
--- a/trunk/src/kernel/srs_kernel_flv.hpp
+++ b/trunk/src/kernel/srs_kernel_flv.hpp
@@ -67,6 +67,7 @@ public:
     /**
     * write flv metadata. 
     * @param type, the type of data, or other message type.
+    *       @see SrsCodecFlvTag
     * @param data, the amf0 metadata which serialize from:
     *   AMF0 string: onMetaData,
     *   AMF0 object: the metadata object.