From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
RtspFace/PL_H264Encoder.cpp | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/RtspFace/PL_H264Encoder.cpp b/RtspFace/PL_H264Encoder.cpp
index a4d3089..68c502c 100644
--- a/RtspFace/PL_H264Encoder.cpp
+++ b/RtspFace/PL_H264Encoder.cpp
@@ -18,8 +18,8 @@
resetPTS(false),
bytesBufferImageWidth(0), bytesBufferImageHeight(0),
avc_bit_rate(1*1024*1024*8), //1Mbit
- avc_fps(25), avc_gop(25), avc_max_b_frames(0), avc_profile(FF_PROFILE_H264_MAIN),
- av_opt_preset("superfast"), av_opt_tune("")
+ avc_fps(25), avc_gop(25), avc_max_b_frames(0), avc_profile(FF_PROFILE_H264_BASELINE),
+ av_opt_preset("superfast"), av_opt_tune(""), avc_profile_str("")
{
// av_opt_tune: zerolatency
}
@@ -122,7 +122,7 @@
if (!avCodec)
{
- LOG_ERROR << "codec not found!";
+ LOG_ERROR << "codec not found!" << std::endl;
return false;
}
@@ -135,13 +135,16 @@
in->pAVCodecContext->time_base.den = in->config.avc_fps;
in->pAVCodecContext->gop_size = in->config.avc_gop;
in->pAVCodecContext->max_b_frames = in->config.avc_max_b_frames;
- in->pAVCodecContext->profile = in->config.avc_profile;
in->pAVCodecContext->pix_fmt = AV_PIX_FMT_YUV420P;
if (!in->config.av_opt_preset.empty())
av_opt_set(in->pAVCodecContext->priv_data, "preset", in->config.av_opt_preset.c_str(), 0);
if (!in->config.av_opt_tune.empty())
av_opt_set(in->pAVCodecContext->priv_data, "tune", in->config.av_opt_tune.c_str(), 0);
+ if (!in->config.avc_profile_str.empty())
+ av_opt_set(in->pAVCodecContext->priv_data, "profile", in->config.avc_profile_str.c_str(), 0);
+ else
+ in->pAVCodecContext->profile = in->config.avc_profile;
if(avcodec_open2(in->pAVCodecContext, avCodec, NULL) >= 0)
{
@@ -156,13 +159,13 @@
in->pAVCodecContext->pix_fmt, 16);
if (ret < 0)
{
- LOG_ERROR << "av_image_alloc error";
+ LOG_ERROR << "av_image_alloc error" << std::endl;
return false;
}
}
else
{
- LOG_ERROR << "avcodec_open2 error";
+ LOG_ERROR << "avcodec_open2 error" << std::endl;
return false;
}
@@ -233,7 +236,7 @@
int ret = avcodec_encode_video2(in->pAVCodecContext, &pAVPacket, in->pAVFrame, &gotPacket);
if (ret < 0)
{
- LOG_WARN << "avcodec_encode_video2 (1) error=" << ret;
+ LOG_WARN << "avcodec_encode_video2 (1) error=" << ret << std::endl;
return false;
}
@@ -327,7 +330,7 @@
bool ret = initH264EncoderEnv(in);
if (!ret)
{
- LOG_ERROR << "initH264EncoderEnv error";
+ LOG_ERROR << "initH264EncoderEnv error" << std::endl;
return false;
}
else
@@ -336,7 +339,7 @@
if (pm.type != PipeMaterial::PMT_FRAME)
{
- LOG_ERROR << "Only support PMT_FRAME";
+ LOG_ERROR << "Only support PMT_FRAME" << std::endl;
return false;
}
@@ -353,7 +356,7 @@
ret = encodeH264(in, (uint8_t*)(frame->buffer), frame->pts);
else
{
- LOG_ERROR << "Only support MBFT_PTR_AVFRAME / MBFT_YUV420";
+ LOG_ERROR << "Only support MBFT_PTR_AVFRAME / MBFT_YUV420" << std::endl;
in->payError = true;
return false;
}
--
Gitblit v1.8.0