From f29f269d999fc4bb8a9bfa85629f08b89971a2ef Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:00:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg

---
 csrc/worker/rec.cpp |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/csrc/worker/rec.cpp b/csrc/worker/rec.cpp
index 9c5ae1e..9a306b2 100644
--- a/csrc/worker/rec.cpp
+++ b/csrc/worker/rec.cpp
@@ -16,7 +16,7 @@
 using namespace ffwrapper;
 using namespace cffmpeg_wrap::buz;
 
-static const int cache_time = 6 * 60;
+static const int cache_time = 3 * 60 + 30;
 
 namespace cffmpeg_wrap
 {
@@ -255,16 +255,18 @@
 
     void rec::SetRecMinCacheTime(const int min){
         // 鐢变簬鏁翠釜娴佺▼鑰楁椂,琛ュ伩time_offset_
-        int fps = 25;
-        if (recRef_){
-            fps = recRef_->getFPS();
-        }
-        min_cache_len_ += min * fps;
+        // int fps = 25;
+        // if (recRef_){
+        //     fps = recRef_->getFPS();
+        // }
+        // if (min_cache_len_ > (cache_time+min) * fps){
+        //     return;
+        // }
+        // min_cache_len_ += min * fps;
     }
 
     int rec::shrinkCache(){
         //瓒呰繃鏈�澶х紦瀛�,涓㈠純gop        
-
         while (list_pkt_.size() > min_cache_len_) {
             list_pkt_.pop_front();
             while(!list_pkt_.empty()){

--
Gitblit v1.8.0