Split Decoder Output Circular Buffer code between Master (DSP:init,read) and Slave...

[processor-sdk/performance-audio-sr.git] / processor_audio_sdk_1_00_00_00 / pasdk / common / aspDecOpCircBuf_common.h

diff --git a/processor_audio_sdk_1_00_00_00/pasdk/common/paf_decOpCircBuf.h b/processor_audio_sdk_1_00_00_00/pasdk/common/aspDecOpCircBuf_common.h
similarity index 57%
rename from processor_audio_sdk_1_00_00_00/pasdk/common/paf_decOpCircBuf.h
rename to processor_audio_sdk_1_00_00_00/pasdk/common/aspDecOpCircBuf_common.h
index 96d4d4c6ab046497e474f92c668948801758d8dc..f3b90f4d545b91f203628047ed84d73e7b789a2f 100644 (file)
--- a/processor_audio_sdk_1_00_00_00/pasdk/common/paf_decOpCircBuf.h
+++ b/processor_audio_sdk_1_00_00_00/pasdk/common/aspDecOpCircBuf_common.h
@@ -33,23 +33,20 @@ All rights reserved.
 *
 */
 
 *
 */
 

-#ifndef _DEC_OP_CIRC_BUF_H_
-#define _DEC_OP_CIRC_BUF_H_
+#ifndef _ASP_DECOP_CB_COMMON_H_
+#define _ASP_DECOP_CB_COMMON_H_

 
 #include <xdc/std.h>
 #include "paftyp.h"
 
 
 #include <xdc/std.h>
 #include "paftyp.h"
 

-#define PAF_DECOP_CB_SOK                    (  0 )      // ok
-#define PAF_DECOP_CB_INIT_INV_SOURCE_SEL    ( -1 )      // error: invalid source selection on init
-#define PAF_DECOP_CB_WRITE_OVERFLOW         ( -2 )      // error: write overflow
-#define PAF_DECOP_CB_READ_UNDERFLOW         ( -3 )      // error: read underflow
-#define PAF_DECOP_CB_READ_INVSTATE          ( -4 )      // error: circular buffer invalid state on read
+#define ASP_DECOP_CB_SOK                    (  0 )      // ok
+
+#define ASP_DECOP_CB_MAX_NUM_AF             ( 4 )       // decoder output circular buffer maximum number audio frames
+#define ASP_DECOP_CB_MAX_NUM_PCM_CH         ( 16 )      // decoder output circular buffer maximum number audio PCM channels
+#define ASP_DECOP_CB_MAX_NUM_PCM_FRAMES     ( 2 )       // decoder output circular buffer maximum number PCM frames //Qin - Increased to prevent cb overflow for ddp.
+#define ASP_DECOP_CB_MAX_PCM_FRAME_LEN      ( 6*256 )   // decoder output circular buffer maximum PCM frame length
+#define ASP_DECOP_CB_PCM_BUF_SZ             ( ASP_DECOP_CB_MAX_NUM_PCM_CH * ASP_DECOP_CB_MAX_NUM_PCM_FRAMES * ASP_DECOP_CB_MAX_PCM_FRAME_LEN )

 
 

-#define PAF_DECOP_CB_MAX_NUM_AF             ( 4 )       // decoder output circular buffer maximum number audio frames
-#define PAF_DECOP_CB_MAX_NUM_PCM_CH         ( 16 )      // decoder output circular buffer maximum number audio PCM channels
-#define PAF_DECOP_CB_MAX_NUM_PCM_FRAMES     ( 2 )       // decoder output circular buffer maximum number PCM frames //Qin - Increased to prevent cb overflow for ddp.
-#define PAF_DECOP_CB_MAX_PCM_FRAME_LEN      ( 6*256 )   // decoder output circular buffer maximum PCM frame length
-#define PAF_DECOP_CB_PCM_BUF_SZ             ( PAF_DECOP_CB_MAX_NUM_PCM_CH * PAF_DECOP_CB_MAX_NUM_PCM_FRAMES * PAF_DECOP_CB_MAX_PCM_FRAME_LEN )

 
 // Decoder output circular buffer
 typedef struct PAF_AST_DecOpCircBuf 
 
 // Decoder output circular buffer
 typedef struct PAF_AST_DecOpCircBuf 


@@ -71,53 +68,6 @@ typedef struct PAF_AST_DecOpCircBuf
     Int8 errOvrCnt;         // overflow count
 } PAF_AST_DecOpCircBuf;
 
     Int8 errOvrCnt;         // overflow count
 } PAF_AST_DecOpCircBuf;
 

-// Initialize circular buffer
-Int cbInit(
-    Int8 sourceSelect,          // source select (PCM, DDP, etc.)
-    Int16 decOpFrameLen,        // decoder output frame length (PCM samples)
-    Int16 strFrameLen,          // stream frame length (PCM samples)
-    PAF_AST_DecOpCircBuf *pCb,  // decoder output circular buffer
-    Int8 resetRwFlags           // whether to reset reader, writer, and empty flags
-);
-
-// Start writes to circular buffer
-Int cbWriteStart(
-    PAF_AST_DecOpCircBuf *pCb   // decoder output circular buffer
-);
-
-// Stop writes to circular buffer
-Int cbWriteStop(
-    PAF_AST_DecOpCircBuf *pCb   // decoder output circular buffer
-);
-
-// Start reads from circular buffer
-Int cbReadStart(
-    PAF_AST_DecOpCircBuf *pCb   // decoder output circular buffer
-);
-
-// Stop reads from circular buffer
-Int cbReadStop(
-    PAF_AST_DecOpCircBuf *pCb   // decoder output circular buffer
-);
-
-// Read audio frame from circular buffer
-Int cbReadAf(
-    PAF_AST_DecOpCircBuf *pCb,  // decoder output circular buffer
-    PAF_AudioFrame *pAfRd       // audio frame into which to read
-);
-
-// Write audio frame to circular buffer
-Int cbWriteAf(
-    PAF_AST_DecOpCircBuf *pCb,  // decoder output circular buffer
-    PAF_AudioFrame *pAfWrt      // audio frame from which to write
-);
-
-// Get next audio frame to write in circular buffer
-Int cbGetNextWriteAf(
-    PAF_AST_DecOpCircBuf *pCb,  // decoder output circular buffer
-    PAF_AudioFrame **ppAfWrt    // audio frame next to be written
-);
-

 // Output log of circular buffer control variables (debug)
 Int cbLog(
     PAF_AST_DecOpCircBuf *pCb,
 // Output log of circular buffer control variables (debug)
 Int cbLog(
     PAF_AST_DecOpCircBuf *pCb,


@@ -125,4 +75,4 @@ Int cbLog(
     char *locInfo
 );
 
     char *locInfo
 );
 

-#endif /* _DEC_OP_CIRC_BUF_H_ */
+#endif /* _ASP_DECOP_CB_COMMON_H_ */