History

fix decoder win64 asm float issues

Licai Guo committed 12 years ago

Commit def55c11 parent 9efbef62 files · +7 −2Browse files

Showing the changes to codec/decoder (2 of 2 files). Show all

Unified · Split

2 files
  1. codec/decoder/plus/inc/welsDecoderExt.h +3 −1
  2. codec/decoder/plus/src/welsDecoderExt.cpp +4 −1
codec/decoder/plus/inc/welsDecoderExt.h+3−1
@@ -46,7 +46,7 @@ · 45 unmodified lines
46#include "codec_app_def.h"46#include "codec_app_def.h"
47#include "decoder_context.h"47#include "decoder_context.h"
48#include "welsCodecTrace.h"48#include "welsCodecTrace.h"
49 49#include "cpu.h"
50 50
51class ISVCDecoder;51class ISVCDecoder;
52 52
@@ -104,6 +104,8 @@ IWelsTrace* m_pTrace; · 51 unmodified lines
104void_t InitDecoder (void_t);104void_t InitDecoder (void_t);
105void_t UninitDecoder (void_t);105void_t UninitDecoder (void_t);
106 106
107XMMREG_PROTECT_DECLARE(CWelsH264Decoder);
108
107#ifdef OUTPUT_BIT_STREAM109#ifdef OUTPUT_BIT_STREAM
108WelsFileHandle* m_pFBS;110WelsFileHandle* m_pFBS;
109WelsFileHandle* m_pFBSSize;111WelsFileHandle* m_pFBSSize;
codec/decoder/plus/src/welsDecoderExt.cpp+4−1
@@ -99,7 +99,7 @@ CWelsDecoder::CWelsDecoder (void_t) · 98 unmodified lines
99 m_pTrace = CreateWelsTrace (Wels_Trace_Type);99 m_pTrace = CreateWelsTrace (Wels_Trace_Type);
100 100
101 IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::CWelsDecoder() entry");101 IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::CWelsDecoder() entry");
102 102 XMMREG_PROTECT_INIT(CWelsH264Decoder);
103 103
104#ifdef OUTPUT_BIT_STREAM104#ifdef OUTPUT_BIT_STREAM
105 SWelsTime sCurTime;105 SWelsTime sCurTime;
@@ -151,6 +151,7 @@ CWelsDecoder::~CWelsDecoder() { · 45 unmodified lines
151 IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::~CWelsDecoder()");151 IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::~CWelsDecoder()");
152 152
153 UninitDecoder();153 UninitDecoder();
154 XMMREG_PROTECT_UNINIT(CWelsH264Decoder);
154 155
155#ifdef OUTPUT_BIT_STREAM156#ifdef OUTPUT_BIT_STREAM
156 if (m_pFBS) {157 if (m_pFBS) {
@@ -384,8 +385,10 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 227 unmodified lines
384 385
385 m_pDecContext->iFeedbackTidInAu = -1; //initialize386 m_pDecContext->iFeedbackTidInAu = -1; //initialize
386 387
388 XMMREG_PROTECT_STORE(CWelsH264Decoder);
387 WelsDecodeBs (m_pDecContext, kpSrc, kiSrcLen, (unsigned char**)ppDst,389 WelsDecodeBs (m_pDecContext, kpSrc, kiSrcLen, (unsigned char**)ppDst,
388 pDstInfo); //iErrorCode has been modified in this function390 pDstInfo); //iErrorCode has been modified in this function
391 XMMREG_PROTECT_LOAD(CWelsH264Decoder);
389 392
390 pDstInfo->eWorkMode = (EDecodeMode)m_pDecContext->iDecoderMode;393 pDstInfo->eWorkMode = (EDecodeMode)m_pDecContext->iDecoderMode;
391 394

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t