brotli + zstdmd update

2025-12-09 06:07:05 -06:00 · 2017-05-21 23:47:30 +02:00
parent 48ee1afd50
commit 294d7a00dc
144 changed files with 49097 additions and 24 deletions
--- a/CPP/7zip/Compress/LizardEncoder.cpp
+++ b/CPP/7zip/Compress/LizardEncoder.cpp
@@ -0,0 +1,140 @@
+// (C) 2016 Tino Reichardt
+
+#include "StdAfx.h"
+#include "LizardEncoder.h"
+#include "LizardDecoder.h"
+
+#ifndef EXTRACT_ONLY
+namespace NCompress {
+namespace NLIZARD {
+
+CEncoder::CEncoder():
+  _processedIn(0),
+  _processedOut(0),
+  _inputSize(0),
+  _ctx(NULL),
+  _numThreads(NWindows::NSystem::GetNumberOfProcessors())
+{
+  _props.clear();
+}
+
+CEncoder::~CEncoder()
+{
+  if (_ctx)
+    LIZARDMT_freeCCtx(_ctx);
+}
+
+HRESULT CEncoder::ErrorOut(size_t code)
+{
+  const char *strError = LIZARDMT_getErrorString(code);
+  wchar_t wstrError[200+5]; /* no malloc here, /TR */
+
+  mbstowcs(wstrError, strError, 200);
+  MessageBoxW(0, wstrError, L"7-Zip ZStandard", MB_ICONERROR | MB_OK);
+  MyFree(wstrError);
+
+  return S_FALSE;
+}
+
+STDMETHODIMP CEncoder::SetCoderProperties(const PROPID * propIDs, const PROPVARIANT * coderProps, UInt32 numProps)
+{
+  _props.clear();
+
+  for (UInt32 i = 0; i < numProps; i++)
+  {
+    const PROPVARIANT & prop = coderProps[i];
+    PROPID propID = propIDs[i];
+    UInt32 v = (UInt32)prop.ulVal;
+    switch (propID)
+    {
+    case NCoderPropID::kLevel:
+      {
+        if (prop.vt != VT_UI4)
+          return E_INVALIDARG;
+
+        /* level 1..22 */
+        _props._level = static_cast < Byte > (prop.ulVal);
+        Byte mylevel = static_cast < Byte > (LIZARDMT_LEVEL_MAX);
+        if (_props._level > mylevel)
+          _props._level = mylevel;
+
+        break;
+      }
+    case NCoderPropID::kNumThreads:
+      {
+        SetNumberOfThreads(v);
+        break;
+      }
+    default:
+      {
+        break;
+      }
+    }
+  }
+
+  return S_OK;
+}
+
+STDMETHODIMP CEncoder::WriteCoderProperties(ISequentialOutStream * outStream)
+{
+  return WriteStream(outStream, &_props, sizeof (_props));
+}
+
+STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
+  ISequentialOutStream *outStream, const UInt64 * /*inSize*/ ,
+  const UInt64 * /*outSize */, ICompressProgressInfo *progress)
+{
+  LIZARDMT_RdWr_t rdwr;
+  size_t result;
+  HRESULT res = S_OK;
+
+  struct LizardStream Rd;
+  Rd.inStream = inStream;
+  Rd.outStream = outStream;
+  Rd.processedIn = &_processedIn;
+  Rd.processedOut = &_processedOut;
+
+  struct LizardStream Wr;
+  if (_processedIn == 0)
+    Wr.progress = progress;
+  else
+    Wr.progress = 0;
+  Wr.inStream = inStream;
+  Wr.outStream = outStream;
+  Wr.processedIn = &_processedIn;
+  Wr.processedOut = &_processedOut;
+
+  /* 1) setup read/write functions */
+  rdwr.fn_read = ::LizardRead;
+  rdwr.fn_write = ::LizardWrite;
+  rdwr.arg_read = (void *)&Rd;
+  rdwr.arg_write = (void *)&Wr;
+
+  /* 2) create compression context, if needed */
+  if (!_ctx)
+    _ctx = LIZARDMT_createCCtx(_numThreads, _props._level, _inputSize);
+  if (!_ctx)
+    return S_FALSE;
+
+  /* 3) compress */
+  result = LIZARDMT_compressCCtx(_ctx, &rdwr);
+  if (LIZARDMT_isError(result)) {
+    if (result == (size_t)-LIZARDMT_error_canceled)
+      return E_ABORT;
+    return ErrorOut(result);
+  }
+
+  return res;
+}
+
+STDMETHODIMP CEncoder::SetNumberOfThreads(UInt32 numThreads)
+{
+  const UInt32 kNumThreadsMax = LIZARDMT_THREAD_MAX;
+  if (numThreads < 1) numThreads = 1;
+  if (numThreads > kNumThreadsMax) numThreads = kNumThreadsMax;
+  _numThreads = numThreads;
+  return S_OK;
+}
+
+}}
+#endif