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

fix bug that only one stream can be encrypted..

Browse source
This commit is contained in:
Harlan 2018-04-03 22:00:32 +08:00
parent 52596a0b04
commit 43ebd5958d
3 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
trunk/src/app/srs_app_hls.cpp
View file

@ -62,18 +62,11 @@ using namespace std;
// reset the piece id when deviation overflow this. // reset the piece id when deviation overflow this.
#define SRS_JUMP_WHEN_PIECE_DEVIATION 20 #define SRS_JUMP_WHEN_PIECE_DEVIATION 20
SrsHlsSegment::SrsHlsSegment(SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc,bool needenc) SrsHlsSegment::SrsHlsSegment(SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc, SrsFileWriter *srswriter)
{ {
sequence_no = 0; sequence_no = 0;
if(needenc) writer = srswriter;
{
writer = new SrsEncFileWriter();
}
else
{
writer = new SrsFileWriter();
}
tscw = new SrsTsContextWriter(writer, c, ac, vc); tscw = new SrsTsContextWriter(writer, c, ac, vc);
} }
@ -87,7 +80,7 @@ void SrsHlsSegment::SrsSetEncCfg(unsigned char* keyval,unsigned char *ivval)
SrsHlsSegment::~SrsHlsSegment() SrsHlsSegment::~SrsHlsSegment()
{ {
srs_freep(tscw); srs_freep(tscw);
srs_freep(writer); //srs_freep(writer);
} }
SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(int c, SrsRequest* r, string p, string t, string m, string mu, int s, double d) SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(int c, SrsRequest* r, string p, string t, string m, string mu, int s, double d)
@ -223,6 +216,7 @@ SrsHlsMuxer::~SrsHlsMuxer()
srs_freep(req); srs_freep(req);
srs_freep(async); srs_freep(async);
srs_freep(context); srs_freep(context);
srs_freep(writer);
} }
void SrsHlsMuxer::dispose() void SrsHlsMuxer::dispose()
@ -335,6 +329,15 @@ srs_error_t SrsHlsMuxer::update_config(SrsRequest* r, string entry_prefix,
} }
} }
if(hls_keys)
{
writer = new SrsEncFileWriter();
}
else
{
writer = new SrsFileWriter();
}
return err; return err;
} }
@ -379,7 +382,7 @@ srs_error_t SrsHlsMuxer::segment_open()
} }
// new segment. // new segment.
current = new SrsHlsSegment(context, default_acodec, default_vcodec, hls_keys); current = new SrsHlsSegment(context, default_acodec, default_vcodec,writer);
current->sequence_no = _sequence_no++; current->sequence_no = _sequence_no++;
if(hls_keys){ if(hls_keys){

4
trunk/src/app/srs_app_hls.hpp
View file

@ -73,7 +73,7 @@ public:
std::string keypath; std::string keypath;
public: public:
SrsHlsSegment(SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc,bool needenc); SrsHlsSegment(SrsTsContext* c, SrsAudioCodecId ac, SrsVideoCodecId vc, SrsFileWriter *srswriter);
virtual ~SrsHlsSegment(); virtual ~SrsHlsSegment();
public: public:
@ -170,6 +170,8 @@ private:
unsigned char key[16]; unsigned char key[16];
unsigned char iv[16]; unsigned char iv[16];
SrsFileWriter *writer;
private: private:

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

@ -1578,18 +1578,17 @@ public:
* Used for HLS Encryption * Used for HLS Encryption
*/ */
#define HLS_AES_ENCRYPT_BLOCK_LENGTH 188*4 #define HLS_AES_ENCRYPT_BLOCK_LENGTH 188*4
static char tmpbuf[HLS_AES_ENCRYPT_BLOCK_LENGTH] = {0};
static int buflength = 0;
class SrsEncFileWriter: public SrsFileWriter class SrsEncFileWriter: public SrsFileWriter
{ {
public: public:
SrsEncFileWriter() SrsEncFileWriter()
{ {
memset(iv,0,16); memset(iv,0,16);
memset(tmpbuf,0,HLS_AES_ENCRYPT_BLOCK_LENGTH);
buflength = 0;
} }
virtual ~SrsEncFileWriter(){} virtual ~SrsEncFileWriter(){}
@ -1602,6 +1601,12 @@ public:
private: private:
AES_KEY key; AES_KEY key;
unsigned char iv[16]; unsigned char iv[16];
private:
char tmpbuf[HLS_AES_ENCRYPT_BLOCK_LENGTH];
int buflength;
}; };
/** /**