pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix encode

Browse Source
This commit is contained in:
Prokhorov Kirill
2025-07-07 18:01:25 +03:00
parent 8c6a26895b
commit 29355d337b
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/raster/BgraFrame.cpp
View File

@ -584,7 +584,7 @@ bool CBgraFrame::SaveFile(const std::wstring& strFileName, unsigned int nFileTyp
#if CXIMAGE_SUPPORT_HEIF
if (CXIMAGE_FORMAT_HEIF == nFileType)
{
return NSHeif::CHeifFile::Save(m_pData, m_lWidth, m_lHeight, strFileName);
return NSHeif::CHeifFile::Save(m_pData, m_lWidth, m_lHeight, m_lStride, strFileName);
}
#endif

26
DesktopEditor/raster/heif/heif.cpp
View File

@ -13,7 +13,7 @@ namespace NSHeif {
{
heif_context* ctx = heif_context_alloc();
defer(heif_context_free(ctx););
return !IsError(heif_context_read_from_memory(ctx, buffer, size, nullptr));
return !IsError(heif_context_read_from_memory_without_copy(ctx, buffer, size, nullptr));
}
bool CHeifFile::Open(CBgraFrame *frame, const std::wstring& fileName)
@ -29,17 +29,17 @@ namespace NSHeif {
{
heif_context* ctx = heif_context_alloc();
defer(heif_context_free(ctx););
if (IsError(heif_context_read_from_memory(ctx, buffer, size, nullptr)))
if (IsError(heif_context_read_from_memory_without_copy(ctx, buffer, size, nullptr)))
return false;
return Decode(ctx, frame);
}
bool CHeifFile::Save(const BYTE* source, int width, int height, const std::wstring& dstPath)
bool CHeifFile::Save(const BYTE* source, int width, int height, int sourceStride, const std::wstring& dstPath)
{
if (!source)
return false;
heif_image* img = nullptr;
heif_image* img;
defer(heif_image_release(img););
if (IsError(heif_image_create(width, height, heif_colorspace_RGB, heif_chroma_interleaved_RGB, &img)))
@ -56,27 +56,29 @@ namespace NSHeif {
for (size_t i = 0; i < height; ++i)
{
const BYTE* row = source + i * stride;
const BYTE* row = source + (height - i - 1) * (sourceStride < 0 ? -sourceStride : sourceStride);
for (size_t j = 0; j < width; ++j)
{
data[(i * width + j) * 3 + 0] = row[j * 3 + 2];
data[(i * width + j) * 3 + 1] = row[j * 3 + 1];
data[(i * width + j) * 3 + 2] = row[j * 3 + 0];
data[(i * width + j) * 3 + 0] = row[(width - j - 1) * 4 + 2];
data[(i * width + j) * 3 + 1] = row[(width - j - 1) * 4 + 1];
data[(i * width + j) * 3 + 2] = row[(width - j - 1) * 4 + 0];
}
}
heif_context* ctx = heif_context_alloc();
defer(heif_context_free(ctx););
heif_encoder* encoder = nullptr;
const heif_plugin_info *inf;
if (IsError(heif_load_plugin(m_sPluginPath, &inf)))
return false;
heif_encoder* encoder;
defer(heif_encoder_release(encoder););
if (IsError(heif_context_get_encoder_for_format(ctx, heif_compression_HEVC, &encoder)))
return false;
if (IsError(heif_encoder_set_lossy_quality(encoder, 80)))
return false;
if (IsError(heif_context_encode_image(ctx, img, encoder, nullptr, nullptr)))
return false;

9
DesktopEditor/raster/heif/heif.h
View File

@ -24,11 +24,18 @@ namespace NSHeif {
static bool Open(CBgraFrame* frame, const std::wstring& fileName);
static bool Open(CBgraFrame* frame, BYTE* buffer, DWORD size);
static bool Save(const BYTE* source, int width, int height, const std::wstring& dstPath);
static bool Save(const BYTE* source, int width, int height, int sourceStride, const std::wstring& dstPath);
private:
static inline bool IsError(heif_error err);
static inline bool Decode(heif_context* ctx, CBgraFrame* frame);
static inline NSUnicodeConverter::CUnicodeConverter m_oConverter{};
#if defined(_WIN32) || defined(_WIN32_WCE) || defined(_WIN64)
static inline const char* m_sPluginPath = "..\\..\\..\\Common\\3dParty\\heif\\libheif\\libheif\\api\\libheif\\libheif\\plugins\\Release\\heif-x265.dll";
#elif defined(_LINUX)
static inline const char* m_sPluginPath = "../../../Common/3dParty/heif/libheif/libheif/api/libheif/libheif/plugins/libheif-x265.so";
#else
static inline const char* m_sPluginPath = "../../../Common/3dParty/heif/libheif/libheif/api/libheif/libheif/plugins/libheif-x265.dylib";
#endif
};
}