Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

Unpack fixes #476

Closed
wants to merge 1 commit into from
Closed

Unpack fixes #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Lib/Codec/EbEncHandle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ static EB_ERRORTYPE EbEncHandleCtor(
encHandlePtr->encDecContextPtrArray = (EB_PTR*) EB_NULL;
encHandlePtr->entropyCodingContextPtrArray = (EB_PTR*) EB_NULL;
encHandlePtr->packetizationContextPtr = (EB_PTR) EB_NULL;
encHandlePtr->unpackContextPtr = (EB_PTR) EB_NULL;
encHandlePtr->unpackContextPtr = (EB_PTR*) EB_NULL;

// System Resource Managers
encHandlePtr->inputBufferResourcePtr = (EbSystemResource_t*) EB_NULL;
Expand Down
4 changes: 2 additions & 2 deletions Source/Lib/Codec/EbPackUnPack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ COMPPack_TYPE Convert_Unpack_CPack_funcPtrArray[EB_ASM_TYPE_TOTAL] =

};

typedef void(*EB_ENC_UnPack2D_TYPE)(
typedef void(*EB_ENC_UnPack2D_FUNC_TYPE)(
EB_U16 *in16BitBuffer,
EB_U32 inStride,
EB_U8 *out8BitBuffer,
Expand All @@ -77,7 +77,7 @@ typedef void(*EB_ENC_UnPack2D_TYPE)(
EB_U32 width,
EB_U32 height);

EB_ENC_UnPack2D_TYPE UnPack2D_funcPtrArray_16Bit[2][EB_ASM_TYPE_TOTAL] =
EB_ENC_UnPack2D_FUNC_TYPE FUNC_TABLE UnPack2D_funcPtrArray_16Bit[2][EB_ASM_TYPE_TOTAL] =
{
{
// C_DEFAULT
Expand Down
9 changes: 5 additions & 4 deletions Source/Lib/Codec/EbPictureOperators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,16 +509,16 @@ void UnpackL0L1AvgSafeSub(


}
void UnPack2D(
UnPackContext_t *context
void *UnPack2D(
void *context
)
{
EbObjectWrapper_t *copyFrameBufferWrapperPtr;
EbObjectWrapper_t *unpackEndSyncWrapperPtr;
EB_ENC_UnPack2D_TYPE_t *unpack;

for(;;){
EbGetFullObject(context->copyFrameOutputFifoPtr,&copyFrameBufferWrapperPtr);
EbGetFullObject(((UnPackContext_t*)context)->copyFrameOutputFifoPtr,&copyFrameBufferWrapperPtr);
EB_CHECK_END_OBJ(copyFrameBufferWrapperPtr);
unpack = (EB_ENC_UnPack2D_TYPE_t*)copyFrameBufferWrapperPtr->objectPtr;
#ifndef NON_AVX512_SUPPORT
Expand All @@ -535,10 +535,11 @@ void UnPack2D(
unpack->width,
unpack->height);

EbGetEmptyObject(context->unPackInputFifoPtr,&unpackEndSyncWrapperPtr);
EbGetEmptyObject(((UnPackContext_t *)context)->unPackInputFifoPtr,&unpackEndSyncWrapperPtr);
EbReleaseObject(copyFrameBufferWrapperPtr);
EbPostFullObject(unpackEndSyncWrapperPtr);
}
return EB_NULL;
}

void Pack2D_SRC(
Expand Down
4 changes: 2 additions & 2 deletions Source/Lib/Codec/EbPictureOperators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ void Pack2D_SRC(
EB_U32 width,
EB_U32 height);

void UnPack2D(
UnPackContext_t *context);
void*UnPack2D(
void *context);

void extract8Bitdata(
EB_U16 *in16BitBuffer,
Expand Down