external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

CI: Cover kernel ts

Browse source
This commit is contained in:
winlin 2019-02-05 08:33:29 +08:00
parent 3f59c7885e
commit 8eccfeceb9
4 changed files with 114 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -298,7 +298,7 @@ srs_error_t SrsTsContext::decode(SrsBuffer* stream, ISrsTsHandler* handler)
return err;
}
srs_error_t SrsTsContext::encode(SrsFileWriter* writer, SrsTsMessage* msg, SrsVideoCodecId vc, SrsAudioCodecId ac)
srs_error_t SrsTsContext::encode(ISrsStreamWriter* writer, SrsTsMessage* msg, SrsVideoCodecId vc, SrsAudioCodecId ac)
{
srs_error_t err = srs_success;
@ -380,7 +380,7 @@ void SrsTsContext::set_sync_byte(int8_t sb)
sync_byte = sb;
}
srs_error_t SrsTsContext::encode_pat_pmt(SrsFileWriter* writer, int16_t vpid, SrsTsStream vs, int16_t apid, SrsTsStream as)
srs_error_t SrsTsContext::encode_pat_pmt(ISrsStreamWriter* writer, int16_t vpid, SrsTsStream vs, int16_t apid, SrsTsStream as)
{
srs_error_t err = srs_success;
@ -441,7 +441,7 @@ srs_error_t SrsTsContext::encode_pat_pmt(SrsFileWriter* writer, int16_t vpid, Sr
return err;
}
srs_error_t SrsTsContext::encode_pes(SrsFileWriter* writer, SrsTsMessage* msg, int16_t pid, SrsTsStream sid, bool pure_audio)
srs_error_t SrsTsContext::encode_pes(ISrsStreamWriter* writer, SrsTsMessage* msg, int16_t pid, SrsTsStream sid, bool pure_audio)
{
srs_error_t err = srs_success;
@ -2543,7 +2543,7 @@ srs_error_t SrsTsPayloadPMT::psi_encode(SrsBuffer* stream)
return err;
}
SrsTsContextWriter::SrsTsContextWriter(SrsFileWriter* w, SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc)
SrsTsContextWriter::SrsTsContextWriter(ISrsStreamWriter* w, SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc)
{
writer = w;
context = c;
@ -2568,7 +2568,10 @@ srs_error_t SrsTsContextWriter::open(string p)
// reset the context for a new ts start.
context->reset();
if ((err = writer->open(path)) != srs_success) {
SrsFileWriter* fw = dynamic_cast<SrsFileWriter*>(writer);
srs_assert(fw);
if ((err = fw->open(path)) != srs_success) {
return srs_error_wrap(err, "ts: open writer");
}
@ -2607,7 +2610,10 @@ srs_error_t SrsTsContextWriter::write_video(SrsTsMessage* video)
void SrsTsContextWriter::close()
{
writer->close();
SrsFileWriter* fw = dynamic_cast<SrsFileWriter*>(writer);
srs_assert(fw);
fw->close();
}
SrsVideoCodecId SrsTsContextWriter::video_codec()
@ -3011,7 +3017,7 @@ SrsTsTransmuxer::~SrsTsTransmuxer()
srs_freep(context);
}
srs_error_t SrsTsTransmuxer::initialize(SrsFileWriter* fw)
srs_error_t SrsTsTransmuxer::initialize(ISrsStreamWriter* fw)
{
srs_error_t err = srs_success;
@ -3021,10 +3027,6 @@ srs_error_t SrsTsTransmuxer::initialize(SrsFileWriter* fw)
srs_assert(fw);
if (!fw->is_open()) {
return srs_error_new(ERROR_KERNEL_FLV_STREAM_CLOSED, "ts: stream is not open");
}
writer = fw;
srs_freep(tscw);

16
trunk/src/kernel/srs_kernel_ts.hpp
View file

@ -38,7 +38,7 @@
class SrsBuffer;
class SrsTsMessageCache;
class SrsTsContextWriter;
class SrsFileWriter;
class ISrsStreamWriter;
class SrsFileReader;
class SrsFormat;
class SrsSimpleStream;
@ -403,7 +403,7 @@ public:
* @param vc the video codec, write the PAT/PMT table when changed.
* @param ac the audio codec, write the PAT/PMT table when changed.
*/
virtual srs_error_t encode(SrsFileWriter* writer, SrsTsMessage* msg, SrsVideoCodecId vc, SrsAudioCodecId ac);
virtual srs_error_t encode(ISrsStreamWriter* writer, SrsTsMessage* msg, SrsVideoCodecId vc, SrsAudioCodecId ac);
// drm methods
public:
/**
@ -412,8 +412,8 @@ public:
*/
virtual void set_sync_byte(int8_t sb);
private:
virtual srs_error_t encode_pat_pmt(SrsFileWriter* writer, int16_t vpid, SrsTsStream vs, int16_t apid, SrsTsStream as);
virtual srs_error_t encode_pes(SrsFileWriter* writer, SrsTsMessage* msg, int16_t pid, SrsTsStream sid, bool pure_audio);
virtual srs_error_t encode_pat_pmt(ISrsStreamWriter* writer, int16_t vpid, SrsTsStream vs, int16_t apid, SrsTsStream as);
virtual srs_error_t encode_pes(ISrsStreamWriter* writer, SrsTsMessage* msg, int16_t pid, SrsTsStream sid, bool pure_audio);
};
/**
@ -1543,10 +1543,10 @@ private:
SrsAudioCodecId acodec;
private:
SrsTsContext* context;
SrsFileWriter* writer;
ISrsStreamWriter* writer;
std::string path;
public:
SrsTsContextWriter(SrsFileWriter* w, SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc);
SrsTsContextWriter(ISrsStreamWriter* w, SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc);
virtual ~SrsTsContextWriter();
public:
/**
@ -1628,7 +1628,7 @@ private:
class SrsTsTransmuxer
{
private:
SrsFileWriter* writer;
ISrsStreamWriter* writer;
private:
SrsFormat* format;
SrsTsMessageCache* tsmc;
@ -1642,7 +1642,7 @@ public:
* initialize the underlayer file stream.
* @param fw the writer to use for ts encoder, user must free it.
*/
virtual srs_error_t initialize(SrsFileWriter* fw);
virtual srs_error_t initialize(ISrsStreamWriter* fw);
public:
/**
* write audio/video packet.