openharmony/multimedia_av_codec
1
0
Fork 0
mirror of https://gitee.com/openharmony/multimedia_av_codec synced 2024-10-07 22:23:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

清理告警

Browse Source 
Signed-off-by: mediaTest <wangyang453@huawei.com>
This commit is contained in:
mediaTest 2024-01-02 09:35:47 +08:00
parent 7b1a6616c7
commit 1256c58240
5 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/BUILD.gn
View File

@ -72,9 +72,9 @@ group("av_codec_module_test") {
"moduletest/demuxer:demuxer_native_module_test",
"moduletest/muxer:muxer_native_module_test",
"moduletest/vcodec/encoder:encoder_native_module_test",
"moduletest/vcodec/hdrcodec:hdrcodec_native_module_test",
"moduletest/vcodec/hwdecoder:hwdecoder_native_module_test",
"moduletest/vcodec/swdecoder:swdecoder_native_module_test",
"moduletest/vcodec/hdrcodec:hdrcodec_native_module_test",
]
}
}

3
test/moduletest/vcodec/hdrcodec/BUILD.gn
View File

@ -67,7 +67,6 @@ ohos_unittest("hdrcodec_native_module_test") {
"$MEDIA_ROOT_DIR/interfaces/kits/c:native_media_codecbase",
"$MEDIA_ROOT_DIR/interfaces/kits/c:native_media_vdec",
"$MEDIA_ROOT_DIR/interfaces/kits/c:native_media_venc",
"$MEDIA_ROOT_DIR/interfaces/kits/c:native_media_core",
]
external_deps = [
"c_utils:utils",
@ -78,7 +77,7 @@ ohos_unittest("hdrcodec_native_module_test") {
"hilog:libhilog",
"ipc:ipc_core",
"window_manager:libwm",
"histreamer:media_foundation",
"media_foundation:media_foundation",
]
resource_config_file =
"$MEDIA_ROOT_DIR/test/moduletest/resources/ohos_test.xml"

2
test/moduletest/vcodec/hdrcodec/include/hdrcodec_ndk_sample.h
View File

@ -65,7 +65,7 @@ public:
void FlushBuffer();
void SwitchInputFile();
int32_t ReConfigure();
void RepeatCall();
const char *INP_DIR = "/data/test/media/1920_1080_10_30Mb.h264";
bool needEncode = false;
bool needTransCode = false;

3
test/moduletest/vcodec/hdrcodec/src/func_test.cpp
View File

@ -43,17 +43,14 @@ public:
void SetUp(void);
// TearDown: Called after each test cases
void TearDown(void);
};
void HDRFuncNdkTest::SetUpTestCase()
{
}
void HDRFuncNdkTest::TearDownTestCase() {}
void HDRFuncNdkTest::SetUp()
{
}
void HDRFuncNdkTest::TearDown()
{

88
test/moduletest/vcodec/hdrcodec/src/hdrcodec_ndk_sample.cpp
View File

@ -59,9 +59,9 @@ void VdecOutputDataReady(OH_AVCodec *codec, uint32_t index, OH_AVMemory *data, O
OH_VideoDecoder_RenderOutputData(codec, index);
if (attr->flags & AVCODEC_BUFFER_FLAGS_EOS) {
OH_VideoEncoder_NotifyEndOfStream(sample->venc_);
}
else
} else {
sample->frameCountDec++;
}
}
void VdecError(OH_AVCodec *codec, int32_t errorCode, void *userData)
@ -81,7 +81,10 @@ static void VencFormatChanged(OH_AVCodec *codec, OH_AVFormat *format, void *user
static void VencInputDataReady(OH_AVCodec *codec, uint32_t index, OH_AVMemory *data, void *userData)
{
(void)codec;
(void)index;
(void)data;
(void)userData;
}
static void VencOutputDataReady(OH_AVCodec *codec, uint32_t index, OH_AVMemory *data, OH_AVCodecBufferAttr *attr,
@ -92,9 +95,9 @@ static void VencOutputDataReady(OH_AVCodec *codec, uint32_t index, OH_AVMemory *
if (attr->flags & AVCODEC_BUFFER_FLAGS_EOS) {
g_isRunning.store(false);
g_cv.notify_all();
}
else
} else {
sample->frameCountEnc++;
}
}
static void clearIntqueue(std::queue<uint32_t> &q)
@ -153,7 +156,6 @@ static int32_t SendData(OH_AVCodec *codec, uint32_t index, OH_AVMemory *data)
HDRCodecNdkSample::~HDRCodecNdkSample()
{
}
int32_t HDRCodecNdkSample::CreateCodec()
@ -168,7 +170,7 @@ int32_t HDRCodecNdkSample::CreateCodec()
}
venc_ = OH_VideoEncoder_CreateByMime(MIME_TYPE.c_str());
if (venc_ == nullptr){
if (venc_ == nullptr) {
return AV_ERR_UNKNOWN;
}
return AV_ERR_OK;
@ -184,38 +186,43 @@ void HDRCodecNdkSample::FlushBuffer()
decInLock.unlock();
}
void HDRCodecNdkSample::RepeatCall()
{
if (REPEAT_START_FLUSH_BEFORE_EOS > 0) {
REPEAT_START_FLUSH_BEFORE_EOS--;
OH_VideoDecoder_Flush(vdec_);
OH_VideoEncoder_Flush(venc_);
FlushBuffer();
OH_VideoDecoder_Start(vdec_);
OH_VideoEncoder_Start(venc_);
}
if (REPEAT_START_STOP_BEFORE_EOS > 0) {
REPEAT_START_STOP_BEFORE_EOS--;
OH_VideoDecoder_Stop(vdec_);
OH_VideoEncoder_Stop(venc_);
FlushBuffer();
OH_VideoDecoder_Start(vdec_);
OH_VideoEncoder_Start(venc_);
}
if (REPEAT_START_FLUSH_STOP_BEFORE_EOS > 0) {
REPEAT_START_FLUSH_STOP_BEFORE_EOS--;
OH_VideoDecoder_Stop(vdec_);
OH_VideoEncoder_Stop(venc_);
OH_VideoDecoder_Flush(vdec_);
OH_VideoEncoder_Flush(venc_);
FlushBuffer();
OH_VideoDecoder_Start(vdec_);
OH_VideoEncoder_Start(venc_);
}
}
void HDRCodecNdkSample::InputFunc()
{
while (true) {
if (!g_isRunning.load()) {
break;
}
if (REPEAT_START_FLUSH_BEFORE_EOS > 0) {
REPEAT_START_FLUSH_BEFORE_EOS--;
OH_VideoDecoder_Flush(vdec_);
OH_VideoEncoder_Flush(venc_);
FlushBuffer();
OH_VideoDecoder_Start(vdec_);
OH_VideoEncoder_Start(venc_);
}
if (REPEAT_START_STOP_BEFORE_EOS > 0) {
REPEAT_START_STOP_BEFORE_EOS--;
OH_VideoDecoder_Stop(vdec_);
OH_VideoEncoder_Stop(venc_);
FlushBuffer();
OH_VideoDecoder_Start(vdec_);
OH_VideoEncoder_Start(venc_);
}
if (REPEAT_START_FLUSH_STOP_BEFORE_EOS > 0) {
REPEAT_START_FLUSH_STOP_BEFORE_EOS--;
OH_VideoDecoder_Stop(vdec_);
OH_VideoEncoder_Stop(venc_);
OH_VideoDecoder_Flush(vdec_);
OH_VideoEncoder_Flush(venc_);
FlushBuffer();
OH_VideoDecoder_Start(vdec_);
OH_VideoEncoder_Start(venc_);
}
RepeatCall();
uint32_t index;
unique_lock<mutex> lock(decSignal->inMutex_);
decSignal->inCond_.wait(lock, [this]() {
@ -250,21 +257,21 @@ int32_t HDRCodecNdkSample::Configure()
(void)OH_AVFormat_SetIntValue(format, OH_MD_KEY_PIXEL_FORMAT, AV_PIXEL_FORMAT_NV12);
(void)OH_AVFormat_SetDoubleValue(format, OH_MD_KEY_FRAME_RATE, DEFAULT_FRAME_RATE);
int ret = OH_VideoDecoder_Configure(vdec_, format);
if (ret != AV_ERR_OK){
if (ret != AV_ERR_OK) {
return ret;
}
(void)OH_AVFormat_SetIntValue(format, OH_MD_KEY_PROFILE, DEFAULT_PROFILE);
ret = OH_VideoEncoder_Configure(venc_, format);
if (ret != AV_ERR_OK){
if (ret != AV_ERR_OK) {
return ret;
}
OHNativeWindow *window = nullptr;
ret = OH_VideoEncoder_GetSurface(venc_, &window);
if (ret != AV_ERR_OK){
if (ret != AV_ERR_OK) {
return ret;
}
ret = OH_VideoDecoder_SetSurface(vdec_, window);
if (ret != AV_ERR_OK){
if (ret != AV_ERR_OK) {
return ret;
}
encCb_.onError = VencError;
@ -272,7 +279,7 @@ int32_t HDRCodecNdkSample::Configure()
encCb_.onNeedInputData = VencInputDataReady;
encCb_.onNeedOutputData = VencOutputDataReady;
ret = OH_VideoEncoder_SetCallback(venc_, encCb_, this);
if (ret != AV_ERR_OK){
if (ret != AV_ERR_OK) {
return ret;
}
@ -320,7 +327,8 @@ int32_t HDRCodecNdkSample::ReConfigure()
return ret;
}
int32_t HDRCodecNdkSample::Start(){
int32_t HDRCodecNdkSample::Start()
{
inFile_ = make_unique<ifstream>();
inFile_->open(INP_DIR, ios::in | ios::binary);
if (!inFile_->is_open()) {
@ -372,7 +380,7 @@ void HDRCodecNdkSample::WaitForEos()
{
std::mutex mtx;
unique_lock<mutex> lock(mtx);
g_cv.wait(lock, [](){
g_cv.wait(lock, []() {
return !(g_isRunning.load());
});
inputLoop_->join();