From 21d2e4cd4e3ec5ec6f7f32ed5426b069a303adfb Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 10 一月 2017 18:02:07 +0800
Subject: [PATCH]
---
RtspFace/PL_AVFrameBGRA.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/RtspFace/PL_AVFrameBGRA.cpp b/RtspFace/PL_AVFrameBGRA.cpp
index 4b0ba9e..0826c5b 100644
--- a/RtspFace/PL_AVFrameBGRA.cpp
+++ b/RtspFace/PL_AVFrameBGRA.cpp
@@ -7,13 +7,13 @@
#include <libavcodec/avcodec.h>
#include <libavutil/frame.h>
#include <libavformat/avformat.h>
-
- #include <libyuv.h>
}
+
+#include <libyuv.h>
struct PL_AVFrameBGRA_Internal
{
- uint8_t buffer[1920*1080*4];//#todo
+ uint8_t buffer[1920*1080*4];//#todo from config
size_t buffSize;
size_t buffSizeMax;
MB_Frame lastFrame;
@@ -69,15 +69,15 @@
}
-#define SUBSAMPLE(v, a) ((((v) + (a) - 1)) / (a))
-
bool PL_AVFrameBGRA::pay(const PipeMaterial& pm)
{
+#define SUBSAMPLE(v, a) ((((v) + (a) - 1)) / (a))
+
PL_AVFrameBGRA_Internal* in = (PL_AVFrameBGRA_Internal*)internal;
if (pm.type != PipeMaterial::PMT_FRAME)
{
- LOG(ERROR) << "PL_AVFrameBGRA::pay only support PMT_FRAME";
+ LOG_ERROR << "Only support PMT_FRAME";
return false;
}
@@ -87,7 +87,7 @@
MB_Frame* frame = (MB_Frame*)pm.buffer;
if (frame->type != MB_Frame::MBFT_PTR_AVFRAME)
{
- LOG(ERROR) << "PL_AVFrameBGRA::pay only support MBFT_PTR_AVFRAME";
+ LOG_ERROR << "Only support MBFT_PTR_AVFRAME";
return false;
}
--
Gitblit v1.8.0