From 2384aa5bbdbda963224cb7cbf4dce115649eca5f Mon Sep 17 00:00:00 2001 From: liuziloong <18675721@qq.com> Date: Mon, 20 Jan 2020 15:02:45 +0800 Subject: [PATCH] =?UTF-8?q?MP4=E5=BD=95=E5=83=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E7=9B=AE=E5=BD=95=EF=BC=8C=E6=8C=89=E7=85=A7?= =?UTF-8?q?=EF=BC=9A=E5=B9=B4=E6=9C=88/=E5=B9=B4=E6=9C=88=E6=97=A5/*.mp4?= =?UTF-8?q?=E5=AD=98=E5=82=A8=EF=BC=9B=20=E5=A2=9E=E5=8A=A0=E6=8C=89?= =?UTF-8?q?=E6=9C=88=EF=BC=8C=E6=8C=89=E5=A4=A9=E6=9F=A5=E8=AF=A2mp4?= =?UTF-8?q?=E5=BD=95=E5=83=8F=EF=BC=9B=20=E6=B6=88=E9=99=A4=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E7=BC=96=E8=AF=91=E5=99=A8=E8=AD=A6=E5=91=8A=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/WebApi.cpp | 98 ++++++++++++++++++++++++++++++-------- src/Extension/SPSParser.c | 2 +- src/Record/MP4Recorder.cpp | 6 ++- 3 files changed, 84 insertions(+), 22 deletions(-) diff --git a/server/WebApi.cpp b/server/WebApi.cpp index 28cce944..724328ac 100644 --- a/server/WebApi.cpp +++ b/server/WebApi.cpp @@ -71,6 +71,7 @@ static onceToken token([]() { }); }//namespace API + class ApiRetException: public std::runtime_error { public: ApiRetException(const char *str = "success" ,int code = API::Success):runtime_error(str){ @@ -773,9 +774,9 @@ void installWebApi() { val["status"] = (int)status; }); - //获取录像列表（按月） - //http://127.0.0.1/index/api/getMp4RecordMonthly?app=pzstll&stream=stream_4&period=2020-01 - API_REGIST(api, getMp4RecordMonthly, { + //获取录像列表（按月）,返回天 + //http://127.0.0.1/index/api/getMp4RecordMonthly?app=live&stream=onvif&period=2020-01 + api_regist1("/index/api/getMp4RecordMonthly", [](API_ARGS1){ CHECK_SECRET(); CHECK_ARGS("app", "stream", "period"); @@ -787,45 +788,104 @@ void installWebApi() { auto _app = allArgs["app"]; auto _stream = allArgs["stream"]; auto _period = allArgs["period"]; - + //TODO:判断日期格式 //Vhost为空的话，存储路径不一样 - if (_vhost.empty()) - { + if (_vhost.empty()) { _vhost = DEFAULT_VHOST; } - string strMp4RecordPath; - if (enableVhost) - { - strMp4RecordPath = recordPath + "/" + _vhost + "/" + recordAppName + "/" + _app + "/" + _stream; + string strMp4RecordPath = ""; + if (enableVhost) { + strMp4RecordPath = recordPath + "/" + _vhost + "/" + recordAppName + "/" + _app + "/" + _stream + "/" + _period; + } else { + strMp4RecordPath = recordPath + "/" + recordAppName + "/" + _app + "/" + _stream + "/" + _period; } - else - { - strMp4RecordPath = recordPath + "/" + recordAppName + "/" + _app + "/" + _stream; - } - DebugL << strMp4RecordPath; + + //录像相对路径转绝对路径， 不然vs调试需要设置 + strMp4RecordPath = File::absolutePath(strMp4RecordPath, ""); + string strMp4Path = ""; + File::scanDir(strMp4RecordPath, [&strMp4Path](const string &path, bool isDir) { + if (isDir) { + //DebugL << "dir:" << path.data(); + int iPost = path.rfind('/'); + if (iPost != string::npos) + { + string strPath = path.substr(iPost + 1); + strMp4Path += strPath + ","; + } + } + return true; + },false); + + //去掉strMp4Path最后一个 ‘,’ + strMp4Path = strMp4Path.substr(0, strMp4Path.length() - 1); Json::Value nVal; nVal["vhost"] = _vhost.data(); nVal["app"] = _app.data(); nVal["stream"] = _stream.data(); nVal["app"] = _app.data(); + nVal["path"] = strMp4Path; val["data"] = nVal; - }); //获取录像列表（按天） - //http://127.0.0.1/index/api/getMp4RecordDaily?app=pzstll&stream=stream_4&period=2020-01-17 - API_REGIST(api, getMp4RecordDaily, { + //http://127.0.0.1/index/api/getMp4RecordDaily?app=live&stream=onvif&period=2020-01-17 + api_regist1("/index/api/getMp4RecordDaily",[](API_ARGS1) { CHECK_SECRET(); CHECK_ARGS("app", "stream", "period"); + GET_CONFIG(string, recordAppName, Record::kAppName); + GET_CONFIG(string, recordPath, Record::kFilePath); + GET_CONFIG(bool, enableVhost, General::kEnableVhost); + auto _vhost = allArgs["vhost"]; + auto _app = allArgs["app"]; + auto _stream = allArgs["stream"]; + auto _period = allArgs["period"]; - }); + //TODO:判断日期格式 + + //Vhost为空的话，存储路径不一样 + if (_vhost.empty()) { + _vhost = DEFAULT_VHOST; + } + + string strMp4RecordPath = ""; + //取录上一级目录,默认前7位位上级目录 + string strParentPeriod = string(_period).substr(0, 7); + if (enableVhost) { + strMp4RecordPath = recordPath + "/" + _vhost + "/" + recordAppName + "/" + _app + "/" + _stream + "/" + strParentPeriod + "/" + _period; + } + else { + strMp4RecordPath = recordPath + "/" + recordAppName + "/" + _app + "/" + _stream + "/" + strParentPeriod + "/" + _period; + } + + //录像相对路径转绝对路径， 不然vs调试需要设置 + strMp4RecordPath = File::absolutePath(strMp4RecordPath, ""); + Json::Value nVal; + DebugL << recordPath; + File::scanDir(strMp4RecordPath, [&](const string &path, bool isDir) { + if (!isDir) { + //去掉绝对路径，从record开始返回 + int iPos = path.find(recordAppName); + string strPath = path.substr(iPos); + + nVal["path"].append(strPath); + } + return true; + }, false); + + nVal["vhost"] = _vhost.data(); + nVal["app"] = _app.data(); + nVal["stream"] = _stream.data(); + nVal["app"] = _app.data(); + + val["data"] = nVal; + }); ////////////以下是注册的Hook API//////////// api_regist1("/index/hook/on_publish",[](API_ARGS1){ diff --git a/src/Extension/SPSParser.c b/src/Extension/SPSParser.c index b073b9cb..54c19592 100644 --- a/src/Extension/SPSParser.c +++ b/src/Extension/SPSParser.c @@ -1330,7 +1330,7 @@ int hevcDecodeShortTermRps(T_GetBitContext *pvBuf, int iDeltaRps; unsigned int uiAbsDeltaRps; uint8_t u8UseDeltaFlag = 0; - uint8_t u8DeltaRpsSign; + uint8_t u8DeltaRpsSign = 0; if (is_slice_header) { unsigned int uiDeltaIdx = parseUe(pvBuf) + 1; diff --git a/src/Record/MP4Recorder.cpp b/src/Record/MP4Recorder.cpp index a92f3fde..cd439820 100644 --- a/src/Record/MP4Recorder.cpp +++ b/src/Record/MP4Recorder.cpp @@ -53,9 +53,10 @@ MP4Recorder::~MP4Recorder() { void MP4Recorder::createFile() { closeFile(); auto strDate = getTimeStr("%Y-%m-%d"); + auto strDay = getTimeStr("%Y-%m-%d"); auto strTime = getTimeStr("%H-%M-%S"); - auto strFileTmp = _strPath + strDate + "/." + strTime + ".mp4"; - auto strFile = _strPath + strDate + "/" + strTime + ".mp4"; + auto strFileTmp = _strPath + strDate + "/" + strDay + "/." + strTime + ".mp4"; + auto strFile = _strPath + strDate + "/" + strDay + "/" + strTime + ".mp4"; /////record 业务逻辑////// _info.ui64StartedTime = ::time(NULL); @@ -66,6 +67,7 @@ void MP4Recorder::createFile() { + _info.strAppName + "/" + _info.strStreamId + "/" + strDate + "/" + + strDay + "/" + strTime + ".mp4"; try {