diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index c058666b8..8f6451c69 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -458,7 +458,7 @@ srs_error_t SrsHlsMuxer::segment_open() // open temp ts file. std::string tmp_file = current->tmppath(); - if ((err = current->tscw->open(tmp_file.c_str())) != srs_success) { + if ((err = current->writer->open(tmp_file)) != srs_success) { return srs_error_wrap(err, "open hls muxer"); } diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index cffd67cda..de7dd5b79 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -2554,28 +2554,6 @@ SrsTsContextWriter::SrsTsContextWriter(ISrsStreamWriter* w, SrsTsContext* c, Srs SrsTsContextWriter::~SrsTsContextWriter() { - close(); -} - -srs_error_t SrsTsContextWriter::open(string p) -{ - srs_error_t err = srs_success; - - path = p; - - close(); - - // reset the context for a new ts start. - context->reset(); - - SrsFileWriter* fw = dynamic_cast(writer); - srs_assert(fw); - - if ((err = fw->open(path)) != srs_success) { - return srs_error_wrap(err, "ts: open writer"); - } - - return err; } srs_error_t SrsTsContextWriter::write_audio(SrsTsMessage* audio) @@ -2608,14 +2586,6 @@ srs_error_t SrsTsContextWriter::write_video(SrsTsMessage* video) return err; } -void SrsTsContextWriter::close() -{ - SrsFileWriter* fw = dynamic_cast(writer); - srs_assert(fw); - - fw->close(); -} - SrsVideoCodecId SrsTsContextWriter::video_codec() { return vcodec; @@ -3033,10 +3003,6 @@ srs_error_t SrsTsTransmuxer::initialize(ISrsStreamWriter* fw) // TODO: FIXME: Support config the codec. tscw = new SrsTsContextWriter(fw, context, SrsAudioCodecIdAAC, SrsVideoCodecIdAVC); - if ((err = tscw->open("")) != srs_success) { - return srs_error_wrap(err, "ts: open writer"); - } - return err; } diff --git a/trunk/src/kernel/srs_kernel_ts.hpp b/trunk/src/kernel/srs_kernel_ts.hpp index e2e1e523a..c31dd4eb2 100644 --- a/trunk/src/kernel/srs_kernel_ts.hpp +++ b/trunk/src/kernel/srs_kernel_ts.hpp @@ -1549,11 +1549,6 @@ public: SrsTsContextWriter(ISrsStreamWriter* w, SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc); virtual ~SrsTsContextWriter(); public: - /** - * open the writer, donot write the PSI of ts. - * @param p a string indicates the path of ts file to mux to. - */ - virtual srs_error_t open(std::string p); /** * write an audio frame to ts, */ @@ -1562,10 +1557,6 @@ public: * write a video frame to ts, */ virtual srs_error_t write_video(SrsTsMessage* video); - /** - * close the writer. - */ - virtual void close(); public: /** * get the video codec of ts muxer.