mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
fix #738, support DVR general mp4. 3.0.17
This commit is contained in:
parent
3209ad29e0
commit
afbc3443f3
12 changed files with 1264 additions and 222 deletions
|
@ -192,31 +192,6 @@ string srs_generate_vis_tc_url(string ip, string vhost, string app, int port)
|
|||
return "rtmp://" + ip + ":" + srs_int2str(port) + "/" + app;
|
||||
}
|
||||
|
||||
/**
|
||||
* compare the memory in bytes.
|
||||
*/
|
||||
bool srs_bytes_equals(void* pa, void* pb, int size)
|
||||
{
|
||||
uint8_t* a = (uint8_t*)pa;
|
||||
uint8_t* b = (uint8_t*)pb;
|
||||
|
||||
if (!a && !b) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!a || !b) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for(int i = 0; i < size; i++){
|
||||
if(a[i] != b[i]){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
int srs_do_rtmp_create_msg(char type, uint32_t timestamp, char* data, int size, int stream_id, T** ppmsg)
|
||||
{
|
||||
|
|
|
@ -89,25 +89,19 @@ extern std::string srs_generate_tc_url(
|
|||
* srs_detect_tools generate the normal tcUrl
|
||||
*/
|
||||
extern std::string srs_generate_normal_tc_url(
|
||||
std::string ip, std::string vhost, std::string app, int port);
|
||||
std::string ip, std::string vhost, std::string app, int port);
|
||||
|
||||
/**
|
||||
* srs_detect_tools generate the normal tcUrl
|
||||
*/
|
||||
extern std::string srs_generate_via_tc_url(
|
||||
std::string ip, std::string vhost, std::string app, int port);
|
||||
std::string ip, std::string vhost, std::string app, int port);
|
||||
|
||||
/**
|
||||
* srs_detect_tools generate the vis/vis2 tcUrl
|
||||
*/
|
||||
extern std::string srs_generate_vis_tc_url(
|
||||
std::string ip, std::string vhost, std::string app, int port);
|
||||
|
||||
/**
|
||||
* compare the memory in bytes.
|
||||
* @return true if completely equal; otherwise, false.
|
||||
*/
|
||||
extern bool srs_bytes_equals(void* pa, void* pb, int size);
|
||||
std::string ip, std::string vhost, std::string app, int port);
|
||||
|
||||
/**
|
||||
* create shared ptr message from bytes.
|
||||
|
|
|
@ -32,6 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include <srs_protocol_utility.hpp>
|
||||
#include <srs_rtmp_stack.hpp>
|
||||
#include <srs_kernel_buffer.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
|
||||
#ifdef SRS_AUTO_SSL
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue