From 633e76c1d533c3d9c257b92df7ebdfd36c9fd8a0 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 29 十二月 2016 18:42:50 +0800
Subject: [PATCH] unify log
---
RtspFace/PL_H264Encoder.cpp | 186 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 152 insertions(+), 34 deletions(-)
diff --git a/RtspFace/PL_H264Encoder.cpp b/RtspFace/PL_H264Encoder.cpp
index 9fc0a0b..7068b79 100644
--- a/RtspFace/PL_H264Encoder.cpp
+++ b/RtspFace/PL_H264Encoder.cpp
@@ -1,11 +1,15 @@
#include "PL_H264Encoder.h"
+#include "MaterialBuffer.h"
extern "C"
{
#include <libavcodec/avcodec.h>
#include <libavutil/frame.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/opt.h>
#include <libavformat/avformat.h>
- #include "libavutil/imgutils.h"
+
+ #include <libyuv.h>
}
struct H264Encoder_Internal
@@ -16,15 +20,18 @@
bool payError;
bool ffmpegInited;
size_t frameCount;
+ MB_Frame lastFrame;
AVCodecContext* pAVCodecContext;
AVFrame* pAVFrame;//#todo delete
+ AVStream* pAVStream;
+ AVFormatContext* pAVFormatContext;
H264Encoder_Internal() :
buffSize(0), buffSizeMax(sizeof(buffer)),
payError(true), ffmpegInited(false), frameCount(0),
- pAVCodecContext(nullptr), pAVFrame(nullptr)
-
+ pAVCodecContext(nullptr), pAVFrame(nullptr), pAVStream(nullptr), pAVFormatContext(nullptr),
+ lastFrame()
{
}
@@ -39,8 +46,13 @@
ffmpegInited = false;
frameCount = 0;
+ MB_Frame _lastFrame;
+ lastFrame = _lastFrame;
+
pAVCodecContext = nullptr;
pAVFrame = nullptr;
+ pAVStream = nullptr;
+ pAVFormatContext = nullptr;
}
};
@@ -88,14 +100,18 @@
in->pAVCodecContext = avcodec_alloc_context3(avCodec);
- in->pAVCodecContext->bit_rate = 3*1024*1024*8; // 3MB
- in->pAVCodecContext->width = 1920;
- in->pAVCodecContext->height = 1080;//#todo from config
+ in->pAVCodecContext->bit_rate = 1*1024*1024*8; // 3MB
+ in->pAVCodecContext->width = 800;//#todo test
+ in->pAVCodecContext->height = 600;//#todo from config
in->pAVCodecContext->time_base.num=1;
in->pAVCodecContext->time_base.den=25;
- in->pAVCodecContext->gop_size = 20;
+ in->pAVCodecContext->gop_size = 25;
in->pAVCodecContext->max_b_frames = 0;
+ //in->pAVCodecContext->profile = FF_PROFILE_H264_MAIN;
in->pAVCodecContext->pix_fmt = AV_PIX_FMT_YUV420P;
+
+ av_opt_set(in->pAVCodecContext->priv_data, "preset", "superfast", 0);
+ //av_opt_set(in->pAVCodecContext->priv_data, "tune", "zerolatency", 0);
if(avcodec_open2(in->pAVCodecContext, avCodec, NULL) >= 0)
{
@@ -119,32 +135,86 @@
return false;
}
+ //int ret = avformat_alloc_output_context2(&(in->pAVFormatContext), NULL, "avi", "");
+ //if (ret < 0 || in->pAVFormatContext == nullptr)
+ //{
+ // printf("avformat_alloc_output_context2 error\n");
+ // return false;
+ //}
+ //
+ //in->pAVStream = avformat_new_stream(in->pAVFormatContext, avCodec);
+ //if (in->pAVStream == nullptr)
+ //{
+ // printf("avformat_new_stream error\n");
+ // return false;
+ //}
+ //in->pAVStream->id = in->pAVFormatContext->nb_streams-1;
+
return true;
}
+#define SUBSAMPLE(v, a) ((((v) + (a) - 1)) / (a))
+
void copyAVFrame(AVFrame* dest, AVFrame* src)
{
- int height = dest->height;
- int width = dest->width;
+int src_width = src->width;
+int src_height = src->height;
+int dst_width = dest->width;
+int dst_height = dest->height;
+printf("I420Scale sw=%d, sh=%d, dw=%d, dh=%d\n", src_width,src_height,dst_width, dst_height);
+
+libyuv::I420Scale(src->data[0], src_width,
+ src->data[1], SUBSAMPLE(src_width, 2),
+ src->data[2], SUBSAMPLE(src_width, 2),
+ src_width, src_height,
+ dest->data[0], dst_width,
+ dest->data[1], SUBSAMPLE(dst_width, 2),
+ dest->data[2], SUBSAMPLE(dst_width, 2),
+ dst_width, dst_height,
+ libyuv::kFilterNone );
- memcpy(dest->data[0], src->data[0], height * width); // Y
- memcpy(dest->data[1], src->data[1], height * width / 4); // U
- memcpy(dest->data[2], src->data[2], height * width / 4); // V
+ //#test
+ //static size_t f=0;
+ //char fname[50];
+ //sprintf(fname, "%u.yuv420", ++f);
+ //FILE * pFile = fopen (fname,"wb");
+ //fwrite (dest->data[0] , sizeof(char), dst_width * dst_height, pFile);
+ //fwrite (dest->data[1] , sizeof(char), dst_width * dst_height / 4, pFile);
+ //fwrite (dest->data[2] , sizeof(char), dst_width * dst_height / 4, pFile);
+ //fclose(pFile);
+
+ //dest->data[0] = src->data[0];
+ //dest->data[1] = src->data[1];
+ //dest->data[2] = src->data[2];
+
+ //int height = dest->height;
+ //int width = dest->width;
+ //
+ //memcpy(dest->data[0], src->data[0], height * width); // Y
+ //memcpy(dest->data[1], src->data[1], height * width / 4); // U
+ //memcpy(dest->data[2], src->data[2], height * width / 4); // V
}
-bool encodeH264(H264Encoder_Internal* in, AVFrame* pAVFrame, size_t buffSize)
+bool encodeH264(H264Encoder_Internal* in, AVFrame* pAVFrame, timeval pts)
{
in->buffSize = 0;
- in->frameCount++;
copyAVFrame(in->pAVFrame, pAVFrame);
- in->pAVFrame->pts = in->frameCount;
-
+
+ //in->pAVFrame->pts = (1.0 / 25) * 90000 * in->frameCount;
+ //in->pAVFrame->pts = time(nullptr);
+ //in->pAVFrame->pts = (pts.tv_sec * 1000 * 1000 + pts.tv_usec) / 90000 + in->frameCount;
+ //in->pAVFrame->pts = (pts.tv_sec * 1000 * 1000 + pts.tv_usec) / 90000 + ((1.0 / 25) * 90000 * in->frameCount);
+ in->pAVFrame->pts = (pts.tv_sec * 1000 * 1000 + pts.tv_usec) / 90000;
+ //in->pAVFrame->pts = pAVFrame->pkt_pts;
+ //in->pAVFrame->pts = (1.0 / 25) * 90000 * in->frameCount;
+
AVPacket pAVPacket = {0};
av_init_packet(&pAVPacket);
-
+
// encode the image
int gotPacket = 0;
+
int ret = avcodec_encode_video2(in->pAVCodecContext, &pAVPacket, in->pAVFrame, &gotPacket);
if (ret < 0)
{
@@ -154,14 +224,15 @@
if (gotPacket > 0)
{
- printf("Succeed to encode (1) frame=%d, size=%d\n", in->pAVFrame->pts, pAVPacket.size);
- memcpy(in->buffer + in->buffSize, pAVPacket.data, pAVPacket.size);
- in->buffSize += pAVPacket.size;
+ in->frameCount++;
+ printf("Succeed to encode (1) frame=%d, size=%d\n", in->frameCount, pAVPacket.size);
+ memcpy(in->buffer, pAVPacket.data, pAVPacket.size);
+ in->buffSize = pAVPacket.size;
av_free_packet(&pAVPacket);
}
//#todo finit
- //Flush Encoder
+ //Flush Encoder, when stop encoder
//while (gotPacket > 0)
//{
// ret = avcodec_encode_video2(in->pAVCodecContext, &pAVPacket, NULL, &gotPacket);
@@ -172,23 +243,35 @@
// }
// if (gotPacket > 0)
// {
- // printf("Succeed to encode (2) frame=%d, size=%d\n", in->pAVFrame->pts, pAVPacket.size);
+ // printf("Succeed to encode (2) frame=%d, size=%d\n", in->frameCount, pAVPacket.size);
// memcpy(in->buffer + in->buffSize, pAVPacket.data, pAVPacket.size);
// in->buffSize += pAVPacket.size;
// av_free_packet(&pAVPacket);
// }
- //}
+ //}
+
//#test
- if (in->buffSize > 0)
- {
- static FILE * pFile = fopen("out.h264","wba+");
- fwrite (in->buffer , sizeof(char), in->buffSize, pFile);
- fflush(pFile);
- }
-
+ //if (in->buffSize > 0)
+ //{
+ // static FILE * pFile = fopen("out.h264","wba+");
+ // fwrite (in->buffer , sizeof(char), in->buffSize, pFile);
+ // fflush(pFile);
+ //}
+
in->payError = (in->buffSize == 0);
return !(in->payError);
+}
+
+bool encodeH264(H264Encoder_Internal* in, uint8_t* buffer, timeval pts)
+{
+ AVFrame avFrame;
+ avFrame.width = 1920;//#todo
+ avFrame.height = 1080;
+ avFrame.data[0] = buffer;
+ avFrame.data[1] = buffer + 1920*1080;
+ avFrame.data[2] = buffer + 1920*1080 + 1920*1080/4;
+ return encodeH264(in, &avFrame, pts);
}
bool PL_H264Encoder::pay(const PipeMaterial& pm)
@@ -202,15 +285,49 @@
bool ret = initH264EncoderEnv(in);
if (!ret)
{
- printf("initH264EncoderEnv error");
+ printf("initH264EncoderEnv error\n");
return false;
}
else
in->ffmpegInited = true;
}
- bool ret = encodeH264(in, (AVFrame*)pm.buffer, pm.buffSize);
+ if (pm.type != PipeMaterial::PMT_FRAME)
+ {
+ printf("PL_H264Encoder::pay only support PMT_FRAME\n");
+ return false;
+ }
+
+ if (pm.buffer == nullptr)
+ return false;
+
+ MB_Frame* frame = (MB_Frame*)pm.buffer;
+
+ bool ret;
+
+ if (frame->type == MB_Frame::MBFT_PTR_AVFRAME)
+ ret = encodeH264(in, (AVFrame*)(frame->buffer), frame->pts);
+ else if (frame->type == MB_Frame::MBFT_YUV420)
+ ret = encodeH264(in, (uint8_t*)(frame->buffer), frame->pts);
+ else
+ {
+ printf("PL_H264Encoder::pay only support MBFT_PTR_AVFRAME / MBFT_YUV420\n");
+ in->payError = true;
+ return false;
+ }
+
in->payError = !ret;
+
+ if (ret)
+ {
+ in->lastFrame.type = MB_Frame::MBFT_H264_NALU;
+ in->lastFrame.buffer = in->buffer;
+ in->lastFrame.buffSize = in->buffSize;
+ in->lastFrame.width = frame->width;
+ in->lastFrame.height = frame->height;
+ in->lastFrame.pts = frame->pts;
+ }
+
return ret;
}
@@ -220,8 +337,9 @@
if (!in->payError)
{
- pm.buffer = in->buffer;
- pm.buffSize = in->buffSize;
+ pm.type = PipeMaterial::PMT_FRAME;
+ pm.buffer = &(in->lastFrame);
+ pm.buffSize = 0;
}
pm.former = this;
return !in->payError;
--
Gitblit v1.8.0