Skip to content

Commit

Permalink
[Decode] Remove all SW Decoder related code for Jpeg
Browse files Browse the repository at this point in the history
Jpeg SW decoder removal
  • Loading branch information
chuanli1 authored and gfxVPLsdm committed Sep 19, 2024
1 parent b089984 commit cf0cd53
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 3,282 deletions.
38 changes: 1 addition & 37 deletions _studio/mfx_lib/decode/mjpeg/include/mfx_mjpeg_dec_decode.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2004-2020 Intel Corporation
// Copyright (c) 2004-2024 Intel Corporation
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -32,10 +32,6 @@

#include <mutex>

#ifdef MFX_ENABLE_JPEG_SW_FALLBACK
#include <queue>
#endif

#include "mfx_task.h"
#include "umc_media_data.h"

Expand Down Expand Up @@ -134,38 +130,6 @@ class VideoDECODEMJPEGBase_HW : public VideoDECODEMJPEGBase
UMC::VideoAccelerator * m_va;
};

#ifdef MFX_ENABLE_JPEG_SW_FALLBACK
// Forward declaration of used classes
class CJpegTask;

class VideoDECODEMJPEGBase_SW : public VideoDECODEMJPEGBase
{
public:
VideoDECODEMJPEGBase_SW();

mfxStatus Init(mfxVideoParam *decPar, mfxFrameAllocRequest *request, mfxFrameAllocResponse *response, mfxFrameAllocRequest *request_internal, bool isUseExternalFrames, VideoCORE *core) override;
mfxStatus Reset(mfxVideoParam *par) override;
mfxStatus Close(void) override;

mfxStatus GetVideoParam(mfxVideoParam *par) override;
mfxStatus RunThread(void *pParam, mfxU32 threadNumber, mfxU32 callNumber) override;
mfxStatus CompleteTask(void *pParam, mfxStatus taskRes) override;
mfxStatus CheckTaskAvailability(mfxU32 maxTaskNumber) override;
mfxStatus ReserveUMCDecoder(UMC::MJPEGVideoDecoderBaseMFX* &pMJPEGVideoDecoder, mfxFrameSurface1 *surf) override;
void ReleaseReservedTask() override;
mfxStatus AddPicture(UMC::MediaDataEx *pSrcData, mfxU32 & numPic) override;
mfxStatus AllocateFrameData(UMC::FrameData *&data) override;
mfxStatus FillEntryPoint(MFX_ENTRY_POINT *pEntryPoint, mfxFrameSurface1 *surface_work, mfxFrameSurface1 *surface_out) override;

protected:
CJpegTask *pLastTask;
// Free tasks queue (if SW is used)
std::queue<std::unique_ptr<CJpegTask>> m_freeTasks;
// Count of created tasks (if SW is used)
mfxU16 m_tasksCount;
};
#endif

class VideoDECODEMJPEG : public VideoDECODE
{
public:
Expand Down
Loading

0 comments on commit cf0cd53

Please sign in to comment.