diff --git a/pasdk/test_dsp/framework/aspDecOpCircBuf_master.h b/pasdk/test_dsp/framework/aspDecOpCircBuf_master.h
index fb22448523d74151cd6612b3507ab836083eaaee..24c33b1853d26aff9804308a8031018f5f59c909 100644 (file)
#include "paftyp.h"
#include "aspDecOpCircBuf_common.h"
-#define ASP_DECOP_CB_INIT_INV_SOURCE_SEL ( ASP_DECOP_CB_ERR_START-1 ) // error: invalid source selection on init
-#define ASP_DECOP_CB_READ_UNDERFLOW ( ASP_DECOP_CB_ERR_START-2 ) // error: read underflow
-#define ASP_DECOP_CB_READ_INVSTATE ( ASP_DECOP_CB_ERR_START-3 ) // error: circular buffer invalid state on read
+#define ASP_DECOP_CB_AF_READ_UNDERFLOW ( ASP_DECOP_CB_ERR_START-1 ) // error: read AF underflow
+#define ASP_DECOP_CB_PCM_READ_UNDERFLOW ( ASP_DECOP_CB_ERR_START-2 ) // error: read PCM underflow
+#define ASP_DECOP_CB_READ_INVSTATE ( ASP_DECOP_CB_ERR_START-3 ) // error: circular buffer invalid state on read
+#define ASP_DECOP_CHECK_DRAINSTATE_ALL ( -1 ) // check circular buffer combined drain state
+
+#define DEF_STR_FRAME_LEN ( PAF_SYS_FRAMELENGTH ) // default stream frame length
// Initialize circular buffer
Int cbInit(
PAF_AST_DecOpCircBuf *pCb
);
+#if 0 // FL: moved to ARM
// Initialize circular buffer for selected source
Int cbInitSourceSel(
PAF_AST_DecOpCircBufCtl *pCbCtl, // decoder output circular buffer control
Int8 sourceSelect, // source select (PCM, DDP, etc.)
Int16 decOpFrameLen, // decoder output frame length (PCM samples)
Int16 strFrameLen, // stream frame length (PCM samples)
- Int8 resetRwFlags // whether to reset reader, writer, and empty flags
+ Int8 resetRwFlags // whether to reset reader, writer, and drain flags
+);
+#endif
+
+// Initialize circular buffer for Stream reads
+Int cbInitStreamRead(
+ PAF_AST_DecOpCircBufCtl *pCbCtl, // decoder output circular buffer control
+ Int8 cbIdx // decoder output circular buffer index
);
// Start reads from circular buffer
PAF_AudioFrame *pAfRd // audio frame into which to read
);
+// Check circular buffer drain state
+Int cbCheckDrainState(
+ PAF_AST_DecOpCircBufCtl *pCbCtl, // decoder output circular buffer control
+ Int8 cbIdx, // decoder output circular buffer index, or indicator combined drain state desired
+ Int8 *pDrainedFlag // output drain state indicator (combined or for selected circular buffer)
+);
+
+
#endif /* _ASP_DECOP_CB_MASTER_H_ */