add API only for decode parser for HW decoding support

huili2 committed 12 years ago

Commit efdefdb1 parent e4b373a6 files · +40 −4Browse files

Unified · Split

6 files

       unsigned char** ppDst,
       SBufferInfo* pDstInfo) = 0;
+  /*
+   * This function parse input bitstream only, and rewrite possible SVC syntax to AVC syntax
+   * return: 0 - success; otherwise -failed;
+   */
+  virtual DECODING_STATE EXTAPI DecodeParser (const unsigned char* pSrc,
+      const int iSrcLen,
+      SParserBsInfo* pDstInfo) = 0;
   /*
    *  this API does not work for now!! This is for future use to support non-I420 color format output.
    */
                                 unsigned char** ppDst,
                                 SBufferInfo* pDstInfo);
+DECODING_STATE (*DecodeParser) (ISVCDecoder*, const unsigned char* pSrc,
+                                const int iSrcLen,
+                                SParserBsInfo* pDstInfo);
 DECODING_STATE (*DecodeFrameEx) (ISVCDecoder*, const unsigned char* pSrc,
                                  const int iSrcLen,
                                  unsigned char* pDst,

@@ -447,4 +447,12 @@ typedef struct TagDecoderCapability { · 446 unmodified lines
447	bool bRedPicCap;	447	bool bRedPicCap;
448	} SDecoderCapability;	448	} SDecoderCapability;
449		449
		450	typedef struct TagParserBsInfo {
		451	int iNalNum; //total NAL number in current AU
		452	int iNalLenInByte [MAX_NAL_UNITS_IN_LAYER]; //each nal length
		453	unsigned char* pDstBuff; //outputted dst buffer for parsed bitstream
		454	int iSpsWidthInPixel; //required SPS width info
		455	int iSpsHeightInPixel; //required SPS height info
		456	} SParserBsInfo, PParserBsInfo;
		457
450	#endif//WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__	458	#endif//WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__

     const int kiSrcLen,
     unsigned char** ppDst,
     SBufferInfo* pDstInfo);
+virtual DECODING_STATE EXTAPI DecodeParser (const unsigned char* kpSrc,
+    const int kiSrcLen,
+    SParserBsInfo* pDstInfo);
 virtual DECODING_STATE EXTAPI DecodeFrameEx (const unsigned char* kpSrc,
     const int kiSrcLen,
     unsigned char* pDst,

@@ -453,6 +453,13 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 452 unmodified lines
453	return dsErrorFree;	453	return dsErrorFree;
454	}	454	}
455		455
		456	DECODING_STATE CWelsDecoder::DecodeParser (const unsigned char* kpSrc,
		457	const int kiSrcLen,
		458	SParserBsInfo* pDstInfo) {
		459	//TODO, add function here
		460	return (DECODING_STATE) m_pDecContext->iErrorCode;
		461	}
		462
456	DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc,	463	DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc,
457	const int kiSrcLen,	464	const int kiSrcLen,
458	unsigned char** ppDst,	465	unsigned char** ppDst,

   CHECK(3, p, DecodeFrame);
   CHECK(4, p, DecodeFrame2);
   CHECK(5, p, DecodeFrameEx);
-  CHECK(6, p, SetOption);
+  CHECK(6, p, DecodeParser);
-  CHECK(7, p, GetOption);
+  CHECK(7, p, SetOption);
+  CHECK(8, p, GetOption);
 }
 struct bool_test_struct {

     EXPECT_TRUE (gThis == this);
     return static_cast<DECODING_STATE> (5);
   }
+  virtual DECODING_STATE EXTAPI DecodeParser (const unsigned char* pSrc,
+      const int iSrcLen, SParserBsInfo* pDstInfo) {
+    EXPECT_TRUE (gThis == this);
+    return static_cast<DECODING_STATE> (6);
+  }
   virtual long EXTAPI SetOption (DECODER_OPTION eOptionId, void* pOption) {
     EXPECT_TRUE (gThis == this);
-    return 6;
+    return 7;
   }
   virtual long EXTAPI GetOption (DECODER_OPTION eOptionId, void* pOption) {
     EXPECT_TRUE (gThis == this);
-    return 7;
+    return 8;
   }
 };

Keyboard shortcuts