From e80ef6acf886a67fa9136fdc8312971cef91b534 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 24 九月 2019 16:41:55 +0800
Subject: [PATCH] 增加addCamera的返回值校验
---
csrc/wrapper.hpp | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 3b4aa7b..a6ebe55 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -1,10 +1,6 @@
#ifndef _cffmpeg_wrapper_hpp_
#define _cffmpeg_wrapper_hpp_
-extern "C"{
-#include <libavcodec/avcodec.h>
-}
-
#include <stdint.h>
#include <string>
@@ -16,11 +12,11 @@
#include "common/callback.hpp"
+
namespace ffwrapper{
class FormatIn;
-
- class VideoProp;
class CodedData;
+ class VideoProp;
}
namespace cffmpeg_wrap{
@@ -80,7 +76,7 @@
std::function<void(ffwrapper::FormatIn*)> fn_rec_lazy_;
};
- uint8_t *DecodeJPEG(const char *file, int *w, int *h);
+ uint8_t* Decode(const char *file, const int gb, int *w, int *h);
void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
void DestroyEncoder(void *h);
int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
--
Gitblit v1.8.0