Skip to content

Commit dc4d003

Browse files
luleilei1intel-mediadev
authored andcommitted
Revert "[Decode] [PDVT-SH] VP9 CRC Output Enable"
This reverts commit intel-innersource/drivers.gpu.unified#f220b5e59
1 parent 3673d20 commit dc4d003

File tree

7 files changed

+0
-266
lines changed

7 files changed

+0
-266
lines changed

media_softlet/agnostic/common/codec/hal/dec/vp9/packet/decode_vp9_debug_packet.cpp

Lines changed: 0 additions & 90 deletions
This file was deleted.

media_softlet/agnostic/common/codec/hal/dec/vp9/packet/decode_vp9_debug_packet.h

Lines changed: 0 additions & 112 deletions
This file was deleted.

media_softlet/agnostic/common/codec/hal/dec/vp9/packet/decode_vp9_packet.cpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,6 @@ MOS_STATUS Vp9DecodePkt::Init()
6464
m_allocator = m_vp9Pipeline->GetDecodeAllocator();
6565
DECODE_CHK_NULL(m_allocator);
6666

67-
#if (_DEBUG || _RELEASE_INTERNAL)
68-
// Initialize debug packet
69-
DecodeSubPacket* subPacket = m_vp9Pipeline->GetSubPacket(
70-
DecodePacketId(m_vp9Pipeline, vp9DebugSubPacketId));
71-
m_debugPkt = dynamic_cast<Vp9DecodeDebugPkt*>(subPacket);
72-
if (m_debugPkt != nullptr)
73-
{
74-
DECODE_CHK_STATUS(m_debugPkt->Init());
75-
}
76-
#endif
77-
7867
return MOS_STATUS_SUCCESS;
7968
}
8069

@@ -94,14 +83,6 @@ MOS_STATUS Vp9DecodePkt::Prepare()
9483

9584
MOS_STATUS Vp9DecodePkt::Destroy()
9685
{
97-
#if (_DEBUG || _RELEASE_INTERNAL)
98-
// Destroy debug packet
99-
if (m_debugPkt != nullptr)
100-
{
101-
DECODE_CHK_STATUS(m_debugPkt->Destroy());
102-
}
103-
#endif
104-
10586
m_statusReport->UnregistObserver(this);
10687
return MOS_STATUS_SUCCESS;
10788
}
@@ -199,14 +180,6 @@ MOS_STATUS Vp9DecodePkt::Completed(void *mfxStatus, void *rcsStatus, void *statu
199180
DECODE_VERBOSEMESSAGE("Index = %d", statusReportData->currDecodedPic.FrameIdx);
200181
DECODE_VERBOSEMESSAGE("FrameCrc = 0x%x", statusReportData->frameCrc);
201182

202-
#if (_DEBUG || _RELEASE_INTERNAL)
203-
// Call debug packet completion handling for HCP debug functionality
204-
if (m_debugPkt != nullptr)
205-
{
206-
DECODE_CHK_STATUS(m_debugPkt->Completed());
207-
}
208-
#endif
209-
210183
return MOS_STATUS_SUCCESS;
211184
}
212185

@@ -304,13 +277,6 @@ MOS_STATUS Vp9DecodePkt::EndStatusReport(uint32_t srType, MOS_COMMAND_BUFFER* cm
304277
DECODE_FUNC_CALL();
305278
DECODE_CHK_NULL(cmdBuffer);
306279
DECODE_CHK_STATUS(ReadHcpStatus(m_statusReport, *cmdBuffer));
307-
#if (_DEBUG || _RELEASE_INTERNAL)
308-
// Execute debug packet for HCP debug functionality
309-
if (m_debugPkt != nullptr)
310-
{
311-
DECODE_CHK_STATUS(m_debugPkt->Execute(*cmdBuffer, m_statusReport));
312-
}
313-
#endif
314280
DECODE_CHK_STATUS(MediaPacket::EndStatusReportNext(srType, cmdBuffer));
315281

316282
MediaPerfProfiler *perfProfiler = MediaPerfProfiler::Instance();

media_softlet/agnostic/common/codec/hal/dec/vp9/packet/decode_vp9_packet.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,8 @@
3535
#include "decode_vp9_picture_packet.h"
3636
#include "decode_vp9_slice_packet.h"
3737

38-
#if (_DEBUG || _RELEASE_INTERNAL)
39-
#include "decode_vp9_debug_packet.h"
40-
#endif
41-
4238
namespace decode
4339
{
44-
45-
class Vp9DecodeDebugPkt;
46-
4740
class Vp9DecodePkt : public CmdPacket, public MediaStatusReportObserver
4841
{
4942
public:
@@ -122,10 +115,6 @@ class Vp9DecodePkt : public CmdPacket, public MediaStatusReportObserver
122115
uint32_t m_sliceStatesSize = 0;
123116
uint32_t m_slicePatchListSize = 0;
124117

125-
#if (_DEBUG || _RELEASE_INTERNAL)
126-
Vp9DecodeDebugPkt* m_debugPkt = nullptr;
127-
#endif
128-
129118
MEDIA_CLASS_DEFINE_END(decode__Vp9DecodePkt)
130119
};
131120

media_softlet/agnostic/common/codec/hal/dec/vp9/packet/media_srcs.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ set(SOFTLET_DECODE_VP9_SOURCES_
2929
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_picture_packet.cpp
3030
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_slice_packet.cpp
3131
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_downsampling_packet.cpp
32-
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_debug_packet.cpp
3332
)
3433

3534
set(SOFTLET_DECODE_VP9_HEADERS_
@@ -42,7 +41,6 @@ set(SOFTLET_DECODE_VP9_HEADERS_
4241
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_picture_packet.h
4342
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_slice_packet.h
4443
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_downsampling_packet.h
45-
${CMAKE_CURRENT_LIST_DIR}/decode_vp9_debug_packet.h
4644
)
4745
source_group( CodecHalNext\\Shared\\Decode FILES ${SOFTLET_DECODE_VP9_SOURCES_} ${SOFTLET_DECODE_VP9_HEADERS_} )
4846

media_softlet/agnostic/common/codec/hal/dec/vp9/pipeline/decode_vp9_pipeline.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
#include "decode_vp9_feature_manager.h"
3333
#include "decode_vp9_buffer_update.h"
3434
#include "media_debug_fast_dump.h"
35-
#if (_DEBUG || _RELEASE_INTERNAL)
36-
#include "decode_vp9_debug_packet.h"
37-
#endif
3835

3936
namespace decode
4037
{
@@ -175,19 +172,6 @@ MOS_STATUS Vp9Pipeline::CreateSubPackets(DecodeSubPacketManager &subPacketManage
175172

176173
DECODE_CHK_STATUS(DecodePipeline::CreateSubPackets(subPacketManager, codecSettings));
177174

178-
#if (_DEBUG || _RELEASE_INTERNAL)
179-
// Create VP9 debug packet
180-
Vp9DecodeDebugPkt *debugPkt = MOS_New(Vp9DecodeDebugPkt, this, m_hwInterface);
181-
DECODE_CHK_NULL(debugPkt);
182-
MOS_STATUS status = subPacketManager.Register(
183-
DecodePacketId(this, vp9DebugSubPacketId), *debugPkt);
184-
if (status != MOS_STATUS_SUCCESS)
185-
{
186-
MOS_Delete(debugPkt);
187-
return status;
188-
}
189-
#endif
190-
191175
return MOS_STATUS_SUCCESS;
192176
}
193177

media_softlet/agnostic/common/codec/hal/dec/vp9/pipeline/decode_vp9_pipeline.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ class Vp9Pipeline : public DecodePipeline
6868
DeclareDecodePacketId(vp9PictureSubPacketId);
6969
DeclareDecodePacketId(vp9SliceSubPacketId);
7070
DeclareDecodePacketId(vp9TileSubPacketId);
71-
DeclareDecodePacketId(vp9DebugSubPacketId);
7271

7372
protected:
7473
//!

0 commit comments

Comments
 (0)