Updated decoder tests to enable HBD

Enable 10-bit tests for YUV420 and YUV400.
YUV422 and YUV444 path has few failures, hence those are currently disabled.

Author: harishdm

tests/common/RawBuf.cpp

@@ -78,10 +78,11 @@ size_t RawBuf::planeHeight(size_t planeIdx) const {
   return 0;
 }
 
-bool RawBuf::allocBuffer(size_t width, size_t height,
+bool RawBuf::allocBuffer(size_t width, size_t height, size_t bitDepth,
                          libhevc::test::Format format, size_t alignment) {
   mWidth = width;
   mHeight = height;
+  mBitDepth = bitDepth ? bitDepth : 8;
   mFormat = format;
 
   size_t planesCount = numPlanes();
@@ -92,6 +93,7 @@ bool RawBuf::allocBuffer(size_t width, size_t height,
     mOffsets[i] = 0;
   }
 
+  size_t elementSize = (mBitDepth + 7) / 8;
   for (size_t i = 0; i < planesCount; ++i) {
     size_t w = planeWidth(i);
     size_t h = planeHeight(i);
@@ -100,7 +102,7 @@ bool RawBuf::allocBuffer(size_t width, size_t height,
     size_t alignedStride = (w + alignment - 1) & ~(alignment - 1);
     mStrides[i] = alignedStride;
     mOffsets[i] = totalSize;
-    totalSize += alignedStride * h;
+    totalSize += alignedStride * h * elementSize;
   }
 
   mStorage.resize(totalSize);

tests/common/RawBuf.h

@@ -30,8 +30,8 @@ class RawBuf {
   ~RawBuf() = default;
 
   // Allocates buffer with aligned strides for each plane based on video format.
-  bool allocBuffer(size_t width, size_t height, libhevc::test::Format format,
-                   size_t alignment = 1);
+  bool allocBuffer(size_t width, size_t height, size_t bitDepth,
+                   libhevc::test::Format format, size_t alignment = 1);
   void freeBuffer();
 
   uint8_t* planeData(size_t planeIdx);
@@ -40,6 +40,7 @@ class RawBuf {
   size_t stride(size_t planeIdx) const { return mStrides[planeIdx]; }
   size_t planeWidth(size_t planeIdx) const;
   size_t planeHeight(size_t planeIdx) const;
+  size_t bitDepth() const { return mBitDepth; }
   size_t numPlanes() const;
 
   size_t width() const { return mWidth; }
@@ -50,6 +51,7 @@ class RawBuf {
   std::vector<uint8_t> mStorage;
   size_t mWidth = 0;
   size_t mHeight = 0;
+  size_t mBitDepth = 0;
   libhevc::test::Format mFormat = libhevc::test::Format::yuv420p;
   size_t mStrides[3] = {0, 0, 0};
   size_t mOffsets[3] = {0, 0, 0};

tests/decoder/DecHelper.cpp

@@ -321,10 +321,11 @@ bool DecHelper::decodeHeader(size_t& bytesConsumed) {
   if (ret == IV_SUCCESS) {
     mWidth = decodeOp.s_ivd_video_decode_op_t.u4_pic_wd;
     mHeight = decodeOp.s_ivd_video_decode_op_t.u4_pic_ht;
+    mBitDepth = decodeOp.s_ivd_video_decode_op_t.u4_bit_depth;
     mHeaderDecoded = true;
 
     // Allocate the output reconstructed YUV frame buffer
-    if (!mOutputBuf.allocBuffer(mWidth, mHeight, mFormat)) {
+    if (!mOutputBuf.allocBuffer(mWidth, mHeight, mBitDepth, mFormat)) {
       return false;
     }
 
@@ -435,12 +436,13 @@ std::string DecHelper::computeFrameMd5(const RawBuf& buf) {
   size_t planesCount = buf.numPlanes();
   for (size_t p = 0; p < planesCount; ++p) {
     const uint8_t* planePtr = buf.planeData(p);
+    size_t pixelSize = (buf.bitDepth() + 7) / 8;
     size_t planeW = buf.planeWidth(p);
     size_t planeH = buf.planeHeight(p);
     size_t planeStride = buf.stride(p);
 
     for (size_t r = 0; r < planeH; ++r) {
-      md5.update(planePtr + (r * planeStride), planeW);
+      md5.update(planePtr + (r * planeStride * pixelSize), planeW * pixelSize);
     }
   }
 

tests/decoder/DecHelper.h

@@ -107,6 +107,7 @@ class DecHelper {
   bool mInFlushMode = false;
   size_t mWidth = 0;
   size_t mHeight = 0;
+  size_t mBitDepth = 8;
   libhevc::test::Format mFormat = libhevc::test::Format::yuv420p;
   size_t mCores = 1;
   libhevc::test::Arch mArch = libhevc::test::Arch::defaultArch;

tests/decoder/DecTests.cpp

@@ -78,7 +78,18 @@ static const std::vector<DecodeStreamConfig> kDecodeStreams = {
     {"bbb_176x144_yuv400.hevc", Format::yuv400p, "bbb_176x144_yuv400_md5.txt"},
     {"bbb_176x144_yuv420.hevc", Format::yuv420p, "bbb_176x144_yuv420_md5.txt"},
     {"bbb_176x144_yuv422.hevc", Format::yuv422p, "bbb_176x144_yuv422_md5.txt"},
-    {"bbb_176x144_yuv444.hevc", Format::yuv444p, "bbb_176x144_yuv444_md5.txt"}};
+    {"bbb_176x144_yuv444.hevc", Format::yuv444p, "bbb_176x144_yuv444_md5.txt"},
+    {"bbb_10b_176x144_yuv400.hevc", Format::yuv400p,
+     "bbb_10b_176x144_yuv400_md5.txt"},
+    {"bbb_10b_176x144_yuv420.hevc", Format::yuv420p,
+     "bbb_10b_176x144_yuv420_md5.txt"},
+    /* TODO() - enable when 10 bit format is supported
+        {"bbb_10b_176x144_yuv422.hevc", Format::yuv422p,
+         "bbb_10b_176x144_yuv422_md5.txt"},
+        {"bbb_10b_176x144_yuv444.hevc", Format::yuv444p,
+         "bbb_10b_176x144_yuv444_md5.txt"},
+    */
+};
 
 INSTANTIATE_TEST_SUITE_P(DecoderRegression, DecTestFixture,
                          ::testing::Combine(::testing::ValuesIn(kDecodeStreams),

tests/encoder/EncHelper.cpp

@@ -215,7 +215,7 @@ bool EncHelper::initEncoder() {
     return false;
   }
 
-  if (!mInputBuf.allocBuffer(mWidth, mHeight, mFormat)) {
+  if (!mInputBuf.allocBuffer(mWidth, mHeight, /* bitDepth */ 8, mFormat)) {
     deinitEncoder();
     return false;
   }