Merge branch 'develop' of https://github.com/runner365/srs into runne…

…r365-develop
ossrs · Jun 14, 2020 · cc9063d · cc9063d
2 parents e75f28a + 438289f
commit cc9063d
Show file tree

Hide file tree

Showing 13 changed files with 1,513 additions and 119 deletions.
diff --git a/trunk/configure b/trunk/configure
@@ -214,7 +214,7 @@ MODULE_DEPENDS=("CORE" "KERNEL")
 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
 MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack"
         "srs_rtmp_handshake" "srs_protocol_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
-        "srs_raw_avc" "srs_rtsp_stack" "srs_sip_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
+        "srs_raw_avc" "srs_raw_hevc" "srs_rtsp_stack" "srs_sip_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
         "srs_protocol_format")
 if [[ $SRS_RTC == YES ]]; then
     MODULE_FILES+=("srs_rtc_stun_stack")

diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp
@@ -382,6 +382,8 @@ srs_error_t SrsHlsMuxer::segment_open()
         std::string default_vcodec_str = _srs_config->get_hls_vcodec(req->vhost);
         if (default_vcodec_str == "h264") {
             default_vcodec = SrsVideoCodecIdAVC;
+        } else if (default_vcodec_str == "h265") {
+            default_vcodec = SrsVideoCodecIdHEVC;
         } else if (default_vcodec_str == "vn") {
             default_vcodec = SrsVideoCodecIdDisabled;
         } else {
@@ -1322,7 +1324,7 @@ srs_error_t SrsHls::on_video(SrsSharedPtrMessage* shared_video, SrsFormat* forma
     }
 
     srs_assert(format->vcodec);
-    if (format->vcodec->id != SrsVideoCodecIdAVC) {
+    if ((format->vcodec->id != SrsVideoCodecIdAVC) && (format->vcodec->id != SrsVideoCodecIdHEVC)) {
         return err;
     }
 

diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
@@ -630,7 +630,8 @@ srs_error_t SrsGopCache::cache(SrsSharedPtrMessage* shared_msg)
     // got video, update the video count if acceptable
     if (msg->is_video()) {
         // drop video when not h.264
-        if (!SrsFlvVideo::h264(msg->payload, msg->size)) {
+        if (!SrsFlvVideo::h264(msg->payload, msg->size)
+            && !SrsFlvVideo::hevc(msg->payload, msg->size)) {
             return err;
         }