fix st thread exit bug, never implict invoke the st_thread_exit, which may cause…

… memory leak. 0.9.112

@@ -468,7 +468,8 @@ MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_socke
         "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" 
         "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" 
         "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" 
         "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" 
         "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge"
         "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge"
-        "srs_app_kbps" "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client")
+        "srs_app_kbps" "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client"
+        "srs_app_flv")
 APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh
 APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh
 APP_OBJS="${MODULE_OBJS[@]}"
 APP_OBJS="${MODULE_OBJS[@]}"
 #
 #

@@ -39,272 +39,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_http_hooks.hpp>
 #include <srs_app_http_hooks.hpp>
 #include <srs_app_codec.hpp>
 #include <srs_app_codec.hpp>
-
-SrsFileStream::SrsFileStream()
-{
-    fd = -1;
-}
-
-SrsFileStream::~SrsFileStream()
-{
-    close();
-}
-
-int SrsFileStream::open(string file)
-{
-    int ret = ERROR_SUCCESS;
-    
-    if (fd > 0) {
-        ret = ERROR_SYSTEM_FILE_ALREADY_OPENED;
-        srs_error("file %s already opened. ret=%d", _file.c_str(), ret);
-        return ret;
-    }
-    
-    int flags = O_CREAT|O_WRONLY|O_TRUNC;
-    mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH;
-
-    if ((fd = ::open(file.c_str(), flags, mode)) < 0) {
-        ret = ERROR_SYSTEM_FILE_OPENE;
-        srs_error("open file %s failed. ret=%d", file.c_str(), ret);
-        return ret;
-    }
-    
-    _file = file;
-    
-    return ret;
-}
-
-int SrsFileStream::close()
-{
-    int ret = ERROR_SUCCESS;
-    
-    if (fd < 0) {
-        return ret;
-    }
-    
-    if (::close(fd) < 0) {
-        ret = ERROR_SYSTEM_FILE_CLOSE;
-        srs_error("close file %s failed. ret=%d", _file.c_str(), ret);
-        return ret;
-    }
-    fd = -1;
-    
-    return ret;
-}
-
-bool SrsFileStream::is_open()
-{
-    return fd > 0;
-}
-
-int SrsFileStream::read(void* buf, size_t count, ssize_t* pnread)
-{
-    int ret = ERROR_SUCCESS;
-    
-    ssize_t nread;
-    if ((nread = ::read(fd, buf, count)) < 0) {
-        ret = ERROR_SYSTEM_FILE_READ;
-        srs_error("read from file %s failed. ret=%d", _file.c_str(), ret);
-        return ret;
-    }
-    
-    if (nread == 0) {
-        ret = ERROR_SYSTEM_FILE_EOF;
-        return ret;
-    }
-    
-    if (pnread != NULL) {
-        *pnread = nread;
-    }
-    
-    return ret;
-}
-
-int SrsFileStream::write(void* buf, size_t count, ssize_t* pnwrite)
-{
-    int ret = ERROR_SUCCESS;
-    
-    ssize_t nwrite;
-    if ((nwrite = ::write(fd, buf, count)) < 0) {
-        ret = ERROR_SYSTEM_FILE_WRITE;
-        srs_error("write to file %s failed. ret=%d", _file.c_str(), ret);
-        return ret;
-    }
-    
-    if (pnwrite != NULL) {
-        *pnwrite = nwrite;
-    }
-    
-    return ret;
-}
-
-int64_t SrsFileStream::tellg()
-{
-    return (int64_t)::lseek(fd, 0, SEEK_CUR);
-}
-
-SrsFlvEncoder::SrsFlvEncoder()
-{
-    _fs = NULL;
-    tag_stream = new SrsStream();
-}
-
-SrsFlvEncoder::~SrsFlvEncoder()
-{
-    srs_freep(tag_stream);
-}
-
-int SrsFlvEncoder::initialize(SrsFileStream* fs)
-{
-    int ret = ERROR_SUCCESS;
-    
-    _fs = fs;
-    
-    return ret;
-}
-
-int SrsFlvEncoder::write_header()
-{
-    int ret = ERROR_SUCCESS;
-    
-    static char flv_header[] = {
-        'F', 'L', 'V', // Signatures "FLV"
-        (char)0x01, // File version (for example, 0x01 for FLV version 1)
-        (char)0x00, // 4, audio; 1, video; 5 audio+video.
-        (char)0x00, (char)0x00, (char)0x00, (char)0x09, // DataOffset UI32 The length of this header in bytes
-        (char)0x00, (char)0x00, (char)0x00, (char)0x00// PreviousTagSize0 UI32 Always 0
-    };
-    
-    // flv specification should set the audio and video flag,
-    // actually in practise, application generally ignore this flag,
-    // so we generally set the audio/video to 0.
-    
-    // write data.
-    if ((ret = _fs->write(flv_header, sizeof(flv_header), NULL)) != ERROR_SUCCESS) {
-        srs_error("write flv header failed. ret=%d", ret);
-        return ret;
-    }
-    
-    return ret;
-}
-
-int SrsFlvEncoder::write_metadata(char* data, int size)
-{
-    int ret = ERROR_SUCCESS;
-    
-    static char tag_header[] = {
-        (char)18, // TagType UB [5], 18 = script data
-        (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
-        (char)0x00, (char)0x00, (char)0x00, // StreamID UI24 Always 0.
-    };
-    
-    // write data size.
-    if ((ret = tag_stream->initialize(tag_header + 1, 3)) != ERROR_SUCCESS) {
-        return ret;
-    }
-    tag_stream->write_3bytes(size);
-    
-    if ((ret = write_tag(tag_header, sizeof(tag_header), data, size)) != ERROR_SUCCESS) {
-        srs_error("write flv data tag failed. ret=%d", ret);
-        return ret;
-    }
-    
-    return ret;
-}
-
-int SrsFlvEncoder::write_audio(int64_t timestamp, char* data, int size)
-{
-    int ret = ERROR_SUCCESS;
-    
-    timestamp &= 0x7fffffff;
-    
-    static char tag_header[] = {
-        (char)8, // 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
-        (char)0x00, (char)0x00, (char)0x00, // StreamID UI24 Always 0.
-    };
-    
-    // write data size.
-    if ((ret = tag_stream->initialize(tag_header + 1, 7)) != ERROR_SUCCESS) {
-        return ret;
-    }
-    tag_stream->write_3bytes(size);
-    tag_stream->write_3bytes(timestamp);
-    // default to little-endian
-    tag_stream->write_1bytes((timestamp >> 24) & 0xFF);
-    
-    if ((ret = write_tag(tag_header, sizeof(tag_header), data, size)) != ERROR_SUCCESS) {
-        srs_error("write flv audio tag failed. ret=%d", ret);
-        return ret;
-    }
-    
-    return ret;
-}
-
-int SrsFlvEncoder::write_video(int64_t timestamp, char* data, int size)
-{
-    int ret = ERROR_SUCCESS;
-    
-    timestamp &= 0x7fffffff;
-    
-    static char tag_header[] = {
-        (char)9, // 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
-        (char)0x00, (char)0x00, (char)0x00, // StreamID UI24 Always 0.
-    };
-    
-    // write data size.
-    if ((ret = tag_stream->initialize(tag_header + 1, 7)) != ERROR_SUCCESS) {
-        return ret;
-    }
-    tag_stream->write_3bytes(size);
-    tag_stream->write_3bytes(timestamp);
-    // default to little-endian
-    tag_stream->write_1bytes((timestamp >> 24) & 0xFF);
-    
-    if ((ret = write_tag(tag_header, sizeof(tag_header), data, size)) != ERROR_SUCCESS) {
-        srs_error("write flv video tag failed. ret=%d", ret);
-        return ret;
-    }
-    
-    return ret;
-}
-
-int SrsFlvEncoder::write_tag(char* header, int header_size, char* tag, int tag_size)
-{
-    int ret = ERROR_SUCCESS;
-    
-    // write tag header.
-    if ((ret = _fs->write(header, header_size, NULL)) != ERROR_SUCCESS) {
-        srs_error("write flv tag header failed. ret=%d", ret);
-        return ret;
-    }
-    
-    // write tag data.
-    if ((ret = _fs->write(tag, tag_size, NULL)) != ERROR_SUCCESS) {
-        srs_error("write flv tag failed. ret=%d", ret);
-        return ret;
-    }
-    
-    // PreviousTagSizeN UI32 Size of last tag, including its header, in bytes.
-    static char pre_size[4];
-    if ((ret = tag_stream->initialize(pre_size, 4)) != ERROR_SUCCESS) {
-        return ret;
-    }
-    tag_stream->write_4bytes(tag_size + header_size);
-    if ((ret = _fs->write(pre_size, sizeof(pre_size), NULL)) != ERROR_SUCCESS) {
-        srs_error("write flv previous tag size failed. ret=%d", ret);
-        return ret;
-    }
-    
-    return ret;
-}
+#include <srs_app_flv.hpp>
 
 
 SrsFlvSegment::SrsFlvSegment()
 SrsFlvSegment::SrsFlvSegment()
 {
 {

@@ -37,79 +37,8 @@ class SrsStream;
 class SrsRtmpJitter;
 class SrsRtmpJitter;
 class SrsOnMetaDataPacket;
 class SrsOnMetaDataPacket;
 class SrsSharedPtrMessage;
 class SrsSharedPtrMessage;
-
-/**
-* file stream to read/write file.
-*/
-class SrsFileStream
-{
-private:
-    std::string _file;
-    int fd;
-public:
-    SrsFileStream();
-    virtual ~SrsFileStream();
-public:
-    virtual int open(std::string file);
-    virtual int close();
-    virtual bool is_open();
-public:
-    /**
-    * @param pnread, return the read size. NULL to ignore.
-    */
-    virtual int read(void* buf, size_t count, ssize_t* pnread);
-    /**
-    * @param pnwrite, return the write size. NULL to ignore.
-    */
-    virtual int write(void* buf, size_t count, ssize_t* pnwrite);
-    /**
-    * tell current offset of stream.
-    */
-    virtual int64_t tellg();
-};
-
-/**
-* encode data to flv file.
-*/
-class SrsFlvEncoder
-{
-private:
-    SrsFileStream* _fs;
-private:
-    SrsStream* tag_stream;
-public:
-    SrsFlvEncoder();
-    virtual ~SrsFlvEncoder();
-public:
-    /**
-    * initialize the underlayer file stream,
-    * user can initialize multiple times to encode multiple flv files.
-    */
-    virtual int initialize(SrsFileStream* fs);
-public:
-    /**
-    * write flv header.
-    * write following:
-    *   1. E.2 The FLV header
-    *   2. PreviousTagSize0 UI32 Always 0
-    * that is, 9+4=13bytes.
-    */
-    virtual int write_header();
-    /**
-    * write flv metadata. 
-    * serialize from:
-    *   AMF0 string: onMetaData,
-    *   AMF0 object: the metadata object.
-    */
-    virtual int write_metadata(char* data, int size);
-    /**
-    * write audio/video packet.
-    */
-    virtual int write_audio(int64_t timestamp, char* data, int size);
-    virtual int write_video(int64_t timestamp, char* data, int size);
-private:
-    virtual int write_tag(char* header, int header_size, char* tag, int tag_size);
-};
+class SrsFileStream;
+class SrsFlvEncoder;
 
 
 /**
 /**
 * a piece of flv segment.
 * a piece of flv segment.

+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2014 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <srs_app_flv.hpp>
+
+#include <fcntl.h>
+#include <sstream>
+using namespace std;
+
+#include <srs_app_config.hpp>
+#include <srs_kernel_error.hpp>
+#include <srs_protocol_rtmp.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
+#include <srs_app_source.hpp>
+#include <srs_core_autofree.hpp>
+#include <srs_kernel_stream.hpp>
+#include <srs_kernel_utility.hpp>
+#include <srs_app_http_hooks.hpp>
+#include <srs_app_codec.hpp>
+
+SrsFileStream::SrsFileStream()
+{
+    fd = -1;
+}
+
+SrsFileStream::~SrsFileStream()
+{
+    close();
+}
+
+int SrsFileStream::open(string file)
+{
+    int ret = ERROR_SUCCESS;
+    
+    if (fd > 0) {
+        ret = ERROR_SYSTEM_FILE_ALREADY_OPENED;
+        srs_error("file %s already opened. ret=%d", _file.c_str(), ret);
+        return ret;
+    }
+    
+    int flags = O_CREAT|O_WRONLY|O_TRUNC;
+    mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH;
+
+    if ((fd = ::open(file.c_str(), flags, mode)) < 0) {
+        ret = ERROR_SYSTEM_FILE_OPENE;
+        srs_error("open file %s failed. ret=%d", file.c_str(), ret);
+        return ret;
+    }
+    
+    _file = file;
+    
+    return ret;
+}
+
+int SrsFileStream::close()
+{
+    int ret = ERROR_SUCCESS;
+    
+    if (fd < 0) {
+        return ret;
+    }
+    
+    if (::close(fd) < 0) {
+        ret = ERROR_SYSTEM_FILE_CLOSE;
+        srs_error("close file %s failed. ret=%d", _file.c_str(), ret);
+        return ret;
+    }
+    fd = -1;
+    
+    return ret;
+}
+
+bool SrsFileStream::is_open()
+{
+    return fd > 0;
+}
+
+int SrsFileStream::read(void* buf, size_t count, ssize_t* pnread)
+{
+    int ret = ERROR_SUCCESS;
+    
+    ssize_t nread;
+    if ((nread = ::read(fd, buf, count)) < 0) {
+        ret = ERROR_SYSTEM_FILE_READ;
+        srs_error("read from file %s failed. ret=%d", _file.c_str(), ret);
+        return ret;
+    }
+    
+    if (nread == 0) {
+        ret = ERROR_SYSTEM_FILE_EOF;
+        return ret;
+    }
+    
+    if (pnread != NULL) {
+        *pnread = nread;
+    }
+    
+    return ret;
+}
+
+int SrsFileStream::write(void* buf, size_t count, ssize_t* pnwrite)
+{
+    int ret = ERROR_SUCCESS;
+    
+    ssize_t nwrite;
+    if ((nwrite = ::write(fd, buf, count)) < 0) {
+        ret = ERROR_SYSTEM_FILE_WRITE;
+        srs_error("write to file %s failed. ret=%d", _file.c_str(), ret);
+        return ret;
+    }
+    
+    if (pnwrite != NULL) {
+        *pnwrite = nwrite;
+    }
+    
+    return ret;
+}
+
+int64_t SrsFileStream::tellg()
+{
+    return (int64_t)::lseek(fd, 0, SEEK_CUR);
+}
+
+SrsFlvEncoder::SrsFlvEncoder()
+{
+    _fs = NULL;
+    tag_stream = new SrsStream();
+}
+
+SrsFlvEncoder::~SrsFlvEncoder()
+{
+    srs_freep(tag_stream);
+}
+
+int SrsFlvEncoder::initialize(SrsFileStream* fs)
+{
+    int ret = ERROR_SUCCESS;
+    
+    _fs = fs;
+    
+    return ret;
+}
+
+int SrsFlvEncoder::write_header()
+{
+    int ret = ERROR_SUCCESS;
+    
+    static char flv_header[] = {
+        'F', 'L', 'V', // Signatures "FLV"
+        (char)0x01, // File version (for example, 0x01 for FLV version 1)
+        (char)0x00, // 4, audio; 1, video; 5 audio+video.
+        (char)0x00, (char)0x00, (char)0x00, (char)0x09, // DataOffset UI32 The length of this header in bytes
+        (char)0x00, (char)0x00, (char)0x00, (char)0x00// PreviousTagSize0 UI32 Always 0
+    };
+    
+    // flv specification should set the audio and video flag,
+    // actually in practise, application generally ignore this flag,
+    // so we generally set the audio/video to 0.
+    
+    // write data.
+    if ((ret = _fs->write(flv_header, sizeof(flv_header), NULL)) != ERROR_SUCCESS) {
+        srs_error("write flv header failed. ret=%d", ret);
+        return ret;
+    }
+    
+    return ret;
+}
+
+int SrsFlvEncoder::write_metadata(char* data, int size)
+{
+    int ret = ERROR_SUCCESS;
+    
+    static char tag_header[] = {
+        (char)18, // TagType UB [5], 18 = script data
+        (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
+        (char)0x00, (char)0x00, (char)0x00, // StreamID UI24 Always 0.
+    };
+    
+    // write data size.
+    if ((ret = tag_stream->initialize(tag_header + 1, 3)) != ERROR_SUCCESS) {
+        return ret;
+    }
+    tag_stream->write_3bytes(size);
+    
+    if ((ret = write_tag(tag_header, sizeof(tag_header), data, size)) != ERROR_SUCCESS) {
+        srs_error("write flv data tag failed. ret=%d", ret);
+        return ret;
+    }
+    
+    return ret;
+}
+
+int SrsFlvEncoder::write_audio(int64_t timestamp, char* data, int size)
+{
+    int ret = ERROR_SUCCESS;
+    
+    timestamp &= 0x7fffffff;
+    
+    static char tag_header[] = {
+        (char)8, // 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
+        (char)0x00, (char)0x00, (char)0x00, // StreamID UI24 Always 0.
+    };
+    
+    // write data size.
+    if ((ret = tag_stream->initialize(tag_header + 1, 7)) != ERROR_SUCCESS) {
+        return ret;
+    }
+    tag_stream->write_3bytes(size);
+    tag_stream->write_3bytes(timestamp);
+    // default to little-endian
+    tag_stream->write_1bytes((timestamp >> 24) & 0xFF);
+    
+    if ((ret = write_tag(tag_header, sizeof(tag_header), data, size)) != ERROR_SUCCESS) {
+        srs_error("write flv audio tag failed. ret=%d", ret);
+        return ret;
+    }
+    
+    return ret;
+}
+
+int SrsFlvEncoder::write_video(int64_t timestamp, char* data, int size)
+{
+    int ret = ERROR_SUCCESS;
+    
+    timestamp &= 0x7fffffff;
+    
+    static char tag_header[] = {
+        (char)9, // 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
+        (char)0x00, (char)0x00, (char)0x00, // StreamID UI24 Always 0.
+    };
+    
+    // write data size.
+    if ((ret = tag_stream->initialize(tag_header + 1, 7)) != ERROR_SUCCESS) {
+        return ret;
+    }
+    tag_stream->write_3bytes(size);
+    tag_stream->write_3bytes(timestamp);
+    // default to little-endian
+    tag_stream->write_1bytes((timestamp >> 24) & 0xFF);
+    
+    if ((ret = write_tag(tag_header, sizeof(tag_header), data, size)) != ERROR_SUCCESS) {
+        srs_error("write flv video tag failed. ret=%d", ret);
+        return ret;
+    }
+    
+    return ret;
+}
+
+int SrsFlvEncoder::write_tag(char* header, int header_size, char* tag, int tag_size)
+{
+    int ret = ERROR_SUCCESS;
+    
+    // write tag header.
+    if ((ret = _fs->write(header, header_size, NULL)) != ERROR_SUCCESS) {
+        srs_error("write flv tag header failed. ret=%d", ret);
+        return ret;
+    }
+    
+    // write tag data.
+    if ((ret = _fs->write(tag, tag_size, NULL)) != ERROR_SUCCESS) {
+        srs_error("write flv tag failed. ret=%d", ret);
+        return ret;
+    }
+    
+    // PreviousTagSizeN UI32 Size of last tag, including its header, in bytes.
+    static char pre_size[4];
+    if ((ret = tag_stream->initialize(pre_size, 4)) != ERROR_SUCCESS) {
+        return ret;
+    }
+    tag_stream->write_4bytes(tag_size + header_size);
+    if ((ret = _fs->write(pre_size, sizeof(pre_size), NULL)) != ERROR_SUCCESS) {
+        srs_error("write flv previous tag size failed. ret=%d", ret);
+        return ret;
+    }
+    
+    return ret;
+}
+

+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2014 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef SRS_APP_FLV_HPP
+#define SRS_APP_FLV_HPP
+
+/*
+#include <srs_app_flv.hpp>
+*/
+#include <srs_core.hpp>
+
+class SrsStream;
+
+/**
+* file stream to read/write file.
+*/
+class SrsFileStream
+{
+private:
+    std::string _file;
+    int fd;
+public:
+    SrsFileStream();
+    virtual ~SrsFileStream();
+public:
+    virtual int open(std::string file);
+    virtual int close();
+    virtual bool is_open();
+public:
+    /**
+    * @param pnread, return the read size. NULL to ignore.
+    */
+    virtual int read(void* buf, size_t count, ssize_t* pnread);
+    /**
+    * @param pnwrite, return the write size. NULL to ignore.
+    */
+    virtual int write(void* buf, size_t count, ssize_t* pnwrite);
+    /**
+    * tell current offset of stream.
+    */
+    virtual int64_t tellg();
+};
+
+/**
+* encode data to flv file.
+*/
+class SrsFlvEncoder
+{
+private:
+    SrsFileStream* _fs;
+private:
+    SrsStream* tag_stream;
+public:
+    SrsFlvEncoder();
+    virtual ~SrsFlvEncoder();
+public:
+    /**
+    * initialize the underlayer file stream,
+    * user can initialize multiple times to encode multiple flv files.
+    */
+    virtual int initialize(SrsFileStream* fs);
+public:
+    /**
+    * write flv header.
+    * write following:
+    *   1. E.2 The FLV header
+    *   2. PreviousTagSize0 UI32 Always 0
+    * that is, 9+4=13bytes.
+    */
+    virtual int write_header();
+    /**
+    * write flv metadata. 
+    * serialize from:
+    *   AMF0 string: onMetaData,
+    *   AMF0 object: the metadata object.
+    */
+    virtual int write_metadata(char* data, int size);
+    /**
+    * write audio/video packet.
+    */
+    virtual int write_audio(int64_t timestamp, char* data, int size);
+    virtual int write_video(int64_t timestamp, char* data, int size);
+private:
+    virtual int write_tag(char* header, int header_size, char* tag, int tag_size);
+};
+
+#endif

@@ -176,7 +176,9 @@ void* SrsThread::thread_fun(void* arg)
     
     
     obj->thread_cycle();
     obj->thread_cycle();
 
 
-    st_thread_exit(NULL);
+    // never use the following exit function,
+    // it will cause the SRS memory leak.
+    //st_thread_exit(NULL);
     
     
     return NULL;
     return NULL;
 }
 }

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "111"
+#define VERSION_REVISION "112"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_KEY "SRS"

@@ -57,6 +57,8 @@ file
 	..\app\srs_app_encoder.cpp,
 	..\app\srs_app_encoder.cpp,
 	..\app\srs_app_ffmpeg.hpp,
 	..\app\srs_app_ffmpeg.hpp,
 	..\app\srs_app_ffmpeg.cpp,
 	..\app\srs_app_ffmpeg.cpp,
+	..\app\srs_app_flv.hpp,
+	..\app\srs_app_flv.cpp,
 	..\app\srs_app_forward.hpp,
 	..\app\srs_app_forward.hpp,
 	..\app\srs_app_forward.cpp,
 	..\app\srs_app_forward.cpp,
 	..\app\srs_app_heartbeat.hpp,
 	..\app\srs_app_heartbeat.hpp,