Star47
457
代码
代码
Issues81
Pull Requests48
流水线
项目讨论
Wiki
分析
Star47
457
已合并
修改wmv3解码器moduleTest，以及修改wmv3分辨率范围 #6774
taihang_208创建于 2025年10月25日
修改wmv3解码器moduleTest，以及修改wmv3分辨率范围 #6774
已合并
taihang_208创建于 2025年10月25日
从taihang_208/multimedia_av_codecwwb_wmv3_moduletest_api_resolution_modeified合入到openharmony/multimedia_av_codecmaster
共 11 个文件变更+1845-455
Mservices/engine/codec/video/fcodec/fcodec_capability_register.cpp+19-0
@@ -46,6 +46,15 @@ constexpr int32_t VC1_BLOCKPERSEC_SIZE = 491520;
46constexpr int32_t MSVIDEO1_MIN_WIDTH_SIZE = 4;46constexpr int32_t MSVIDEO1_MIN_WIDTH_SIZE = 4;
47constexpr int32_t MSVIDEO1_MIN_HEIGHT_SIZE = 4;47constexpr int32_t MSVIDEO1_MIN_HEIGHT_SIZE = 4;
48constexpr int32_t MSVIDEO1_BLOCKPERSEC_SIZE = 3932160;48constexpr int32_t MSVIDEO1_BLOCKPERSEC_SIZE = 3932160;
49+constexpr int32_t WMV3_ALIGNMENT_SIZE = 2;
50+constexpr int32_t WMV3_MAX_FRAMERATE_SIZE = 30;
51+constexpr int32_t WMV3_MIN_WIDTH_SIZE = 16;
52+constexpr int32_t WMV3_MAX_WIDTH_SIZE = 1920;
53+constexpr int32_t WMV3_MIN_HEIGHT_SIZE = 16;
54+constexpr int32_t WMV3_MAX_HEIGHT_SIZE = 1080;
55+constexpr int32_t WMV3_BITRATE_MAX_SIZE = 20000000;
56+constexpr int32_t WMV3_MAX_BLOCKPERFRAME_SIZE = 8192;
57+constexpr int32_t WMV3_MAX_BLOCKPERSEC_SIZE = 245760;
49} // namespace58} // namespace
50using namespace OHOS::Media;59using namespace OHOS::Media;
51 60 
@@ -275,6 +284,16 @@ void GetWmv3CapProf(std::vector<CapabilityData> &capaArray)
275{284{
276 if (!capaArray.empty()) {285 if (!capaArray.empty()) {
277 CapabilityData& capsData = capaArray.back();286 CapabilityData& capsData = capaArray.back();
287+ capsData.alignment.width = WMV3_ALIGNMENT_SIZE;
288+ capsData.alignment.height = WMV3_ALIGNMENT_SIZE;
289+ capsData.width.minVal = WMV3_MIN_WIDTH_SIZE;
290+ capsData.height.minVal = WMV3_MIN_HEIGHT_SIZE;
291+ capsData.width.maxVal = WMV3_MAX_WIDTH_SIZE;
292+ capsData.height.maxVal = WMV3_MAX_HEIGHT_SIZE;
293+ capsData.bitrate.maxVal = WMV3_BITRATE_MAX_SIZE;
294+ capsData.blockPerFrame.maxVal = WMV3_MAX_BLOCKPERFRAME_SIZE;
295+ capsData.blockPerSecond.maxVal = WMV3_MAX_BLOCKPERSEC_SIZE;
296+ capsData.frameRate.maxVal = WMV3_MAX_FRAMERATE_SIZE;
278 capsData.profiles = {static_cast<int32_t>(WMV3_PROFILE_SIMPLE), static_cast<int32_t>(WMV3_PROFILE_MAIN)};297 capsData.profiles = {static_cast<int32_t>(WMV3_PROFILE_SIMPLE), static_cast<int32_t>(WMV3_PROFILE_MAIN)};
279 std::vector<int32_t> levels_s;298 std::vector<int32_t> levels_s;
280 std::vector<int32_t> levels_m;299 std::vector<int32_t> levels_m;
Mtest/unittest/resources/ohos_test.xml+1-1
@@ -284,7 +284,7 @@
284 <preparer>284 <preparer>
285 <option name="shell" value="mkdir -p /data/test/media"/>285 <option name="shell" value="mkdir -p /data/test/media"/>
286 <option name="push" value="video_res/352_288_10.wmv3 -> /data/test/media" src="res"/>286 <option name="push" value="video_res/352_288_10.wmv3 -> /data/test/media" src="res"/>
287- <option name="push" value="video_res/1280_720_24.hdr.wmv3 -> /data/test/media" src="res"/>287+ <option name="push" value="video_res/profile1_1280_720_24.wmv3 -> /data/test/media" src="res"/>
288 <option name="shell" value="restorecon /data/test/media"/>288 <option name="shell" value="restorecon /data/test/media"/>
289 </preparer>289 </preparer>
290 </target>290 </target>
Mtest/unittest/video_test/codeclist_test/caps_unit_test.cpp+12-12
@@ -1545,8 +1545,8 @@ HWTEST_F(CapsUnitTest, AVCaps_GetVideoWidthRangeForHeight_001, TestSize.Level1)
1545 EXPECT_NE(cap, nullptr);1545 EXPECT_NE(cap, nullptr);
1546 OH_AVRange range = {-1, -1};1546 OH_AVRange range = {-1, -1};
1547 EXPECT_EQ(OH_AVCapability_GetVideoWidthRangeForHeight(cap, DEFAULT_HEIGHT, &range), AV_ERR_OK);1547 EXPECT_EQ(OH_AVCapability_GetVideoWidthRangeForHeight(cap, DEFAULT_HEIGHT, &range), AV_ERR_OK);
1548- EXPECT_EQ(range.minVal, 2);1548+ EXPECT_EQ(16, range.minVal);
1549- EXPECT_EQ(range.maxVal, 4096);1549+ EXPECT_EQ(1920, range.maxVal);
1550}1550}
1551 1551 
1552/**1552/**
@@ -1561,8 +1561,8 @@ HWTEST_F(CapsUnitTest, AVCaps_GetVideoHeightRangeForWidth_001, TestSize.Level1)
1561 EXPECT_NE(cap, nullptr);1561 EXPECT_NE(cap, nullptr);
1562 OH_AVRange range = {-1, -1};1562 OH_AVRange range = {-1, -1};
1563 EXPECT_EQ(OH_AVCapability_GetVideoHeightRangeForWidth(cap, DEFAULT_WIDTH, &range), AV_ERR_OK);1563 EXPECT_EQ(OH_AVCapability_GetVideoHeightRangeForWidth(cap, DEFAULT_WIDTH, &range), AV_ERR_OK);
1564- EXPECT_EQ(range.minVal, 2);1564+ EXPECT_EQ(16, range.minVal);
1565- EXPECT_EQ(range.maxVal, 4096);1565+ EXPECT_EQ(1920, range.maxVal);
1566}1566}
1567 1567 
1568/**1568/**
@@ -1577,8 +1577,8 @@ HWTEST_F(CapsUnitTest, AVCaps_GetVideoWidthRange_001, TestSize.Level1)
1577 EXPECT_NE(cap, nullptr);1577 EXPECT_NE(cap, nullptr);
1578 OH_AVRange range = {-1, -1};1578 OH_AVRange range = {-1, -1};
1579 EXPECT_EQ(OH_AVCapability_GetVideoWidthRange(cap, &range), AV_ERR_OK);1579 EXPECT_EQ(OH_AVCapability_GetVideoWidthRange(cap, &range), AV_ERR_OK);
1580- EXPECT_EQ(range.minVal, 2);1580+ EXPECT_EQ(16, range.minVal);
1581- EXPECT_EQ(range.maxVal, 4096);1581+ EXPECT_EQ(1920, range.maxVal);
1582}1582}
1583 1583 
1584/**1584/**
@@ -1593,8 +1593,8 @@ HWTEST_F(CapsUnitTest, AVCaps_GetVideoHeightRange_001, TestSize.Level1)
1593 EXPECT_NE(cap, nullptr);1593 EXPECT_NE(cap, nullptr);
1594 OH_AVRange range = {-1, -1};1594 OH_AVRange range = {-1, -1};
1595 EXPECT_EQ(OH_AVCapability_GetVideoHeightRange(cap, &range), AV_ERR_OK);1595 EXPECT_EQ(OH_AVCapability_GetVideoHeightRange(cap, &range), AV_ERR_OK);
1596- EXPECT_EQ(range.minVal, 2);1596+ EXPECT_EQ(16, range.minVal);
1597- EXPECT_EQ(range.maxVal, 4096);1597+ EXPECT_EQ(1920, range.maxVal);
1598}1598}
1599 1599 
1600/**1600/**
@@ -1679,8 +1679,8 @@ HWTEST_F(CapsUnitTest, AVCaps_GetVideoFrameRateRange_001, TestSize.Level1)
1679 EXPECT_NE(cap, nullptr);1679 EXPECT_NE(cap, nullptr);
1680 OH_AVRange range = {-1, -1};1680 OH_AVRange range = {-1, -1};
1681 EXPECT_EQ(OH_AVCapability_GetVideoFrameRateRange(cap, &range), AV_ERR_OK);1681 EXPECT_EQ(OH_AVCapability_GetVideoFrameRateRange(cap, &range), AV_ERR_OK);
1682- EXPECT_EQ(range.minVal, 0);1682+ EXPECT_EQ(0, range.minVal);
1683- EXPECT_EQ(range.maxVal, 60);1683+ EXPECT_EQ(30, range.maxVal);
1684}1684}
1685 1685 
1686/**1686/**
@@ -1695,8 +1695,8 @@ HWTEST_F(CapsUnitTest, AVCaps_GetVideoFrameRateRangeForSize_001, TestSize.Level1
1695 EXPECT_NE(cap, nullptr);1695 EXPECT_NE(cap, nullptr);
1696 OH_AVRange range = {-1, -1};1696 OH_AVRange range = {-1, -1};
1697 EXPECT_EQ(OH_AVCapability_GetVideoFrameRateRangeForSize(cap, DEFAULT_WIDTH, DEFAULT_HEIGHT, &range), AV_ERR_OK);;1697 EXPECT_EQ(OH_AVCapability_GetVideoFrameRateRangeForSize(cap, DEFAULT_WIDTH, DEFAULT_HEIGHT, &range), AV_ERR_OK);;
1698- EXPECT_EQ(range.minVal, 0);1698+ EXPECT_EQ(0, range.minVal);
1699- EXPECT_EQ(range.maxVal, 60);1699+ EXPECT_EQ(30, range.maxVal);
1700}1700}
1701 1701 
1702/**1702/**
Mtest/unittest/video_test/vcodec_framework_test/common/data_producer/avcc_reader/avcc_reader.cpp+11-11
@@ -230,7 +230,7 @@ const uint32_t ES_WMV3_NORMAL[] = {
230};230};
231const uint32_t ES_WMV3_NORMAL_LEN = sizeof(ES_WMV3_NORMAL) / sizeof(ES_WMV3_NORMAL[0]);231const uint32_t ES_WMV3_NORMAL_LEN = sizeof(ES_WMV3_NORMAL) / sizeof(ES_WMV3_NORMAL[0]);
232 232 
233-const uint32_t ES_WMV3_HDR[] = {233+const uint32_t ES_WMV3_MAIN[] = {
234 96567, 28373, 28624, 29924, 28891, 29772, 30359, 29766, 31042, 34215,234 96567, 28373, 28624, 29924, 28891, 29772, 30359, 29766, 31042, 34215,
235 30812, 33766, 32173, 23693, 29794, 29307, 31815, 31160, 32350, 32360,235 30812, 33766, 32173, 23693, 29794, 29307, 31815, 31160, 32350, 32360,
236 23243, 31439, 32176, 31647, 31064, 31641, 33174, 21929, 29088, 31025,236 23243, 31439, 32176, 31647, 31064, 31641, 33174, 21929, 29088, 31025,
@@ -239,7 +239,7 @@ const uint32_t ES_WMV3_HDR[] = {
239 28567, 29755, 31127, 29116, 51264, 31911, 31241, 28658, 30101, 30472,239 28567, 29755, 31127, 29116, 51264, 31911, 31241, 28658, 30101, 30472,
240 30589240 30589
241};241};
242-const uint32_t ES_WMV3_HDR_LEN = sizeof(ES_WMV3_HDR) / sizeof(ES_WMV3_HDR[0]);242+const uint32_t ES_WMV3_MAIN_LEN = sizeof(ES_WMV3_MAIN) / sizeof(ES_WMV3_MAIN[0]);
243 243 
244int32_t MpegReader::Init(const std::shared_ptr<MpegReaderInfo> &info)244int32_t MpegReader::Init(const std::shared_ptr<MpegReaderInfo> &info)
245{245{
@@ -1293,7 +1293,7 @@ int32_t Wmv3Reader::Init(const std::shared_ptr<Wmv3ReaderInfo> &info)
1293 UNITTEST_CHECK_AND_RETURN_RET_LOG(inputFile != nullptr && inputFile->is_open(),1293 UNITTEST_CHECK_AND_RETURN_RET_LOG(inputFile != nullptr && inputFile->is_open(),
1294 AV_ERR_INVALID_VAL, "Open input file failed");1294 AV_ERR_INVALID_VAL, "Open input file failed");
1295 wmv3UnitReader_= std::static_pointer_cast<Wmv3UnitReader>(std::make_shared<Wmv3MetaUnitReader>(1295 wmv3UnitReader_= std::static_pointer_cast<Wmv3UnitReader>(std::make_shared<Wmv3MetaUnitReader>(
1296- inputFile, info->isHdrStream));1296+ inputFile, info->isMainStream));
1297 UNITTEST_CHECK_AND_RETURN_RET_LOG(wmv3UnitReader_, AV_ERR_INVALID_VAL, "wmv3 unit reader create failed");1297 UNITTEST_CHECK_AND_RETURN_RET_LOG(wmv3UnitReader_, AV_ERR_INVALID_VAL, "wmv3 unit reader create failed");
1298 return AV_ERR_OK;1298 return AV_ERR_OK;
1299}1299}
@@ -1343,7 +1343,7 @@ int32_t Wmv3Reader::Wmv3MetaUnitReader::ReadWmv3Unit(uint8_t *bufferAddr, int32_
1343 UNITTEST_CHECK_AND_RETURN_RET_LOG(wmv3Unit_, AV_ERR_INVALID_VAL, "wmv3 unit buffer is nullptr");1343 UNITTEST_CHECK_AND_RETURN_RET_LOG(wmv3Unit_, AV_ERR_INVALID_VAL, "wmv3 unit buffer is nullptr");
1344 bufferSize = wmv3Unit_->size();1344 bufferSize = wmv3Unit_->size();
1345 memcpy_s(bufferAddr, bufferSize, wmv3Unit_->data(), bufferSize);1345 memcpy_s(bufferAddr, bufferSize, wmv3Unit_->data(), bufferSize);
1346- std::cout << "wuwenbin bufferSize = " << (bufferSize) << std::endl;1346+ std::cout << "bufferSize = " << (bufferSize) << std::endl;
1347 1347 
1348 if (!IsEOF()) {1348 if (!IsEOF()) {
1349 isEosFrame = false;1349 isEosFrame = false;
@@ -1398,10 +1398,10 @@ void Msvideo1Reader::Msvideo1MetaUnitReader::PrereadMsvideo1Unit()
1398 frameIndex_++;1398 frameIndex_++;
1399}1399}
1400 1400 
1401-Wmv3Reader::Wmv3MetaUnitReader::Wmv3MetaUnitReader(std::shared_ptr<std::ifstream> inputFile, bool isHdrStream)1401+Wmv3Reader::Wmv3MetaUnitReader::Wmv3MetaUnitReader(std::shared_ptr<std::ifstream> inputFile, bool isMainStream)
1402{1402{
1403 inputFile_ = inputFile;1403 inputFile_ = inputFile;
1404- isHdrStream_ = isHdrStream;1404+ isMainStream_ = isMainStream;
1405 prereadBuffer_ = std::make_unique<uint8_t []>(PREREAD_BUFFER_SIZE);1405 prereadBuffer_ = std::make_unique<uint8_t []>(PREREAD_BUFFER_SIZE);
1406 1406 
1407 wmv3Unit_ = std::make_unique<std::vector<uint8_t>>(MAX_NALU_SIZE);1407 wmv3Unit_ = std::make_unique<std::vector<uint8_t>>(MAX_NALU_SIZE);
@@ -1415,16 +1415,16 @@ bool Wmv3Reader::Wmv3MetaUnitReader::IsEOS()
1415 1415 
1416bool Wmv3Reader::Wmv3MetaUnitReader::IsEOF()1416bool Wmv3Reader::Wmv3MetaUnitReader::IsEOF()
1417{1417{
1418- if (isHdrStream_) {1418+ if (isMainStream_) {
1419- return frameIndex_ >= ES_WMV3_HDR_LEN;1419+ return frameIndex_ >= ES_WMV3_MAIN_LEN;
1420 }1420 }
1421 return frameIndex_ >= ES_WMV3_NORMAL_LEN;1421 return frameIndex_ >= ES_WMV3_NORMAL_LEN;
1422}1422}
1423 1423 
1424uint32_t Wmv3Reader::Wmv3MetaUnitReader::GetFrameLenth(uint32_t index)1424uint32_t Wmv3Reader::Wmv3MetaUnitReader::GetFrameLenth(uint32_t index)
1425{1425{
1426- if (isHdrStream_) {1426+ if (isMainStream_) {
1427- return ES_WMV3_HDR[index];1427+ return ES_WMV3_MAIN[index];
1428 }1428 }
1429 return ES_WMV3_NORMAL[index];1429 return ES_WMV3_NORMAL[index];
1430}1430}
@@ -1433,7 +1433,7 @@ void Wmv3Reader::Wmv3MetaUnitReader::PrereadWmv3Unit()
1433{1433{
1434 CHECK_AND_RETURN_LOG(inputFile_ && inputFile_->is_open(), "Input file not open");1434 CHECK_AND_RETURN_LOG(inputFile_ && inputFile_->is_open(), "Input file not open");
1435 CHECK_AND_RETURN_LOG(wmv3Unit_ != nullptr, "wmv3 unit buffer is nullptr");1435 CHECK_AND_RETURN_LOG(wmv3Unit_ != nullptr, "wmv3 unit buffer is nullptr");
1436- CHECK_AND_RETURN_LOG(frameIndex_ < (isHdrStream_ ? ES_WMV3_HDR_LEN : ES_WMV3_NORMAL_LEN),1436+ CHECK_AND_RETURN_LOG(frameIndex_ < (isMainStream_ ? ES_WMV3_MAIN_LEN : ES_WMV3_NORMAL_LEN),
1437 "All wmv3 frames have been read");1437 "All wmv3 frames have been read");
1438 1438 
1439 uint32_t frameSize = GetFrameLenth(frameIndex_);1439 uint32_t frameSize = GetFrameLenth(frameIndex_);
Mtest/unittest/video_test/vcodec_framework_test/common/data_producer/avcc_reader/avcc_reader.h+3-3
@@ -370,7 +370,7 @@ private:
370 370 
371struct Wmv3ReaderInfo {371struct Wmv3ReaderInfo {
372 std::string inPath;372 std::string inPath;
373- bool isHdrStream = false;373+ bool isMainStream = false;
374};374};
375 375 
376class Wmv3Reader : public DataProducerBase {376class Wmv3Reader : public DataProducerBase {
@@ -396,12 +396,12 @@ private:
396 virtual bool IsEOF() = 0;396 virtual bool IsEOF() = 0;
397 std::unique_ptr<std::vector<uint8_t>> wmv3Unit_ = nullptr;397 std::unique_ptr<std::vector<uint8_t>> wmv3Unit_ = nullptr;
398 std::shared_ptr<std::ifstream> inputFile_ = nullptr;398 std::shared_ptr<std::ifstream> inputFile_ = nullptr;
399- bool isHdrStream_ = false;399+ bool isMainStream_ = false;
400 };400 };
401 401 
402 class Wmv3MetaUnitReader : public Wmv3UnitReader {402 class Wmv3MetaUnitReader : public Wmv3UnitReader {
403 public:403 public:
404- explicit Wmv3MetaUnitReader(std::shared_ptr<std::ifstream> inputFile, bool isHdrStream);404+ explicit Wmv3MetaUnitReader(std::shared_ptr<std::ifstream> inputFile, bool isMainStream);
405 int32_t ReadWmv3Unit(uint8_t *bufferAddr, int32_t &bufferSize, bool &isEos) override;405 int32_t ReadWmv3Unit(uint8_t *bufferAddr, int32_t &bufferSize, bool &isEos) override;
406 bool IsEOS() override;406 bool IsEOS() override;
407 void PrereadFile() override;407 void PrereadFile() override;
Mtest/unittest/video_test/vcodec_framework_test/func_sample/sample/decoder/vdec_async_sample.cpp+1-1
@@ -531,7 +531,7 @@ int32_t VideoDecAsyncSample::CreateWmv3Reader()
531{531{
532 std::shared_ptr<Wmv3ReaderInfo> info = std::make_shared<Wmv3ReaderInfo>();532 std::shared_ptr<Wmv3ReaderInfo> info = std::make_shared<Wmv3ReaderInfo>();
533 info->inPath = inPath_;533 info->inPath = inPath_;
534- info->isHdrStream = false;534+ info->isMainStream = false;
535 535 
536 wmv3Reader_ = std::make_shared<Wmv3Reader>();536 wmv3Reader_ = std::make_shared<Wmv3Reader>();
537 int32_t ret = wmv3Reader_->Init(info);537 int32_t ret = wmv3Reader_->Init(info);
Mtest/unittest/video_test/vcodec_framework_test/func_sample/sample/decoder/vdec_sync_sample.cpp+1-1
@@ -421,7 +421,7 @@ int32_t VideoDecSyncSample::CreateWmv3Reader()
421{421{
422 std::shared_ptr<Wmv3ReaderInfo> info = std::make_shared<Wmv3ReaderInfo>();422 std::shared_ptr<Wmv3ReaderInfo> info = std::make_shared<Wmv3ReaderInfo>();
423 info->inPath = inPath_;423 info->inPath = inPath_;
424- info->isHdrStream = false;424+ info->isMainStream = false;
425 425 
426 wmv3Reader_ = std::make_shared<Wmv3Reader>();426 wmv3Reader_ = std::make_shared<Wmv3Reader>();
427 int32_t ret = wmv3Reader_->Init(info);427 int32_t ret = wmv3Reader_->Init(info);
Mtest/unittest/video_test/vcodec_framework_test/stable_sample/sample/decoder/include/vdec_sample.h+1-1
@@ -127,7 +127,7 @@ private:
127 bool isAvcStream_ = true; // true: AVC; false: HEVC127 bool isAvcStream_ = true; // true: AVC; false: HEVC
128 bool isMpeg2Stream_ = true; // true: Mpeg2; false: Mpeg4128 bool isMpeg2Stream_ = true; // true: Mpeg2; false: Mpeg4
129 bool needExtraData_ = false;129 bool needExtraData_ = false;
130- bool isWmv3HdrStream_ = false;130+ bool isWmv3MainStream_ = false;
131 131 
132private:132private:
133 OH_AVCodecAsyncCallback asyncCallback_;133 OH_AVCodecAsyncCallback asyncCallback_;
Mtest/unittest/video_test/vcodec_framework_test/stable_sample/sample/decoder/vdec_sample.cpp+7-7
@@ -53,8 +53,8 @@ namespace {
53constexpr uint32_t MAX_OUTPUT_FRMAENUM = 1000;53constexpr uint32_t MAX_OUTPUT_FRMAENUM = 1000;
54constexpr uint8_t WMV3_EXTRADATA[] = {0x45, 0xf9, 0x18, 0x00};54constexpr uint8_t WMV3_EXTRADATA[] = {0x45, 0xf9, 0x18, 0x00};
55constexpr uint32_t WMV3_EXTRDATA_SIZE = sizeof(WMV3_EXTRADATA);55constexpr uint32_t WMV3_EXTRDATA_SIZE = sizeof(WMV3_EXTRADATA);
56-constexpr uint8_t WMV3_HDR_EXTRADATA[] = {0x4b, 0xf1, 0x0a, 0x01};56+constexpr uint8_t WMV3_MAIN_EXTRADATA[] = {0x4b, 0xf1, 0x0a, 0x01};
57-constexpr uint32_t WMV3_HDR_EXTRDATA_SIZE = sizeof(WMV3_HDR_EXTRADATA);57+constexpr uint32_t WMV3_MAIN_EXTRDATA_SIZE = sizeof(WMV3_MAIN_EXTRADATA);
58 58 
59static inline int64_t GetTimeUs()59static inline int64_t GetTimeUs()
60{60{
@@ -236,7 +236,7 @@ bool VideoDecSample::Create()
236 isAvcStream_ = inPath_.find("h264") != std::string::npos;236 isAvcStream_ = inPath_.find("h264") != std::string::npos;
237 isMpeg2Stream_ = inPath_.find("m2v") != std::string::npos;237 isMpeg2Stream_ = inPath_.find("m2v") != std::string::npos;
238 needExtraData_ = inPath_.find("wmv3") != std::string::npos;238 needExtraData_ = inPath_.find("wmv3") != std::string::npos;
239- isWmv3HdrStream_ = inPath_.find("hdr.wmv3") != std::string::npos;239+ isWmv3MainStream_ = inPath_.find("profile1_1280_720_24.wmv3") != std::string::npos;
240 inPath_ = "/data/test/media/" + inPath_;240 inPath_ = "/data/test/media/" + inPath_;
241 outPath_ = "/data/test/media/" + outPath_ + to_string(sampleId_ % threadNum_) + ".yuv";241 outPath_ = "/data/test/media/" + outPath_ + to_string(sampleId_ % threadNum_) + ".yuv";
242 242 
@@ -259,7 +259,7 @@ bool VideoDecSample::CreateByMime()
259 isAvcStream_ = inPath_.find("h264") != std::string::npos;259 isAvcStream_ = inPath_.find("h264") != std::string::npos;
260 isMpeg2Stream_ = inPath_.find("m2v") != std::string::npos;260 isMpeg2Stream_ = inPath_.find("m2v") != std::string::npos;
261 needExtraData_ = inPath_.find("wmv3") != std::string::npos;261 needExtraData_ = inPath_.find("wmv3") != std::string::npos;
262- isWmv3HdrStream_ = inPath_.find("hdr.wmv3") != std::string::npos;262+ isWmv3MainStream_ = inPath_.find("profile1_1280_720_24.wmv3") != std::string::npos;
263 inPath_ = "/data/test/media/" + inPath_;263 inPath_ = "/data/test/media/" + inPath_;
264 outPath_ = "/data/test/media/" + outPath_ + to_string(sampleId_ % threadNum_) + ".yuv";264 outPath_ = "/data/test/media/" + outPath_ + to_string(sampleId_ % threadNum_) + ".yuv";
265 codec_ = OH_VideoDecoder_CreateByMime(mime_.c_str());265 codec_ = OH_VideoDecoder_CreateByMime(mime_.c_str());
@@ -359,7 +359,7 @@ int32_t VideoDecSample::CreateWmv3Reader()
359{359{
360 std::shared_ptr<Wmv3ReaderInfo> info = std::make_shared<Wmv3ReaderInfo>();360 std::shared_ptr<Wmv3ReaderInfo> info = std::make_shared<Wmv3ReaderInfo>();
361 info->inPath = inPath_;361 info->inPath = inPath_;
362- info->isHdrStream = isWmv3HdrStream_;362+ info->isMainStream = isWmv3MainStream_;
363 363 
364 signal_->reader_ = std::make_shared<Wmv3Reader>();364 signal_->reader_ = std::make_shared<Wmv3Reader>();
365 int32_t ret = std::static_pointer_cast<Wmv3Reader>(signal_->reader_)->Init(info);365 int32_t ret = std::static_pointer_cast<Wmv3Reader>(signal_->reader_)->Init(info);
@@ -456,8 +456,8 @@ bool VideoDecSample::DoConfigure(OH_AVFormat* format)
456 }456 }
457 457 
458 if (needExtraData_) {458 if (needExtraData_) {
459- uint32_t extradataSize = isWmv3HdrStream_ ? WMV3_HDR_EXTRDATA_SIZE : WMV3_EXTRDATA_SIZE;459+ uint32_t extradataSize = isWmv3MainStream_ ? WMV3_MAIN_EXTRDATA_SIZE : WMV3_EXTRDATA_SIZE;
460- auto extradata = isWmv3HdrStream_ ? WMV3_HDR_EXTRADATA : WMV3_EXTRADATA;460+ auto extradata = isWmv3MainStream_ ? WMV3_MAIN_EXTRADATA : WMV3_EXTRADATA;
461 OH_AVFormat_SetBuffer(format, OH_MD_KEY_CODEC_CONFIG, extradata, extradataSize);461 OH_AVFormat_SetBuffer(format, OH_MD_KEY_CODEC_CONFIG, extradata, extradataSize);
462 }462 }
463 463 
Mtest/unittest/video_test/vcodec_framework_test/videodec_wmv3_stable_unit_test.cpp+131-131
@@ -36,10 +36,10 @@ constexpr uint32_t WMV3_SAPMLE_WIDTH = 352;
36constexpr uint32_t WMV3_SAMPLE_HEIGHT = 288;36constexpr uint32_t WMV3_SAMPLE_HEIGHT = 288;
37std::string WMV3_STREAM_FILE_NAME = "352_288_10.wmv3";37std::string WMV3_STREAM_FILE_NAME = "352_288_10.wmv3";
38 38 
39-constexpr uint32_t WMV3_HDR_WIDTH = 1280;39+constexpr uint32_t WMV3_MAIN_WIDTH = 1280;
40-constexpr uint32_t WMV3_HDR_HEIGHT = 720;40+constexpr uint32_t WMV3_MAIN_HEIGHT = 720;
41-std::string WMV3_HDR_STREAM_FILE_NAME = "1280_720_24.hdr.wmv3";41+std::string WMV3_MAIN_STREAM_FILE_NAME = "profile1_1280_720_24.wmv3";
42-std::string WMV3_DECODER_DUMP_FILE_NAME = "wmv3decoder.dump";42+std::string WMV3_DECODER_DUMP_FILE_NAME = "fcodec.dump";
43 43 
44class VideoDecStableTestWmv3 : public testing::TestWithParam<std::string> {44class VideoDecStableTestWmv3 : public testing::TestWithParam<std::string> {
45public:45public:
@@ -319,11 +319,11 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_004,
319}319}
320 320 
321/**321/**
322- * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_001322+ * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main_001
323 * @tc.desc: 1. push/free buffer in callback;323 * @tc.desc: 1. push/free buffer in callback;
324 * 2. release not in callback;324 * 2. release not in callback;
325 */325 */
326-HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_001, TestSize.Level1,326+HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main_001, TestSize.Level1,
327 VideoDecSample::threadNum_)327 VideoDecSample::threadNum_)
328{328{
329 auto vdec = make_shared<VideoDecSample>();329 auto vdec = make_shared<VideoDecSample>();
@@ -331,9 +331,9 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
331 vdec->frameCount_ = 21; // 21: input frame num331 vdec->frameCount_ = 21; // 21: input frame num
332 vdec->skipOutFrameHalfCheck_ = true;332 vdec->skipOutFrameHalfCheck_ = true;
333 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;333 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
334- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;334+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
335- vdec->sampleWidth_ = WMV3_HDR_WIDTH;335+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
336- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;336+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
337 vdec->releaseOtherBuffer_ = true;337 vdec->releaseOtherBuffer_ = true;
338 vdec->outPath_ = GetTestName();338 vdec->outPath_ = GetTestName();
339 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;339 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
@@ -354,11 +354,11 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
354}354}
355 355 
356/**356/**
357- * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_002357+ * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main_002
358 * @tc.desc: 1. push/free buffer in callback;358 * @tc.desc: 1. push/free buffer in callback;
359 * 2. release not in callback;359 * 2. release not in callback;
360 */360 */
361-HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_002, TestSize.Level1,361+HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main_002, TestSize.Level1,
362 VideoDecSample::threadNum_)362 VideoDecSample::threadNum_)
363{363{
364 auto vdec = make_shared<VideoDecSample>();364 auto vdec = make_shared<VideoDecSample>();
@@ -366,9 +366,9 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
366 vdec->frameCount_ = 21; // 21: input frame num366 vdec->frameCount_ = 21; // 21: input frame num
367 vdec->skipOutFrameHalfCheck_ = true;367 vdec->skipOutFrameHalfCheck_ = true;
368 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;368 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
369- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;369+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
370- vdec->sampleWidth_ = WMV3_HDR_WIDTH;370+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
371- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;371+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
372 vdec->outPath_ = GetTestName();372 vdec->outPath_ = GetTestName();
373 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;373 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
374 vdec->dumpValue_ = "11";374 vdec->dumpValue_ = "11";
@@ -391,11 +391,11 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
391}391}
392 392 
393/**393/**
394- * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_003394+ * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main_003
395 * @tc.desc: 1. push/free buffer in callback;395 * @tc.desc: 1. push/free buffer in callback;
396 * 2. release not in callback;396 * 2. release not in callback;
397 */397 */
398-HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_003, TestSize.Level1,398+HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main_003, TestSize.Level1,
399 VideoDecSample::threadNum_)399 VideoDecSample::threadNum_)
400{400{
401 auto vdec = make_shared<VideoDecSample>();401 auto vdec = make_shared<VideoDecSample>();
@@ -406,9 +406,9 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
406 vdec->maxInputBufferCount_ = true;406 vdec->maxInputBufferCount_ = true;
407 vdec->defaultBufferCount_ = 20;407 vdec->defaultBufferCount_ = 20;
408 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;408 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
409- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;409+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
410- vdec->sampleWidth_ = WMV3_HDR_WIDTH;410+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
411- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;411+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
412 vdec->setSurfaceParam_ = true;412 vdec->setSurfaceParam_ = true;
413 vdec->releaseOtherBuffer_ = true;413 vdec->releaseOtherBuffer_ = true;
414 vdec->outPath_ = GetTestName();414 vdec->outPath_ = GetTestName();
@@ -434,11 +434,11 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
434}434}
435 435 
436/**436/**
437- * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_004437+ * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main_004
438 * @tc.desc: 1. push/free buffer in callback;438 * @tc.desc: 1. push/free buffer in callback;
439 * 2. release not in callback;439 * 2. release not in callback;
440 */440 */
441-HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_004, TestSize.Level1,441+HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main_004, TestSize.Level1,
442 VideoDecSample::threadNum_)442 VideoDecSample::threadNum_)
443{443{
444 auto vdec = make_shared<VideoDecSample>();444 auto vdec = make_shared<VideoDecSample>();
@@ -446,9 +446,9 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
446 vdec->frameCount_ = 21; // 21: input frame num446 vdec->frameCount_ = 21; // 21: input frame num
447 vdec->skipOutFrameHalfCheck_ = true;447 vdec->skipOutFrameHalfCheck_ = true;
448 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;448 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
449- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;449+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
450- vdec->sampleWidth_ = WMV3_HDR_WIDTH;450+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
451- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;451+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
452 vdec->outPath_ = GetTestName();452 vdec->outPath_ = GetTestName();
453 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;453 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
454 vdec->dumpValue_ = "11";454 vdec->dumpValue_ = "11";
@@ -473,14 +473,14 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
473}473}
474 474 
475/**475/**
476- * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_005476+ * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main_005
477 * @tc.desc: 1. push buffer in callback;477 * @tc.desc: 1. push buffer in callback;
478 * 2. operate in input callback;478 * 2. operate in input callback;
479 * 3. render buffer in queue;479 * 3. render buffer in queue;
480 * 4. set rotation maxOut/InputBufferCount defaultmaxBufferCount scaleMode;480 * 4. set rotation maxOut/InputBufferCount defaultmaxBufferCount scaleMode;
481 * 5. set surface;481 * 5. set surface;
482 */482 */
483-HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_005, TestSize.Level1,483+HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main_005, TestSize.Level1,
484 VideoDecSample::threadNum_)484 VideoDecSample::threadNum_)
485{485{
486 auto vdec = make_shared<VideoDecSample>();486 auto vdec = make_shared<VideoDecSample>();
@@ -495,9 +495,9 @@ HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main1
495 vdec->lowLatency_ = true;495 vdec->lowLatency_ = true;
496 vdec->setPixelFormat_ = false;496 vdec->setPixelFormat_ = false;
497 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;497 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
498- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;498+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
499- vdec->sampleWidth_ = WMV3_HDR_WIDTH;499+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
500- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;500+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
501 vdec->outPath_ = GetTestName();501 vdec->outPath_ = GetTestName();
502 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;502 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
503 vdec->dumpValue_ = "11";503 vdec->dumpValue_ = "11";
@@ -526,10 +526,10 @@ void InitAVCodecCallback(OH_AVCodecCallback &cb)
526 cb.onNewOutputBuffer = OutBufferHandle;526 cb.onNewOutputBuffer = OutBufferHandle;
527}527}
528/**528/**
529- * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_006529+ * @tc.name: VideoDecoder_wmv3decoder_Create_AVBuffer_Main_006
530 * @tc.desc: 1. 2 codec use same surface;530 * @tc.desc: 1. 2 codec use same surface;
531 */531 */
532-HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main10_006, TestSize.Level1,532+HWMTEST_F(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_Create_AVBuffer_Main_006, TestSize.Level1,
533 VideoDecSample::threadNum_)533 VideoDecSample::threadNum_)
534{534{
535 auto vdec1 = make_shared<VideoDecSample>();535 auto vdec1 = make_shared<VideoDecSample>();
@@ -753,11 +753,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_005, TestSize.L
753}753}
754 754 
755/**755/**
756- * @tc.name: VideoDecoder_wmv3decoder_main10_001756+ * @tc.name: VideoDecoder_wmv3decoder_main_001
757 * @tc.desc: 1. push/free buffer in callback;757 * @tc.desc: 1. push/free buffer in callback;
758 * 2. operate not in callback;758 * 2. operate not in callback;
759 */759 */
760-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_001, TestSize.Level1,760+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main_001, TestSize.Level1,
761 VideoDecSample::threadNum_)761 VideoDecSample::threadNum_)
762{762{
763 auto vdec = make_shared<VideoDecSample>();763 auto vdec = make_shared<VideoDecSample>();
@@ -766,9 +766,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_001, Tes
766 vdec->frameCount_ = 21; // 21: input frame num766 vdec->frameCount_ = 21; // 21: input frame num
767 vdec->skipOutFrameHalfCheck_ = true;767 vdec->skipOutFrameHalfCheck_ = true;
768 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;768 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
769- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;769+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
770- vdec->sampleWidth_ = WMV3_HDR_WIDTH;770+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
771- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;771+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
772 vdec->outPath_ = GetTestName();772 vdec->outPath_ = GetTestName();
773 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;773 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
774 vdec->dumpValue_ = "0";774 vdec->dumpValue_ = "0";
@@ -789,11 +789,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_001, Tes
789}789}
790 790 
791/**791/**
792- * @tc.name: VideoDecoder_wmv3decoder_main10_002792+ * @tc.name: VideoDecoder_wmv3decoder_main_002
793 * @tc.desc: 1. push/free buffer in callback;793 * @tc.desc: 1. push/free buffer in callback;
794 * 2. operate in input callback;794 * 2. operate in input callback;
795 */795 */
796-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_002,796+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main_002,
797 TestSize.Level1, VideoDecSample::threadNum_)797 TestSize.Level1, VideoDecSample::threadNum_)
798{798{
799 auto vdec = make_shared<VideoDecSample>();799 auto vdec = make_shared<VideoDecSample>();
@@ -802,9 +802,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_002,
802 vdec->frameCount_ = 21; // 21: input frame num802 vdec->frameCount_ = 21; // 21: input frame num
803 vdec->skipOutFrameHalfCheck_ = true;803 vdec->skipOutFrameHalfCheck_ = true;
804 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;804 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
805- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;805+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
806- vdec->sampleWidth_ = WMV3_HDR_WIDTH;806+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
807- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;807+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
808 vdec->outPath_ = GetTestName();808 vdec->outPath_ = GetTestName();
809 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;809 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
810 vdec->dumpValue_ = "0";810 vdec->dumpValue_ = "0";
@@ -824,11 +824,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_002,
824}824}
825 825 
826/**826/**
827- * @tc.name: VideoDecoder_wmv3decoder_main10_003827+ * @tc.name: VideoDecoder_wmv3decoder_main_003
828 * @tc.desc: 1. push/free buffer in callback;828 * @tc.desc: 1. push/free buffer in callback;
829 * 2. operate in output callback;829 * 2. operate in output callback;
830 */830 */
831-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_003, TestSize.Level1,831+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main_003, TestSize.Level1,
832 VideoDecSample::threadNum_)832 VideoDecSample::threadNum_)
833{833{
834 auto vdec = make_shared<VideoDecSample>();834 auto vdec = make_shared<VideoDecSample>();
@@ -837,9 +837,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_003, Tes
837 vdec->frameCount_ = 21; // 21: input frame num837 vdec->frameCount_ = 21; // 21: input frame num
838 vdec->skipOutFrameHalfCheck_ = true;838 vdec->skipOutFrameHalfCheck_ = true;
839 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;839 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
840- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;840+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
841- vdec->sampleWidth_ = WMV3_HDR_WIDTH;841+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
842- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;842+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
843 vdec->outPath_ = GetTestName();843 vdec->outPath_ = GetTestName();
844 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;844 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
845 vdec->dumpValue_ = "0";845 vdec->dumpValue_ = "0";
@@ -859,12 +859,12 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_003, Tes
859}859}
860 860 
861/**861/**
862- * @tc.name: VideoDecoder_wmv3decoder_main10_004862+ * @tc.name: VideoDecoder_wmv3decoder_main_004
863 * @tc.desc: 1. push/free buffer in callback;863 * @tc.desc: 1. push/free buffer in callback;
864 * 2. operate not in callback;864 * 2. operate not in callback;
865 * 3. set surface;865 * 3. set surface;
866 */866 */
867-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_004, TestSize.Level1,867+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main_004, TestSize.Level1,
868 VideoDecSample::threadNum_)868 VideoDecSample::threadNum_)
869{869{
870 auto vdec = make_shared<VideoDecSample>();870 auto vdec = make_shared<VideoDecSample>();
@@ -873,9 +873,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_004, Tes
873 vdec->frameCount_ = 21; // 21: input frame num873 vdec->frameCount_ = 21; // 21: input frame num
874 vdec->skipOutFrameHalfCheck_ = true;874 vdec->skipOutFrameHalfCheck_ = true;
875 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;875 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
876- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;876+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
877- vdec->sampleWidth_ = WMV3_HDR_WIDTH;877+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
878- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;878+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
879 vdec->outPath_ = GetTestName();879 vdec->outPath_ = GetTestName();
880 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;880 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
881 vdec->dumpValue_ = "0";881 vdec->dumpValue_ = "0";
@@ -897,12 +897,12 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_004, Tes
897}897}
898 898 
899/**899/**
900- * @tc.name: VideoDecoder_wmv3decoder_main10_005900+ * @tc.name: VideoDecoder_wmv3decoder_main_005
901 * @tc.desc: 1. push/free buffer in callback;901 * @tc.desc: 1. push/free buffer in callback;
902 * 2. operate in input callback;902 * 2. operate in input callback;
903 * 3. set surface;903 * 3. set surface;
904 */904 */
905-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_005,905+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main_005,
906 TestSize.Level1, VideoDecSample::threadNum_)906 TestSize.Level1, VideoDecSample::threadNum_)
907{907{
908 auto vdec = make_shared<VideoDecSample>();908 auto vdec = make_shared<VideoDecSample>();
@@ -911,9 +911,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_main10_005,
911 vdec->frameCount_ = 21; // 21: input frame num911 vdec->frameCount_ = 21; // 21: input frame num
912 vdec->skipOutFrameHalfCheck_ = true;912 vdec->skipOutFrameHalfCheck_ = true;
913 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;913 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
914- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;914+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
915- vdec->sampleWidth_ = WMV3_HDR_WIDTH;915+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
916- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;916+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
917 vdec->outPath_ = GetTestName();917 vdec->outPath_ = GetTestName();
918 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;918 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
919 vdec->dumpValue_ = "0";919 vdec->dumpValue_ = "0";
@@ -1119,11 +1119,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_005,
1119}1119}
1120 1120 
1121/**1121/**
1122- * @tc.name: VideoDecoder_wmv3decoder_With_Queue_main10_0011122+ * @tc.name: VideoDecoder_wmv3decoder_With_Queue_Main_001
1123 * @tc.desc: 1. push/free buffer in queue;1123 * @tc.desc: 1. push/free buffer in queue;
1124 * 2. operate not in callback;1124 * 2. operate not in callback;
1125 */1125 */
1126-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main10_001, TestSize.Level1,1126+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_Main_001, TestSize.Level1,
1127 VideoDecSample::threadNum_)1127 VideoDecSample::threadNum_)
1128{1128{
1129 auto vdec = make_shared<VideoDecSample>();1129 auto vdec = make_shared<VideoDecSample>();
@@ -1132,9 +1132,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1132 vdec->frameCount_ = 21; // 21: input frame num1132 vdec->frameCount_ = 21; // 21: input frame num
1133 vdec->skipOutFrameHalfCheck_ = true;1133 vdec->skipOutFrameHalfCheck_ = true;
1134 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1134 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1135- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1135+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1136- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1136+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1137- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1137+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1138 vdec->outPath_ = GetTestName();1138 vdec->outPath_ = GetTestName();
1139 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1139 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1140 vdec->dumpValue_ = "0";1140 vdec->dumpValue_ = "0";
@@ -1157,11 +1157,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1157}1157}
1158 1158 
1159/**1159/**
1160- * @tc.name: VideoDecoder_wmv3decoder_With_Queue_main10_0021160+ * @tc.name: VideoDecoder_wmv3decoder_With_Queue_Main_002
1161 * @tc.desc: 1. push/free buffer in queue;1161 * @tc.desc: 1. push/free buffer in queue;
1162 * 2. operate in input callback;1162 * 2. operate in input callback;
1163 */1163 */
1164-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main10_002, TestSize.Level1,1164+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_Main_002, TestSize.Level1,
1165 VideoDecSample::threadNum_)1165 VideoDecSample::threadNum_)
1166{1166{
1167 auto vdec = make_shared<VideoDecSample>();1167 auto vdec = make_shared<VideoDecSample>();
@@ -1170,9 +1170,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1170 vdec->frameCount_ = 21; // 21: input frame num1170 vdec->frameCount_ = 21; // 21: input frame num
1171 vdec->skipOutFrameHalfCheck_ = true;1171 vdec->skipOutFrameHalfCheck_ = true;
1172 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1172 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1173- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1173+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1174- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1174+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1175- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1175+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1176 vdec->outPath_ = GetTestName();1176 vdec->outPath_ = GetTestName();
1177 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1177 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1178 vdec->dumpValue_ = "0";1178 vdec->dumpValue_ = "0";
@@ -1193,12 +1193,12 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1193}1193}
1194 1194 
1195/**1195/**
1196- * @tc.name: VideoDecoder_wmv3decoder_With_Queue_main10_0031196+ * @tc.name: VideoDecoder_wmv3decoder_With_Queue_Main_003
1197 * @tc.desc: 1. push buffer in callback;1197 * @tc.desc: 1. push buffer in callback;
1198 * 2. operate in output callback;1198 * 2. operate in output callback;
1199 * 3. free buffer in queue;1199 * 3. free buffer in queue;
1200 */1200 */
1201-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main10_003, TestSize.Level1,1201+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_Main_003, TestSize.Level1,
1202 VideoDecSample::threadNum_)1202 VideoDecSample::threadNum_)
1203{1203{
1204 auto vdec = make_shared<VideoDecSample>();1204 auto vdec = make_shared<VideoDecSample>();
@@ -1207,9 +1207,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1207 vdec->frameCount_ = 21; // 21: input frame num1207 vdec->frameCount_ = 21; // 21: input frame num
1208 vdec->skipOutFrameHalfCheck_ = true;1208 vdec->skipOutFrameHalfCheck_ = true;
1209 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1209 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1210- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1210+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1211- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1211+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1212- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1212+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1213 vdec->outPath_ = GetTestName();1213 vdec->outPath_ = GetTestName();
1214 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1214 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1215 vdec->dumpValue_ = "0";1215 vdec->dumpValue_ = "0";
@@ -1230,13 +1230,13 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1230}1230}
1231 1231 
1232/**1232/**
1233- * @tc.name: VideoDecoder_wmv3decoder_With_Queue_main10_0041233+ * @tc.name: VideoDecoder_wmv3decoder_With_Queue_Main_004
1234 * @tc.desc: 1. push buffer in callback;1234 * @tc.desc: 1. push buffer in callback;
1235 * 2. operate not in callback;1235 * 2. operate not in callback;
1236 * 3. render buffer in queue;1236 * 3. render buffer in queue;
1237 * 4. set surface;1237 * 4. set surface;
1238 */1238 */
1239-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main10_004, TestSize.Level1,1239+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_Main_004, TestSize.Level1,
1240 VideoDecSample::threadNum_)1240 VideoDecSample::threadNum_)
1241{1241{
1242 auto vdec = make_shared<VideoDecSample>();1242 auto vdec = make_shared<VideoDecSample>();
@@ -1245,9 +1245,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1245 vdec->frameCount_ = 21; // 21: input frame num1245 vdec->frameCount_ = 21; // 21: input frame num
1246 vdec->skipOutFrameHalfCheck_ = true;1246 vdec->skipOutFrameHalfCheck_ = true;
1247 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1247 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1248- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1248+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1249- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1249+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1250- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1250+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1251 vdec->outPath_ = GetTestName();1251 vdec->outPath_ = GetTestName();
1252 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1252 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1253 vdec->dumpValue_ = "0";1253 vdec->dumpValue_ = "0";
@@ -1270,13 +1270,13 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1270}1270}
1271 1271 
1272/**1272/**
1273- * @tc.name: VideoDecoder_wmv3decoder_With_Queue_main10_0051273+ * @tc.name: VideoDecoder_wmv3decoder_With_Queue_Main_005
1274 * @tc.desc: 1. push buffer in callback;1274 * @tc.desc: 1. push buffer in callback;
1275 * 2. operate in input callback;1275 * 2. operate in input callback;
1276 * 3. render buffer in queue;1276 * 3. render buffer in queue;
1277 * 4. set surface;1277 * 4. set surface;
1278 */1278 */
1279-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main10_005, TestSize.Level1,1279+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_Main_005, TestSize.Level1,
1280 VideoDecSample::threadNum_)1280 VideoDecSample::threadNum_)
1281{1281{
1282 auto vdec = make_shared<VideoDecSample>();1282 auto vdec = make_shared<VideoDecSample>();
@@ -1285,9 +1285,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_With_Queue_main
1285 vdec->frameCount_ = 21; // 21: input frame num1285 vdec->frameCount_ = 21; // 21: input frame num
1286 vdec->skipOutFrameHalfCheck_ = true;1286 vdec->skipOutFrameHalfCheck_ = true;
1287 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1287 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1288- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1288+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1289- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1289+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1290- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1290+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1291 vdec->outPath_ = GetTestName();1291 vdec->outPath_ = GetTestName();
1292 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1292 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1293 vdec->dumpValue_ = "0";1293 vdec->dumpValue_ = "0";
@@ -1485,11 +1485,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_005, T
1485}1485}
1486 1486 
1487/**1487/**
1488- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_main10_0011488+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_Main_001
1489 * @tc.desc: 1. push/free buffer in callback;1489 * @tc.desc: 1. push/free buffer in callback;
1490 * 2. operate not in callback;1490 * 2. operate not in callback;
1491 */1491 */
1492-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10_001, TestSize.Level1,1492+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_Main_001, TestSize.Level1,
1493 VideoDecSample::threadNum_)1493 VideoDecSample::threadNum_)
1494{1494{
1495 auto vdec = make_shared<VideoDecSample>();1495 auto vdec = make_shared<VideoDecSample>();
@@ -1498,9 +1498,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1498 vdec->frameCount_ = 21; // 21: input frame num1498 vdec->frameCount_ = 21; // 21: input frame num
1499 vdec->skipOutFrameHalfCheck_ = true;1499 vdec->skipOutFrameHalfCheck_ = true;
1500 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1500 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1501- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1501+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1502- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1502+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1503- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1503+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1504 vdec->outPath_ = GetTestName();1504 vdec->outPath_ = GetTestName();
1505 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1505 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1506 vdec->dumpValue_ = "0";1506 vdec->dumpValue_ = "0";
@@ -1521,11 +1521,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1521}1521}
1522 1522 
1523/**1523/**
1524- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_main10_0021524+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_Main_002
1525 * @tc.desc: 1. push/free buffer in callback;1525 * @tc.desc: 1. push/free buffer in callback;
1526 * 2. operate in input callback;1526 * 2. operate in input callback;
1527 */1527 */
1528-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10_002, TestSize.Level1,1528+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_Main_002, TestSize.Level1,
1529 VideoDecSample::threadNum_)1529 VideoDecSample::threadNum_)
1530{1530{
1531 auto vdec = make_shared<VideoDecSample>();1531 auto vdec = make_shared<VideoDecSample>();
@@ -1534,9 +1534,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1534 vdec->frameCount_ = 21; // 21: input frame num1534 vdec->frameCount_ = 21; // 21: input frame num
1535 vdec->skipOutFrameHalfCheck_ = true;1535 vdec->skipOutFrameHalfCheck_ = true;
1536 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1536 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1537- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1537+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1538- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1538+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1539- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1539+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1540 vdec->outPath_ = GetTestName();1540 vdec->outPath_ = GetTestName();
1541 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1541 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1542 vdec->dumpValue_ = "0";1542 vdec->dumpValue_ = "0";
@@ -1556,11 +1556,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1556}1556}
1557 1557 
1558/**1558/**
1559- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_main10_0031559+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_Main_003
1560 * @tc.desc: 1. push/free buffer in callback;1560 * @tc.desc: 1. push/free buffer in callback;
1561 * 2. operate in output callback;1561 * 2. operate in output callback;
1562 */1562 */
1563-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10_003, TestSize.Level1,1563+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_Main_003, TestSize.Level1,
1564 VideoDecSample::threadNum_)1564 VideoDecSample::threadNum_)
1565{1565{
1566 auto vdec = make_shared<VideoDecSample>();1566 auto vdec = make_shared<VideoDecSample>();
@@ -1569,9 +1569,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1569 vdec->frameCount_ = 21; // 21: input frame num1569 vdec->frameCount_ = 21; // 21: input frame num
1570 vdec->skipOutFrameHalfCheck_ = true;1570 vdec->skipOutFrameHalfCheck_ = true;
1571 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1571 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1572- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1572+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1573- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1573+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1574- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1574+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1575 vdec->outPath_ = GetTestName();1575 vdec->outPath_ = GetTestName();
1576 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1576 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1577 vdec->dumpValue_ = "0";1577 vdec->dumpValue_ = "0";
@@ -1591,12 +1591,12 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1591}1591}
1592 1592 
1593/**1593/**
1594- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_main10_0041594+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_Main_004
1595 * @tc.desc: 1. push/free buffer in callback;1595 * @tc.desc: 1. push/free buffer in callback;
1596 * 2. operate not in callback;1596 * 2. operate not in callback;
1597 * 3. set surface;1597 * 3. set surface;
1598 */1598 */
1599-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10_004, TestSize.Level1,1599+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_Main_004, TestSize.Level1,
1600 VideoDecSample::threadNum_)1600 VideoDecSample::threadNum_)
1601{1601{
1602 auto vdec = make_shared<VideoDecSample>();1602 auto vdec = make_shared<VideoDecSample>();
@@ -1605,9 +1605,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1605 vdec->frameCount_ = 21; // 21: input frame num1605 vdec->frameCount_ = 21; // 21: input frame num
1606 vdec->skipOutFrameHalfCheck_ = true;1606 vdec->skipOutFrameHalfCheck_ = true;
1607 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1607 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1608- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1608+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1609- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1609+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1610- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1610+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1611 vdec->outPath_ = GetTestName();1611 vdec->outPath_ = GetTestName();
1612 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1612 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1613 vdec->dumpValue_ = "0";1613 vdec->dumpValue_ = "0";
@@ -1629,12 +1629,12 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1629}1629}
1630 1630 
1631/**1631/**
1632- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_main10_0051632+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_Main_005
1633 * @tc.desc: 1. push/free buffer in callback;1633 * @tc.desc: 1. push/free buffer in callback;
1634 * 2. operate in input callback;1634 * 2. operate in input callback;
1635 * 3. set surface;1635 * 3. set surface;
1636 */1636 */
1637-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10_005, TestSize.Level1,1637+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_Main_005, TestSize.Level1,
1638 VideoDecSample::threadNum_)1638 VideoDecSample::threadNum_)
1639{1639{
1640 auto vdec = make_shared<VideoDecSample>();1640 auto vdec = make_shared<VideoDecSample>();
@@ -1643,9 +1643,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_main10
1643 vdec->frameCount_ = 21; // 21: input frame num1643 vdec->frameCount_ = 21; // 21: input frame num
1644 vdec->skipOutFrameHalfCheck_ = true;1644 vdec->skipOutFrameHalfCheck_ = true;
1645 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1645 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1646- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1646+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1647- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1647+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1648- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1648+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1649 vdec->outPath_ = GetTestName();1649 vdec->outPath_ = GetTestName();
1650 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1650 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1651 vdec->dumpValue_ = "0";1651 vdec->dumpValue_ = "0";
@@ -1851,11 +1851,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1851}1851}
1852 1852 
1853/**1853/**
1854- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_0011854+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_001
1855 * @tc.desc: 1. push/free buffer in queue;1855 * @tc.desc: 1. push/free buffer in queue;
1856 * 2. operate not in callback;1856 * 2. operate not in callback;
1857 */1857 */
1858-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_001, TestSize.Level1,1858+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_001, TestSize.Level1,
1859 VideoDecSample::threadNum_)1859 VideoDecSample::threadNum_)
1860{1860{
1861 auto vdec = make_shared<VideoDecSample>();1861 auto vdec = make_shared<VideoDecSample>();
@@ -1864,9 +1864,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1864 vdec->frameCount_ = 21; // 21: input frame num1864 vdec->frameCount_ = 21; // 21: input frame num
1865 vdec->skipOutFrameHalfCheck_ = true;1865 vdec->skipOutFrameHalfCheck_ = true;
1866 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1866 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1867- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1867+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1868- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1868+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1869- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1869+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1870 vdec->outPath_ = GetTestName();1870 vdec->outPath_ = GetTestName();
1871 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1871 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1872 vdec->dumpValue_ = "0";1872 vdec->dumpValue_ = "0";
@@ -1889,11 +1889,11 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1889}1889}
1890 1890 
1891/**1891/**
1892- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_0021892+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_002
1893 * @tc.desc: 1. push/free buffer in queue;1893 * @tc.desc: 1. push/free buffer in queue;
1894 * 2. operate in input callback;1894 * 2. operate in input callback;
1895 */1895 */
1896-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_002, TestSize.Level1,1896+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_002, TestSize.Level1,
1897 VideoDecSample::threadNum_)1897 VideoDecSample::threadNum_)
1898{1898{
1899 auto vdec = make_shared<VideoDecSample>();1899 auto vdec = make_shared<VideoDecSample>();
@@ -1902,9 +1902,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1902 vdec->frameCount_ = 21; // 21: input frame num1902 vdec->frameCount_ = 21; // 21: input frame num
1903 vdec->skipOutFrameHalfCheck_ = true;1903 vdec->skipOutFrameHalfCheck_ = true;
1904 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1904 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1905- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1905+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1906- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1906+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1907- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1907+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1908 vdec->outPath_ = GetTestName();1908 vdec->outPath_ = GetTestName();
1909 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1909 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1910 vdec->dumpValue_ = "0";1910 vdec->dumpValue_ = "0";
@@ -1925,12 +1925,12 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1925}1925}
1926 1926 
1927/**1927/**
1928- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_0031928+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_003
1929 * @tc.desc: 1. push buffer in callback;1929 * @tc.desc: 1. push buffer in callback;
1930 * 2. operate in output callback;1930 * 2. operate in output callback;
1931 * 3. free buffer in queue;1931 * 3. free buffer in queue;
1932 */1932 */
1933-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_003, TestSize.Level1,1933+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_003, TestSize.Level1,
1934 VideoDecSample::threadNum_)1934 VideoDecSample::threadNum_)
1935{1935{
1936 auto vdec = make_shared<VideoDecSample>();1936 auto vdec = make_shared<VideoDecSample>();
@@ -1939,9 +1939,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1939 vdec->frameCount_ = 21; // 21: input frame num1939 vdec->frameCount_ = 21; // 21: input frame num
1940 vdec->skipOutFrameHalfCheck_ = true;1940 vdec->skipOutFrameHalfCheck_ = true;
1941 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1941 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1942- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1942+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1943- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1943+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1944- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1944+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1945 vdec->outPath_ = GetTestName();1945 vdec->outPath_ = GetTestName();
1946 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1946 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1947 vdec->dumpValue_ = "0";1947 vdec->dumpValue_ = "0";
@@ -1962,13 +1962,13 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1962}1962}
1963 1963 
1964/**1964/**
1965- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_0041965+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_004
1966 * @tc.desc: 1. push buffer in callback;1966 * @tc.desc: 1. push buffer in callback;
1967 * 2. operate not in callback;1967 * 2. operate not in callback;
1968 * 3. render buffer in queue;1968 * 3. render buffer in queue;
1969 * 4. set surface;1969 * 4. set surface;
1970 */1970 */
1971-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_004, TestSize.Level1,1971+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_004, TestSize.Level1,
1972 VideoDecSample::threadNum_)1972 VideoDecSample::threadNum_)
1973{1973{
1974 auto vdec = make_shared<VideoDecSample>();1974 auto vdec = make_shared<VideoDecSample>();
@@ -1977,9 +1977,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
1977 vdec->frameCount_ = 21; // 21: input frame num1977 vdec->frameCount_ = 21; // 21: input frame num
1978 vdec->skipOutFrameHalfCheck_ = true;1978 vdec->skipOutFrameHalfCheck_ = true;
1979 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;1979 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
1980- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;1980+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
1981- vdec->sampleWidth_ = WMV3_HDR_WIDTH;1981+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
1982- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;1982+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
1983 vdec->outPath_ = GetTestName();1983 vdec->outPath_ = GetTestName();
1984 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;1984 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
1985 vdec->dumpValue_ = "0";1985 vdec->dumpValue_ = "0";
@@ -2002,13 +2002,13 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
2002}2002}
2003 2003 
2004/**2004/**
2005- * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_0052005+ * @tc.name: VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_005
2006 * @tc.desc: 1. push buffer in callback;2006 * @tc.desc: 1. push buffer in callback;
2007 * 2. operate in input callback;2007 * 2. operate in input callback;
2008 * 3. render buffer in queue;2008 * 3. render buffer in queue;
2009 * 4. set surface;2009 * 4. set surface;
2010 */2010 */
2011-AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_main10_005, TestSize.Level1,2011+AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Queue_Main_005, TestSize.Level1,
2012 VideoDecSample::threadNum_)2012 VideoDecSample::threadNum_)
2013{2013{
2014 auto vdec = make_shared<VideoDecSample>();2014 auto vdec = make_shared<VideoDecSample>();
@@ -2017,9 +2017,9 @@ AVCODEC_MTEST_P(VideoDecStableTestWmv3, VideoDecoder_wmv3decoder_AVBuffer_With_Q
2017 vdec->frameCount_ = 21; // 21: input frame num2017 vdec->frameCount_ = 21; // 21: input frame num
2018 vdec->skipOutFrameHalfCheck_ = true;2018 vdec->skipOutFrameHalfCheck_ = true;
2019 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;2019 vdec->mime_ = OH_AVCODEC_MIMETYPE_VIDEO_WMV3;
2020- vdec->inPath_ = WMV3_HDR_STREAM_FILE_NAME;2020+ vdec->inPath_ = WMV3_MAIN_STREAM_FILE_NAME;
2021- vdec->sampleWidth_ = WMV3_HDR_WIDTH;2021+ vdec->sampleWidth_ = WMV3_MAIN_WIDTH;
2022- vdec->sampleHeight_ = WMV3_HDR_HEIGHT;2022+ vdec->sampleHeight_ = WMV3_MAIN_HEIGHT;
2023 vdec->outPath_ = GetTestName();2023 vdec->outPath_ = GetTestName();
2024 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;2024 vdec->dumpKey_ = WMV3_DECODER_DUMP_FILE_NAME;
2025 vdec->dumpValue_ = "0";2025 vdec->dumpValue_ = "0";