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

refine the librtmp, open writer then reader.

Browse source
This commit is contained in:
winlin 2014-06-29 17:12:10 +08:00
parent 1a7735182f
commit 1eee4d25cf
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -473,16 +473,6 @@ srs_flv_t srs_flv_open(const char* file)
FlvContext* flv = new FlvContext(); 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;
}
if ((ret = flv->writer.open(file)) != ERROR_SUCCESS) { if ((ret = flv->writer.open(file)) != ERROR_SUCCESS) {
srs_freep(flv); srs_freep(flv);
return NULL; return NULL;
@ -493,6 +483,16 @@ srs_flv_t srs_flv_open(const char* file)
return NULL; 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; return flv;
} }

1
trunk/src/libs/srs_librtmp.hpp
View file

@ -165,6 +165,7 @@ int64_t srs_get_nrecv_bytes(srs_rtmp_t rtmp);
*/ */
typedef void* srs_flv_t; typedef void* srs_flv_t;
typedef int flv_bool; typedef int flv_bool;
/* open flv file for both read/write. */
srs_flv_t srs_flv_open(const char* file); srs_flv_t srs_flv_open(const char* file);
void srs_flv_close(srs_flv_t flv); void srs_flv_close(srs_flv_t flv);
/* read the flv header. 9bytes header. drop the 4bytes zero previous tag size */ /* read the flv header. 9bytes header. drop the 4bytes zero previous tag size */