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

donot mix the read and write for librtmp

Browse source
This commit is contained in:
winlin 2014-06-29 17:17:50 +08:00
parent 1eee4d25cf
commit a888e52df1
8 changed files with 58 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

56
trunk/src/libs/srs_librtmp.cpp
View file

@ -467,7 +467,26 @@ struct FlvContext
SrsFlvDecoder dec;
};
srs_flv_t srs_flv_open(const char* file)
srs_flv_t srs_flv_open_read(const char* file)
{
int ret = ERROR_SUCCESS;
FlvContext* flv = new FlvContext();
if ((ret = flv->reader.open(file)) != ERROR_SUCCESS) {
srs_freep(flv);
return NULL;
}
if ((ret = flv->dec.initialize(&flv->reader)) != ERROR_SUCCESS) {
srs_freep(flv);
return NULL;
}
return flv;
}
srs_flv_t srs_flv_open_write(const char* file)
{
int ret = ERROR_SUCCESS;
@ -483,16 +502,6 @@ srs_flv_t srs_flv_open(const char* file)
return NULL;
}
if ((ret = flv->reader.open(file)) != ERROR_SUCCESS) {
srs_freep(flv);
return NULL;
}
if ((ret = flv->dec.initialize(&flv->reader)) != ERROR_SUCCESS) {
srs_freep(flv);
return NULL;
}
return flv;
}
@ -507,6 +516,11 @@ int srs_flv_read_header(srs_flv_t flv, char header[9])
int ret = ERROR_SUCCESS;
FlvContext* context = (FlvContext*)flv;
if (!context->reader.is_open()) {
return ERROR_SYSTEM_IO_INVALID;
}
if ((ret = context->dec.read_header(header)) != ERROR_SUCCESS) {
return ret;
}
@ -524,6 +538,11 @@ int srs_flv_read_tag_header(srs_flv_t flv, char* ptype, int32_t* pdata_size, u_i
int ret = ERROR_SUCCESS;
FlvContext* context = (FlvContext*)flv;
if (!context->reader.is_open()) {
return ERROR_SYSTEM_IO_INVALID;
}
if ((ret = context->dec.read_tag_header(ptype, pdata_size, ptime)) != ERROR_SUCCESS) {
return ret;
}
@ -536,6 +555,11 @@ int srs_flv_read_tag_data(srs_flv_t flv, char* data, int32_t size)
int ret = ERROR_SUCCESS;
FlvContext* context = (FlvContext*)flv;
if (!context->reader.is_open()) {
return ERROR_SYSTEM_IO_INVALID;
}
if ((ret = context->dec.read_tag_data(data, size)) != ERROR_SUCCESS) {
return ret;
}
@ -553,6 +577,11 @@ int srs_flv_write_header(srs_flv_t flv, char header[9])
int ret = ERROR_SUCCESS;
FlvContext* context = (FlvContext*)flv;
if (!context->writer.is_open()) {
return ERROR_SYSTEM_IO_INVALID;
}
if ((ret = context->enc.write_header(header)) != ERROR_SUCCESS) {
return ret;
}
@ -565,6 +594,11 @@ int srs_flv_write_tag(srs_flv_t flv, char type, int32_t time, char* data, int si
int ret = ERROR_SUCCESS;
FlvContext* context = (FlvContext*)flv;
if (!context->writer.is_open()) {
return ERROR_SYSTEM_IO_INVALID;
}
if (type == SRS_RTMP_TYPE_AUDIO) {
return context->enc.write_audio(time, data, size);
} else if (type == SRS_RTMP_TYPE_VIDEO) {