VPLAY-12012: Deprecate auxiliary audio support in AAMP

Reason for change: Deprecate auxiliary audio support
Test Procedure: Ensure there are no regression
Risks: None

Signed-off-by: Vinish100 <[email protected]>

Author: Vinish100

AampCMCDCollector.cpp

@@ -114,18 +114,6 @@ void AampCMCDCollector::Initialize(bool enableDisable , std::string &traceId)
 		pCMCDMetrics->SetMediaType("INIT_AUDIO");
 		delete mCMCDStreamData[eMEDIATYPE_INIT_AUDIO];
 		mCMCDStreamData[eMEDIATYPE_INIT_AUDIO] = pCMCDMetrics;
-		// for Aux Audio
-		pCMCDMetrics = new AudioCMCDHeaders();
-		pCMCDMetrics->SetSessionId(mTraceId);
-		pCMCDMetrics->SetMediaType("AUXAUDIO");
-		delete mCMCDStreamData[eMEDIATYPE_AUX_AUDIO];
-		mCMCDStreamData[eMEDIATYPE_AUX_AUDIO] = pCMCDMetrics;
-		// for Aux Audio Init
-		pCMCDMetrics = new AudioCMCDHeaders();
-		pCMCDMetrics->SetSessionId(mTraceId);
-		pCMCDMetrics->SetMediaType("INIT_AUDIO");
-		delete mCMCDStreamData[eMEDIATYPE_INIT_AUX_AUDIO];
-		mCMCDStreamData[eMEDIATYPE_INIT_AUX_AUDIO] = pCMCDMetrics;
 		// for Subtitle
 		pCMCDMetrics = new SubtitleCMCDHeaders();
 		pCMCDMetrics->SetSessionId(mTraceId);
@@ -326,7 +314,6 @@ void AampCMCDCollector::SetTrackData(AampMediaType mediaType,bool bufferRedStatu
 			pCMCDMetrics->SetBufferStarvation(bufferRedStatus);
 			pCMCDMetrics->SetBufferLength(bufferedDuration);
 		}
-		// No data for Aux Audio now //////////////
 	}
 }
 

AampDefine.h

@@ -113,9 +113,9 @@
 #define DEFAULT_AD_FULFILLMENT_TIMEOUT 2000	/**< Default Ad fulfillment timeout in milliseconds */
 #define MAX_AD_FULFILLMENT_TIMEOUT 5000	/**< Max Ad fulfillment timeout in milliseconds */
 
-#define AAMP_TRACK_COUNT 4		/**< internal use - audio+video+sub+aux track */
+#define AAMP_TRACK_COUNT 3		/**< internal use - audio+video+sub track */
 #define DEFAULT_CURL_INSTANCE_COUNT (AAMP_TRACK_COUNT + 1) /**< One for Manifest/Playlist + Number of tracks */
-#define AAMP_DRM_CURL_COUNT 4		/**< audio+video+sub+aux track DRMs */
+#define AAMP_DRM_CURL_COUNT 3		/**< audio+video+sub track DRMs */
 //#define CURL_FRAGMENT_DL_TIMEOUT 10L	/**< Curl timeout for fragment download */
 #define DEFAULT_PLAYLIST_DL_TIMEOUT 10L	/**< Curl timeout for playlist download */
 #define DEFAULT_CURL_TIMEOUT 5L		/**< Default timeout for Curl downloads */

AampMPDUtils.cpp

@@ -172,7 +172,6 @@ bool IsCompatibleMimeType(const std::string& mimeType, AampMediaType mediaType)
 			break;
 
 		case eMEDIATYPE_AUDIO:
-		case eMEDIATYPE_AUX_AUDIO:
 			if ((mimeType == "audio/webm") ||
 				(mimeType == "audio/mp4"))
 				isCompatible = true;

AampMediaType.h

@@ -30,7 +30,7 @@
  * @enum AampMediaType
  * @brief Media types
  */
-// Please maintain the order video, audio, subtitle and aux_audio in future
+// Please maintain the order video, audio and subtitle in future
 // Above order to be maintained across fragment, init and playlist media types
 // These enums are used in a lot of calculation in AAMP code and breaking the order will bring a lot of issues
 // This order is also followed in other enums like AampCurlInstance and TrackType
@@ -39,18 +39,15 @@ enum AampMediaType
 	eMEDIATYPE_VIDEO,               /**< Type video */
 	eMEDIATYPE_AUDIO,               /**< Type audio */
 	eMEDIATYPE_SUBTITLE,            /**< Type subtitle */
-	eMEDIATYPE_AUX_AUDIO,           /**< Type auxiliary audio */
 	eMEDIATYPE_MANIFEST,            /**< Type manifest */
 	eMEDIATYPE_LICENCE,             /**< Type license */
 	eMEDIATYPE_IFRAME,              /**< Type iframe */
 	eMEDIATYPE_INIT_VIDEO,          /**< Type video init fragment */
 	eMEDIATYPE_INIT_AUDIO,          /**< Type audio init fragment */
 	eMEDIATYPE_INIT_SUBTITLE,       /**< Type subtitle init fragment */
-	eMEDIATYPE_INIT_AUX_AUDIO,      /**< Type auxiliary audio init fragment */
 	eMEDIATYPE_PLAYLIST_VIDEO,      /**< Type video playlist */
 	eMEDIATYPE_PLAYLIST_AUDIO,      /**< Type audio playlist */
 	eMEDIATYPE_PLAYLIST_SUBTITLE,	/**< Type subtitle playlist */
-	eMEDIATYPE_PLAYLIST_AUX_AUDIO,	/**< Type auxiliary audio playlist */
 	eMEDIATYPE_PLAYLIST_IFRAME,     /**< Type Iframe playlist */
 	eMEDIATYPE_INIT_IFRAME,         /**< Type IFRAME init fragment */
 	eMEDIATYPE_DSM_CC,              /**< Type digital storage media command and control (DSM-CC) */

AampProfiler.h

@@ -48,22 +48,18 @@ typedef enum
 	PROFILE_BUCKET_PLAYLIST_VIDEO,      /**< Video playlist download bucket*/
 	PROFILE_BUCKET_PLAYLIST_AUDIO,      /**< Audio playlist download bucket*/
 	PROFILE_BUCKET_PLAYLIST_SUBTITLE,   /**< Subtitle playlist download bucket*/
-	PROFILE_BUCKET_PLAYLIST_AUXILIARY,  /**< Auxiliary playlist download bucket*/
 
 	PROFILE_BUCKET_INIT_VIDEO,          /**< Video init fragment download bucket*/
 	PROFILE_BUCKET_INIT_AUDIO,          /**< Audio init fragment download bucket*/
 	PROFILE_BUCKET_INIT_SUBTITLE,       /**< Subtitle fragment download bucket*/
-	PROFILE_BUCKET_INIT_AUXILIARY,      /**< Auxiliary fragment download bucket*/
 
 	PROFILE_BUCKET_FRAGMENT_VIDEO,      /**< Video fragment download bucket*/
 	PROFILE_BUCKET_FRAGMENT_AUDIO,      /**< Audio fragment download bucket*/
 	PROFILE_BUCKET_FRAGMENT_SUBTITLE,   /**< Subtitle fragment download bucket*/
-	PROFILE_BUCKET_FRAGMENT_AUXILIARY,  /**< Auxiliary fragment download bucket*/
 
 	PROFILE_BUCKET_DECRYPT_VIDEO,       /**< Video decryption bucket*/
 	PROFILE_BUCKET_DECRYPT_AUDIO,       /**< Audio decryption bucket*/
 	PROFILE_BUCKET_DECRYPT_SUBTITLE,    /**< Subtitle decryption bucket*/
-	PROFILE_BUCKET_DECRYPT_AUXILIARY,   /**< Auxiliary decryption bucket*/
 
 	PROFILE_BUCKET_LA_TOTAL,            /**< License acquisition total bucket*/
 	PROFILE_BUCKET_LA_PREPROC,          /**< License acquisition pre-processing bucket*/

AampStreamSinkInactive.h

@@ -47,7 +47,7 @@ class AampStreamSinkInactive : public StreamSink
      *   @fn Configure
 	 *   @brief stub implementation for Inactive aamp instance
 	 */
-	virtual void Configure(StreamOutputFormat format, StreamOutputFormat audioFormat, StreamOutputFormat auxFormat, StreamOutputFormat subFormat, bool bESChangeStatus, bool forwardAudioToAux, bool setReadyAfterPipelineCreation=false)
+	virtual void Configure(StreamOutputFormat format, StreamOutputFormat audioFormat, StreamOutputFormat subFormat, bool bESChangeStatus, bool setReadyAfterPipelineCreation=false)
 	{
 		AAMPLOG_WARN("Called AAMPGstPlayer()::%s stub", __FUNCTION__);
 	}

AampTSBSessionManager.cpp

@@ -662,10 +662,6 @@ AampMediaType AampTSBSessionManager::ConvertMediaType(AampMediaType actualMediat
 	{
 		mediaType = eMEDIATYPE_SUBTITLE;
 	}
-	else if (mediaType == eMEDIATYPE_INIT_AUX_AUDIO)
-	{
-		mediaType = eMEDIATYPE_AUX_AUDIO;
-	}
 	else if (mediaType == eMEDIATYPE_INIT_IFRAME)
 	{
 		mediaType = eMEDIATYPE_IFRAME;

AampUtils.cpp

@@ -607,18 +607,15 @@ enum HarvestConfigType
 	eHARVEST_ENABLE_VIDEO = 0x00000001,              /**< Enable Harvest Video fragments - set 1st bit*/
 	eHARVEST_ENABLE_AUDIO = 0x00000002,              /**< Enable Harvest audio - set 2nd bit*/
 	eHARVEST_ENABLE_SUBTITLE = 0x00000004,           /**< Enable Harvest subtitle - set 3rd bit */
-	eHARVEST_ENABLE_AUX_AUDIO = 0x00000008,          /**< Enable Harvest auxiliary audio - set 4th bit*/
 	eHARVEST_ENABLE_MANIFEST = 0x00000010,           /**< Enable Harvest manifest - set 5th bit */
 	eHARVEST_ENABLE_LICENCE = 0x00000020,            /**< Enable Harvest license - set 6th bit  */
 	eHARVEST_ENABLE_IFRAME = 0x00000040,             /**< Enable Harvest iframe - set 7th bit  */
 	eHARVEST_ENABLE_INIT_VIDEO = 0x00000080,         /**< Enable Harvest video init fragment - set 8th bit*/
 	eHARVEST_ENABLE_INIT_AUDIO = 0x00000100,         /**< Enable Harvest audio init fragment - set 9th bit*/
 	eHARVEST_ENABLE_INIT_SUBTITLE = 0x00000200,      /**< Enable Harvest subtitle init fragment - set 10th bit*/
-	eHARVEST_ENABLE_INIT_AUX_AUDIO = 0x00000400,     /**< Enable Harvest auxiliary audio init fragment - set 11th bit*/
 	eHARVEST_ENABLE_PLAYLIST_VIDEO = 0x00000800,     /**< Enable Harvest video playlist - set 12th bit*/
 	eHARVEST_ENABLE_PLAYLIST_AUDIO = 0x00001000,     /**< Enable Harvest audio playlist - set 13th bit*/
 	eHARVEST_ENABLE_PLAYLIST_SUBTITLE = 0x00002000,  /**< Enable Harvest subtitle playlist - set 14th bit*/
-	eHARVEST_ENABLE_PLAYLIST_AUX_AUDIO = 0x00004000, /**< Enable Harvest auxiliary audio playlist - set 15th bit*/
 	eHARVEST_ENABLE_PLAYLIST_IFRAME = 0x00008000,    /**< Enable Harvest Iframe playlist - set 16th bit*/
 	eHARVEST_ENABLE_INIT_IFRAME = 0x00010000,        /**< Enable Harvest IFRAME init fragment - set 17th bit*/
 	eHARVEST_ENABLE_DSM_CC = 0x00020000,             /**< Enable Harvest digital storage media command and control (DSM-CC)- set 18th bit */
@@ -1136,18 +1133,15 @@ const char *GetMediaTypeName(AampMediaType mediaType)
 		"video",//eMEDIATYPE_VIDEO
 		"audio",//eMEDIATYPE_AUDIO
 		"text",//eMEDIATYPE_SUBTITLE
-		"aux_audio",//eMEDIATYPE_AUX_AUDIO
 		"manifest",//eMEDIATYPE_MANIFEST
 		"licence",//eMEDIATYPE_LICENCE
 		"iframe",//eMEDIATYPE_IFRAME
 		"init_video",//eMEDIATYPE_INIT_VIDEO
 		"init_audio",//eMEDIATYPE_INIT_AUDIO
 		"init_text",//eMEDIATYPE_INIT_SUBTITLE
-		"init_aux_audio",//eMEDIATYPE_INIT_AUX_AUDIO
 		"playlist_video",//eMEDIATYPE_PLAYLIST_VIDEO
 		"playlist_audio",//eMEDIATYPE_PLAYLIST_AUDIO
 		"playlist_text",//eMEDIATYPE_PLAYLIST_SUBTITLE
-		"playlist_aux_audio",//eMEDIATYPE_PLAYLIST_AUX_AUDIO
 		"playlist_iframe",//eMEDIATYPE_PLAYLIST_IFRAME
 		"init_iframe",//eMEDIATYPE_INIT_IFRAME
 		"dsm_cc",//eMEDIATYPE_DSM_CC

CMakeLists.txt

@@ -396,12 +396,6 @@ if (COVERAGE_ENABLED)
 	set(LIBAAMP_DEPENDS ${LIBAAMP_DEPENDS} "--coverage")
 endif()
 
-
-if(CMAKE_AUXILIARY_AUDIO_ENABLED)
-	message("CMAKE_AUXILIARY_AUDIO_ENABLED set")
-	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DAAMP_AUXILIARY_AUDIO_ENABLED")
-endif()
-
 if(CMAKE_ENABLE_PTS_RESTAMP)
 	message("ENABLE_PTS_RESTAMP set")
 	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DENABLE_PTS_RESTAMP")

README.md

@@ -264,19 +264,16 @@ playlistTimeout			Playlist download time out in sec. Default: 10s
     By default aamp will dump all the type of data, set 0 for disabling harvest
 	0x00000001 (1)      - Enable Harvest Video fragments - set 1st bit 
 	0x00000002 (2)      - Enable Harvest audio - set 2nd bit 
-	0x00000004 (4)      - Enable Harvest subtitle - set 3rd bit 
-	0x00000008 (8)      - Enable Harvest auxiliary audio - set 4th bit 
+	0x00000004 (4)      - Enable Harvest subtitle - set 3rd bit  
 	0x00000010 (16)     - Enable Harvest manifest - set 5th bit 
 	0x00000020 (32)     - Enable Harvest license - set 6th bit , TODO: not yet supported license dumping
 	0x00000040 (64)     - Enable Harvest iframe - set 7th bit 
 	0x00000080 (128)    - Enable Harvest video init fragment - set 8th bit 
 	0x00000100 (256)    - Enable Harvest audio init fragment - set 9th bit 
 	0x00000200 (512)    - Enable Harvest subtitle init fragment - set 10th bit 
-	0x00000400 (1024)   - Enable Harvest auxiliary audio init fragment - set 11th bit 
 	0x00000800 (2048)   - Enable Harvest video playlist - set 12th bit 
 	0x00001000 (4096)   - Enable Harvest audio playlist - set 13th bit 
 	0x00002000 (8192)   - Enable Harvest subtitle playlist - set 14th bit 
-	0x00004000 (16384)  - Enable Harvest auxiliary audio playlist - set 15th bit 
 	0x00008000 (32768)  - Enable Harvest Iframe playlist - set 16th bit 
 	0x00010000 (65536)  - Enable Harvest IFRAME init fragment - set 17th bit  
 	example :- if you want harvest only manifest and video fragments , set value like 0x00000001 + 0x00000010 = 0x00000011 = 17