提交 3101f87f authored 作者: tobyfan1980's avatar tobyfan1980

vgw: refine logger in packet dispatch

上级 39bf8d53
......@@ -155,7 +155,7 @@ AVFormatContext *rtsp_init(string rtsp_url, int codec, int height, int width, in
if(rc) *rc = ret;
return nullptr;
}
spdlog::info("success connect to darwin {}", rtsp_url);
spdlog::info("succeed to connect darwin {}", rtsp_url);
av_dict_free(&pOptsRemux);
......@@ -197,7 +197,7 @@ int write_packet(packet_processor_t *processor, char *data, int len)
ret = av_write_frame(ctx, &pkt);
if (ret < 0) {
spdlog::error("Error muxing packet: {}", av_err2str(ret));
spdlog::error("Error muxing packet in av_write_frame: {}", av_err2str(ret));
}
//av_packet_unref(&pkt);
......@@ -219,7 +219,7 @@ void dispatch(string sn, zmq_msg_t *msg)
pkt->meta.crc = 0;
auto crc_ = crc16((unsigned char*)pkt, sizeof(evpacket_t));
if(crc != crc_) {
spdlog::error("invalid crc: {}", pkt->meta.packet_id);
spdlog::error("[{}] invalid crc. packet id: {}", sn, pkt->meta.packet_id);
return;
}
/// we don't need lock it
......@@ -229,7 +229,7 @@ void dispatch(string sn, zmq_msg_t *msg)
int rc = 0;
processor->pAvCtx = rtsp_init(darwinUrl + sn, 0, pkt->vpara.res.height, pkt->vpara.res.width, &rc);
if(processor->pAvCtx == nullptr) {
spdlog::error("failed to connect to darwin {}: {}", darwinUrl, av_err2str(rc));
spdlog::error("[{}] failed to connect darwin {}. err: {}", sn, darwinUrl, av_err2str(rc));
return;
}
else {
......@@ -239,7 +239,7 @@ void dispatch(string sn, zmq_msg_t *msg)
ret = write_packet(processor, (char*)zmq_msg_data(msg) + sizeof(evpacket_t), zmq_msg_size(msg) - sizeof(evpacket_t) );
if(ret < 0) {
spdlog::error("failed to send packet!");
spdlog::error("[{}] failed to send packet!", sn);
clean_av_resources(processor);
}
}
......@@ -248,7 +248,7 @@ void * fn_worker(void *pArg)
{
int ret = 0;
packet_processor_t *processor = (packet_processor_t*)pArg;
spdlog::info("worker {} started", processor->sn);
spdlog::info("[{}] worker started", processor->sn);
zmq_msg_t *msg;
while(1) {
msg = nullptr;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论