From 174b6721595b201b82e5ca1606a14faedf8416ef Mon Sep 17 00:00:00 2001 From: Aryan Salmanpour Date: Mon, 6 Nov 2023 08:20:53 -0500 Subject: [PATCH] Fix a bug in GetVideoCodecString function where it didn't return the correct codec string (#35) [ROCm/rocdecode commit: 0d9b056ee5b87f0268b18a1b63aa20ee0e0c2669] --- projects/rocdecode/samples/videoDecode/videodecode.cpp | 2 +- projects/rocdecode/utils/rocvideodecode/roc_video_dec.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/rocdecode/samples/videoDecode/videodecode.cpp b/projects/rocdecode/samples/videoDecode/videodecode.cpp index a84478d143..38840f33ed 100644 --- a/projects/rocdecode/samples/videoDecode/videodecode.cpp +++ b/projects/rocdecode/samples/videoDecode/videodecode.cpp @@ -104,7 +104,7 @@ int main(int argc, char **argv) { int pciBusID, pciDomainID, pciDeviceID; viddec.GetDeviceinfo(deviceName, gcnArchName, pciBusID, pciDomainID, pciDeviceID); - std::cout << "info: Using GPU device " << deviceId << deviceName << "[" << gcnArchName << "] on PCI bus " << + std::cout << "info: Using GPU device " << deviceId << " - " << deviceName << "[" << gcnArchName << "] on PCI bus " << std::setfill('0') << std::setw(2) << std::right << std::hex << pciBusID << ":" << std::setfill('0') << std::setw(2) << std::right << std::hex << pciDomainID << "." << pciDeviceID << std::dec << std::endl; std::cout << "info: decoding started, please wait!" << std::endl; diff --git a/projects/rocdecode/utils/rocvideodecode/roc_video_dec.cpp b/projects/rocdecode/utils/rocvideodecode/roc_video_dec.cpp index b04fe3701c..8bfe24f3ca 100644 --- a/projects/rocdecode/utils/rocvideodecode/roc_video_dec.cpp +++ b/projects/rocdecode/utils/rocvideodecode/roc_video_dec.cpp @@ -91,11 +91,11 @@ static const char * GetVideoCodecString(rocDecVideoCodec eCodec) { { rocDecVideoCodec_MPEG2, "MPEG-2" }, { rocDecVideoCodec_MPEG4, "MPEG-4 (ASP)" }, { rocDecVideoCodec_H264, "AVC/H.264" }, - { rocDecVideoCodec_JPEG, "M-JPEG" }, { rocDecVideoCodec_HEVC, "H.265/HEVC" }, + { rocDecVideoCodec_AV1, "AV1" }, { rocDecVideoCodec_VP8, "VP8" }, { rocDecVideoCodec_VP9, "VP9" }, - { rocDecVideoCodec_AV1, "AV1" }, + { rocDecVideoCodec_JPEG, "M-JPEG" }, { rocDecVideoCodec_NumCodecs, "Invalid" }, };