AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified MD5 string compare code and fixed potential incorrect conversion of MD5 string to integers. (#414)

Browse Source 
* * rocDecode: Fixed potential incorrect conversion of MD5 string to integers.

* * rocDecode: Changed a string name.

* * rocDecode: Simplified the MD5 string compare code.

* * rocDecode: Added minor changed based on review comments.

* * rocDecode: Minor changes.

* * rocDecode/Sample script: Added units to Bit rate field in csv output.

[ROCm/rocdecode commit: 14f4c6973a]
This commit is contained in:
jeffqjiangNew
2024-09-16 15:27:10 -04:00
committed by GitHub
parent 3139e6f013
commit 2bad24f6f2
4 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocdecode/samples/videoDecode/videodecode.cpp
+13 -15
View File
@@ -246,9 +246,6 @@ int main(int argc, char **argv) {
if (b_generate_md5) {
viddec.InitMd5();
}
if (b_md5_check) {
ref_md5_file.open(md5_file_path.c_str(), std::ios::in);
}
viddec.SetReconfigParams(&reconfig_params);
do {
@@ -329,27 +326,28 @@ int main(int argc, char **argv) {
std::cout << std::setfill('0') << std::setw(2) << std::hex << static_cast<int>(digest[i]);
}
std::cout << std::endl;
if (b_md5_check) {
char ref_md5_string[33], c2[2];
std::string ref_md5_string(33, 0);
uint8_t ref_md5[16];
std::string str;
ref_md5_file.open(md5_file_path.c_str(), std::ios::in);
if ((ref_md5_file.rdstate() & std::ifstream::failbit) != 0) {
std::cerr << "Failed to open MD5 file." << std::endl;
return 1;
}
ref_md5_file.getline(ref_md5_string.data(), ref_md5_string.length());
if ((ref_md5_file.rdstate() & std::ifstream::badbit) != 0) {
std::cerr << "Failed to read MD5 digest string." << std::endl;
return 1;
}
for (int i = 0; i < 16; i++) {
int c;
ref_md5_file.get(c2[0]);
ref_md5_file.get(c2[1]);
str = c2;
c = std::stoi(str, nullptr, 16);
ref_md5[i] = c;
std::string part = ref_md5_string.substr(i * 2, 2);
ref_md5[i] = std::stoi(part, nullptr, 16);
}
if (memcmp(digest, ref_md5, 16) == 0) {
std::cout << "MD5 digest matches the reference MD5 digest: ";
} else {
std::cout << "MD5 digest does not match the reference MD5 digest: ";
}
ref_md5_file.seekg(0, std::ios_base::beg);
ref_md5_file.getline(ref_md5_string, 33);
std::cout << ref_md5_string << std::endl;
ref_md5_file.close();
}
projects/rocdecode/samples/videoDecodeMem/videodecodemem.cpp
+13 -15
View File
@@ -205,9 +205,6 @@ int main(int argc, char **argv) {
if (b_generate_md5) {
viddec.InitMd5();
}
if (b_md5_check) {
ref_md5_file.open(md5_file_path.c_str(), std::ios::in);
}
do {
auto start_time = std::chrono::high_resolution_clock::now();
@@ -258,27 +255,28 @@ int main(int argc, char **argv) {
std::cout << std::setfill('0') << std::setw(2) << std::hex << static_cast<int>(digest[i]);
}
std::cout << std::endl;
if (b_md5_check) {
char ref_md5_string[33], c2[2];
std::string ref_md5_string(33, 0);
uint8_t ref_md5[16];
std::string str;
ref_md5_file.open(md5_file_path.c_str(), std::ios::in);
if ((ref_md5_file.rdstate() & std::ifstream::failbit) != 0) {
std::cerr << "Failed to open MD5 file." << std::endl;
return 1;
}
ref_md5_file.getline(ref_md5_string.data(), ref_md5_string.length());
if ((ref_md5_file.rdstate() & std::ifstream::badbit) != 0) {
std::cerr << "Failed to read MD5 digest string." << std::endl;
return 1;
}
for (int i = 0; i < 16; i++) {
int c;
ref_md5_file.get(c2[0]);
ref_md5_file.get(c2[1]);
str = c2;
c = std::stoi(str, nullptr, 16);
ref_md5[i] = c;
std::string part = ref_md5_string.substr(i * 2, 2);
ref_md5[i] = std::stoi(part, nullptr, 16);
}
if (memcmp(digest, ref_md5, 16) == 0) {
std::cout << "MD5 digest matches the reference MD5 digest: ";
} else {
std::cout << "MD5 digest does not match the reference MD5 digest: ";
}
ref_md5_file.seekg(0, std::ios_base::beg);
ref_md5_file.getline(ref_md5_string, 33);
std::cout << ref_md5_string << std::endl;
ref_md5_file.close();
}
projects/rocdecode/samples/videoDecodeRGB/videodecrgb.cpp
+15 -17
View File
@@ -274,9 +274,6 @@ int main(int argc, char **argv) {
if (b_generate_md5) {
viddec.InitMd5();
}
if (b_md5_check) {
ref_md5_file.open(md5_file_path.c_str(), std::ios::in);
}
int n_video_bytes = 0, n_frames_returned = 0, n_frame = 0;
uint8_t *p_video = nullptr;
@@ -378,27 +375,28 @@ int main(int argc, char **argv) {
std::cout << std::setfill('0') << std::setw(2) << std::hex << static_cast<int>(digest[i]);
}
std::cout << std::endl;
if (b_md5_check) {
char ref_md5_string[33], c2[2];
std::string ref_md5_string(33, 0);
uint8_t ref_md5[16];
std::string str;
ref_md5_file.open(md5_file_path.c_str(), std::ios::in);
if ((ref_md5_file.rdstate() & std::ifstream::failbit) != 0) {
std::cerr << "Failed to open MD5 file." << std::endl;
return 1;
}
ref_md5_file.getline(ref_md5_string.data(), ref_md5_string.length());
if ((ref_md5_file.rdstate() & std::ifstream::badbit) != 0) {
std::cerr << "Failed to read MD5 digest string." << std::endl;
return 1;
}
for (int i = 0; i < 16; i++) {
int c;
ref_md5_file.get(c2[0]);
ref_md5_file.get(c2[1]);
str = c2;
c = std::stoi(str, nullptr, 16);
ref_md5[i] = c;
std::string part = ref_md5_string.substr(i * 2, 2);
ref_md5[i] = std::stoi(part, nullptr, 16);
}
if (memcmp(digest, ref_md5, 16) == 0) {
std::cout << "MD5 digest matches the reference MD5 digest: " << std::endl;
std::cout << "MD5 digest matches the reference MD5 digest: ";
} else {
std::cout << "MD5 digest does not match the reference MD5 digest: " << std::endl;
std::cout << "MD5 digest does not match the reference MD5 digest: ";
}
ref_md5_file.seekg(0, std::ios_base::beg);
ref_md5_file.getline(ref_md5_string, 33);
std::cout << ref_md5_string << std::endl;
ref_md5_file.close();
}
projects/rocdecode/test/testScripts/run_rocDecodeSamples.py
+2 -2
View File
@@ -141,7 +141,7 @@ if sampleMode == 0:
orig_stdout = sys.stdout
sys.stdout = open(resultsPath+'/rocDecode_test_results.csv', 'a')
echo_1 = 'File Name, Codec, Video Size, Bit Depth, Bit rate, Total Frames, Average decoding time per frame (ms), Avg FPS'
echo_1 = 'File Name, Codec, Video Size, Bit Depth, Bit rate (Mb/s), Total Frames, Average decoding time per frame (ms), Avg FPS'
print(echo_1)
sys.stdout = orig_stdout
@@ -174,7 +174,7 @@ elif sampleMode == 1:
orig_stdout = sys.stdout
sys.stdout = open(resultsPath+'/rocDecode_test_results.csv', 'a')
echo_1 = 'File Name, Num Threads, Codec, Video Size, Bit Depth, Bit rate, Total Frames, Average decoding time per frame (ms), Avg FPS'
echo_1 = 'File Name, Num Threads, Codec, Video Size, Bit Depth, Bit rate (Mb/s), Total Frames, Average decoding time per frame (ms), Avg FPS'
print(echo_1)
sys.stdout = orig_stdout