summaryrefslogtreecommitdiff
path: root/core/fxcodec/codec
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcodec/codec')
-rw-r--r--core/fxcodec/codec/ccodec_gifmodule.cpp128
-rw-r--r--core/fxcodec/codec/ccodec_gifmodule.h2
2 files changed, 26 insertions, 104 deletions
diff --git a/core/fxcodec/codec/ccodec_gifmodule.cpp b/core/fxcodec/codec/ccodec_gifmodule.cpp
index b53880587e..33d74a9da4 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.cpp
+++ b/core/fxcodec/codec/ccodec_gifmodule.cpp
@@ -8,74 +8,10 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/lgif/cgifdecompressor.h"
#include "core/fxcodec/lgif/fx_gif.h"
#include "core/fxge/fx_dib.h"
-
-struct FXGIF_Context {
- gif_decompress_struct_p gif_ptr;
- void* parent_ptr;
-
- void* (*m_AllocFunc)(unsigned int);
- void (*m_FreeFunc)(void*);
-};
-
-extern "C" {
-static void* gif_alloc_func(unsigned int size) {
- return FX_Alloc(char, size);
-}
-static void gif_free_func(void* p) {
- FX_Free(p);
-}
-};
-
-static void gif_error_data(gif_decompress_struct_p gif_ptr,
- const char* err_msg) {
- strncpy((char*)gif_ptr->err_ptr, err_msg, GIF_MAX_ERROR_SIZE - 1);
- longjmp(gif_ptr->jmpbuf, 1);
-}
-
-static uint8_t* gif_ask_buf_for_pal(gif_decompress_struct_p gif_ptr,
- int32_t pal_size) {
- FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr;
- CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr;
- return pModule->GetDelegate()->GifAskLocalPaletteBuf(
- gif_get_frame_num(gif_ptr), pal_size);
-}
-
-static void gif_record_current_position(gif_decompress_struct_p gif_ptr,
- uint32_t* cur_pos_ptr) {
- FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr;
- CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr;
- pModule->GetDelegate()->GifRecordCurrentPosition(*cur_pos_ptr);
-}
-
-static void gif_read_scanline(gif_decompress_struct_p gif_ptr,
- int32_t row_num,
- uint8_t* row_buf) {
- FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr;
- CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr;
- pModule->GetDelegate()->GifReadScanline(row_num, row_buf);
-}
-
-static bool gif_get_record_position(gif_decompress_struct_p gif_ptr,
- uint32_t cur_pos,
- int32_t left,
- int32_t top,
- int32_t width,
- int32_t height,
- int32_t pal_num,
- void* pal_ptr,
- int32_t delay_time,
- bool user_input,
- int32_t trans_index,
- int32_t disposal_method,
- bool interlace) {
- FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr;
- CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr;
- return pModule->GetDelegate()->GifInputRecordPositionBuf(
- cur_pos, FX_RECT(left, top, left + width, top + height), pal_num, pal_ptr,
- delay_time, user_input, trans_index, disposal_method, interlace);
-}
+#include "third_party/base/ptr_util.h"
CCodec_GifModule::CCodec_GifModule() {
memset(m_szLastError, 0, sizeof(m_szLastError));
@@ -89,29 +25,15 @@ FXGIF_Context* CCodec_GifModule::Start() {
return nullptr;
memset(p, 0, sizeof(FXGIF_Context));
- p->m_AllocFunc = gif_alloc_func;
- p->m_FreeFunc = gif_free_func;
- p->gif_ptr = nullptr;
p->parent_ptr = this;
- p->gif_ptr = gif_create_decompress();
- if (!p->gif_ptr) {
- FX_Free(p);
- return nullptr;
- }
- p->gif_ptr->context_ptr = p;
- p->gif_ptr->err_ptr = m_szLastError;
- p->gif_ptr->gif_error_fn = gif_error_data;
- p->gif_ptr->gif_ask_buf_for_pal_fn = gif_ask_buf_for_pal;
- p->gif_ptr->gif_record_current_position_fn = gif_record_current_position;
- p->gif_ptr->gif_get_row_fn = gif_read_scanline;
- p->gif_ptr->gif_get_record_position_fn = gif_get_record_position;
+ p->m_Gif = pdfium::MakeUnique<CGifDecompressor>(p, m_szLastError);
return p;
}
void CCodec_GifModule::Finish(FXGIF_Context* ctx) {
if (ctx) {
- gif_destroy_decompress(&ctx->gif_ptr);
- ctx->m_FreeFunc(ctx);
+ ctx->m_Gif = nullptr;
+ FX_Free(ctx);
}
}
@@ -122,52 +44,52 @@ GifDecodeStatus CCodec_GifModule::ReadHeader(FXGIF_Context* ctx,
void** pal_pp,
int* bg_index,
CFX_DIBAttribute* pAttribute) {
- if (setjmp(ctx->gif_ptr->jmpbuf))
+ if (setjmp(ctx->m_Gif->jmpbuf))
return GifDecodeStatus::Error;
- GifDecodeStatus ret = gif_read_header(ctx->gif_ptr);
+ GifDecodeStatus ret = gif_read_header(ctx->m_Gif.get());
if (ret != GifDecodeStatus::Success)
return ret;
- *width = ctx->gif_ptr->width;
- *height = ctx->gif_ptr->height;
- *pal_num = ctx->gif_ptr->global_pal_num;
- *pal_pp = ctx->gif_ptr->global_pal_ptr;
- *bg_index = ctx->gif_ptr->bc_index;
+ *width = ctx->m_Gif->width;
+ *height = ctx->m_Gif->height;
+ *pal_num = ctx->m_Gif->global_pal_num;
+ *pal_pp = ctx->m_Gif->m_GlobalPalette.data();
+ *bg_index = ctx->m_Gif->bc_index;
return GifDecodeStatus::Success;
}
GifDecodeStatus CCodec_GifModule::LoadFrameInfo(FXGIF_Context* ctx,
int* frame_num) {
- if (setjmp(ctx->gif_ptr->jmpbuf))
+ if (setjmp(ctx->m_Gif->jmpbuf))
return GifDecodeStatus::Error;
- GifDecodeStatus ret = gif_get_frame(ctx->gif_ptr);
+ GifDecodeStatus ret = gif_get_frame(ctx->m_Gif.get());
if (ret != GifDecodeStatus::Success)
return ret;
- *frame_num = gif_get_frame_num(ctx->gif_ptr);
+ *frame_num = gif_get_frame_num(ctx->m_Gif.get());
return GifDecodeStatus::Success;
}
GifDecodeStatus CCodec_GifModule::LoadFrame(FXGIF_Context* ctx,
int frame_num,
CFX_DIBAttribute* pAttribute) {
- if (setjmp(ctx->gif_ptr->jmpbuf))
+ if (setjmp(ctx->m_Gif->jmpbuf))
return GifDecodeStatus::Error;
- GifDecodeStatus ret = gif_load_frame(ctx->gif_ptr, frame_num);
+ GifDecodeStatus ret = gif_load_frame(ctx->m_Gif.get(), frame_num);
if (ret == GifDecodeStatus::Success) {
if (pAttribute) {
pAttribute->m_nGifLeft =
- (*ctx->gif_ptr->img_ptr_arr_ptr)[frame_num]->image_info_ptr->left;
+ (*ctx->m_Gif->img_ptr_arr_ptr)[frame_num]->image_info_ptr->left;
pAttribute->m_nGifTop =
- (*ctx->gif_ptr->img_ptr_arr_ptr)[frame_num]->image_info_ptr->top;
- pAttribute->m_fAspectRatio = ctx->gif_ptr->pixel_aspect;
- if (ctx->gif_ptr->cmt_data_ptr) {
+ (*ctx->m_Gif->img_ptr_arr_ptr)[frame_num]->image_info_ptr->top;
+ pAttribute->m_fAspectRatio = ctx->m_Gif->pixel_aspect;
+ if (ctx->m_Gif->cmt_data_ptr) {
const uint8_t* buf =
- (const uint8_t*)ctx->gif_ptr->cmt_data_ptr->GetBuffer(0);
- uint32_t len = ctx->gif_ptr->cmt_data_ptr->GetLength();
+ (const uint8_t*)ctx->m_Gif->cmt_data_ptr->GetBuffer(0);
+ uint32_t len = ctx->m_Gif->cmt_data_ptr->GetLength();
if (len > 21) {
uint8_t size = *buf++;
if (size) {
@@ -189,11 +111,11 @@ GifDecodeStatus CCodec_GifModule::LoadFrame(FXGIF_Context* ctx,
uint32_t CCodec_GifModule::GetAvailInput(FXGIF_Context* ctx,
uint8_t** avail_buf_ptr) {
- return gif_get_avail_input(ctx->gif_ptr, avail_buf_ptr);
+ return gif_get_avail_input(ctx->m_Gif.get(), avail_buf_ptr);
}
void CCodec_GifModule::Input(FXGIF_Context* ctx,
const uint8_t* src_buf,
uint32_t src_size) {
- gif_input_buffer(ctx->gif_ptr, (uint8_t*)src_buf, src_size);
+ gif_input_buffer(ctx->m_Gif.get(), (uint8_t*)src_buf, src_size);
}
diff --git a/core/fxcodec/codec/ccodec_gifmodule.h b/core/fxcodec/codec/ccodec_gifmodule.h
index b42a86642b..c4298224b3 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.h
+++ b/core/fxcodec/codec/ccodec_gifmodule.h
@@ -12,7 +12,7 @@
#include "core/fxcrt/fx_system.h"
class CFX_DIBAttribute;
-struct FXGIF_Context;
+class FXGIF_Context;
class CCodec_GifModule {
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:01:03 +0000