Skip to content

VPLAY-12012: Deprecate auxiliary audio support in AAMP #740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vinish100 wants to merge 1 commit into
base: dev_sprint_25_2
Choose a base branch
from
Open

VPLAY-12012: Deprecate auxiliary audio support in AAMP #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions AampCMCDCollector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -326,7 +314,6 @@ void AampCMCDCollector::SetTrackData(AampMediaType mediaType,bool bufferRedStatu
pCMCDMetrics->SetBufferStarvation(bufferRedStatus);
pCMCDMetrics->SetBufferLength(bufferedDuration);
}
// No data for Aux Audio now //////////////
}
}

Expand Down
4 changes: 2 additions & 2 deletions AampDefine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
1 change: 0 additions & 1 deletion AampMPDUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions AampMediaType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) */
Expand Down
4 changes: 0 additions & 4 deletions AampProfiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*/
Expand Down
2 changes: 1 addition & 1 deletion AampStreamSinkInactive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__);
}
Expand Down
4 changes: 0 additions & 4 deletions AampTSBSessionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions AampUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 1 addition & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 2 additions & 27 deletions StreamAbstractionAAMP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ typedef enum
eTRACK_VIDEO, /**< Video track */
eTRACK_AUDIO, /**< Audio track */
eTRACK_SUBTITLE, /**< Subtitle track */
eTRACK_AUX_AUDIO /**< Auxiliary audio track */
} TrackType;

AampMediaType TrackTypeToMediaType( TrackType trackType );
Expand Down Expand Up @@ -973,10 +972,10 @@ class StreamAbstractionAAMP : public AampLicenseFetcher
*
* @param[out] primaryOutputFormat - format of primary track
* @param[out] audioOutputFormat - format of audio track
* @param[out] auxAudioOutputFormat - format of aux audio track
* @param[out] subtitleOutputFormat - format of subtitle track
* @return void
*/
virtual void GetStreamFormat(StreamOutputFormat &primaryOutputFormat, StreamOutputFormat &audioOutputFormat, StreamOutputFormat &auxAudioOutputFormat, StreamOutputFormat &subtitleOutputFormat) = 0;
virtual void GetStreamFormat(StreamOutputFormat &primaryOutputFormat, StreamOutputFormat &audioOutputFormat, StreamOutputFormat &subtitleOutputFormat) = 0;

/**
* @brief Get current stream position.
Expand Down Expand Up @@ -1841,13 +1840,6 @@ class StreamAbstractionAAMP : public AampLicenseFetcher
*/
void MuteSubtitles(bool mute);

/**
* @fn WaitForVideoTrackCatchupForAux
*
* @return void
*/
void WaitForVideoTrackCatchupForAux();

/**
* @brief Set Content Restrictions
* @param[in] restrictions - restrictions to be applied
Expand All @@ -1871,21 +1863,6 @@ class StreamAbstractionAAMP : public AampLicenseFetcher
*/
virtual void EnableContentRestrictions(){};

/**
* @brief Get audio forward to aux pipeline status
*
* @return bool true if audio buffers are to be forwarded
*/
bool GetAudioFwdToAuxStatus() { return mFwdAudioToAux; }

/**
* @brief Set audio forward to aux pipeline status
*
* @param[in] status - enabled/disabled
* @return void
*/
void SetAudioFwdToAuxStatus(bool status) { mFwdAudioToAux = status; }

/**
* @brief Notify playlist downloader threads of tracks
*
Expand Down Expand Up @@ -2052,7 +2029,6 @@ class StreamAbstractionAAMP : public AampLicenseFetcher
std::mutex mLock; /**< lock for A/V track catchup logic*/
std::condition_variable mCond; /**< condition for A/V track catchup logic*/
std::condition_variable mSubCond; /**< condition for Audio/Subtitle track catchup logic*/
std::condition_variable mAuxCond; /**< condition for Aux and video track catchup logic*/

// abr variables
long mCurrentBandwidth; /**< stores current bandwidth*/
Expand Down Expand Up @@ -2088,7 +2064,6 @@ class StreamAbstractionAAMP : public AampLicenseFetcher
MediaTrackDiscontinuityState mTrackState; /**< stores the discontinuity status of tracks*/
std::string mAudioTrackIndex; /**< Current audio track index in track list */
std::string mTextTrackIndex; /**< Current text track index in track list */
bool mFwdAudioToAux; /**< If audio buffers are to be forwarded to auxiliary pipeline, happens if both are playing same language */

id3_callback_t mID3Handler; /**< Function to be used to emit the ID3 event */

Expand Down
5 changes: 1 addition & 4 deletions StreamSink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,11 @@ class StreamSink
*
* @param[in] format - Video output format.
* @param[in] audioFormat - Audio output format.
* @param[in] auxFormat - Aux audio output format.
* @param[in] bESChangeStatus - Flag to keep force configure the pipeline value
* @param[in] forwardAudioToAux - Flag denotes if audio buffers have to be forwarded to aux pipeline
* @param[in] setReadyAfterPipelineCreation - Flag denotes if pipeline has to be reset to ready or not
* @return void
*/
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){}
/**
* @brief API to send audio/video buffer into the sink.
*
Expand Down
8 changes: 4 additions & 4 deletions aampgstplayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,14 +785,14 @@ void AAMPGstPlayer::Stream()
/**
* @brief Configure pipeline based on A/V formats
*/
void AAMPGstPlayer::Configure(StreamOutputFormat format, StreamOutputFormat audioFormat, StreamOutputFormat auxFormat, StreamOutputFormat subFormat, bool bESChangeStatus, bool forwardAudioToAux, bool setReadyAfterPipelineCreation)
void AAMPGstPlayer::Configure(StreamOutputFormat format, StreamOutputFormat audioFormat, StreamOutputFormat subFormat, bool bESChangeStatus, bool setReadyAfterPipelineCreation)
{
bool isSubEnable = aamp->IsGstreamerSubsEnabled();
int32_t trackId = aamp->GetCurrentAudioTrackId();
int PipelinePriority;
gint rate = INVALID_RATE;

AAMPLOG_MIL("videoFormat %d audioFormat %d auxFormat %d subFormat %d",format, audioFormat, auxFormat, subFormat);
AAMPLOG_MIL("videoFormat %d audioFormat %d subFormat %d",format, audioFormat, subFormat);

playerInstance->SetPreferredDRM(GetDrmSystemID(aamp->GetPreferredDRM())); // pass the preferred DRM to Interface
InitializePlayerConfigs(this, playerInstance);
Expand All @@ -803,8 +803,8 @@ void AAMPGstPlayer::Configure(StreamOutputFormat format, StreamOutputFormat audi

bool FirstFrameFlag = aamp->IsFirstVideoFrameDisplayedRequired();
/*Configure and create the pipeline*/
playerInstance->ConfigurePipeline(static_cast<int>(format),static_cast<int>(audioFormat),static_cast<int>(auxFormat),static_cast<int>(subFormat),
bESChangeStatus,forwardAudioToAux,setReadyAfterPipelineCreation,
playerInstance->ConfigurePipeline(static_cast<int>(format),static_cast<int>(audioFormat),static_cast<int>(subFormat),
bESChangeStatus,setReadyAfterPipelineCreation,
isSubEnable, trackId, rate, PIPELINE_NAME, PipelinePriority, FirstFrameFlag, aamp->GetManifestUrl().c_str());
AAMPLOG_TRACE("exiting AAMPGstPlayer");
StartMonitorAvTimer();
Expand Down
4 changes: 1 addition & 3 deletions aampgstplayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,11 @@ class AAMPGstPlayer : public StreamSink
* @fn Configure
* @param[in] format video format
* @param[in] audioFormat audio format
* @param[in] auxFormat aux audio format
* @param[in] subFormat subtitle format
* @param[in] bESChangeStatus flag to indicate if the audio type changed in mid stream
* @param[in] forwardAudioToAux if audio buffers to be forwarded to aux pipeline
* @param[in] setReadyAfterPipelineCreation True/False for pipeline is created
*/
void Configure(StreamOutputFormat format, StreamOutputFormat audioFormat, StreamOutputFormat auxFormat, StreamOutputFormat subFormat, bool bESChangeStatus, bool forwardAudioToAux, bool setReadyAfterPipelineCreation=false) override;
void Configure(StreamOutputFormat format, StreamOutputFormat audioFormat, StreamOutputFormat subFormat, bool bESChangeStatus, bool setReadyAfterPipelineCreation=false) override;
/**
* @fn SendCopy
* @param[in] mediaType stream type
Expand Down
2 changes: 0 additions & 2 deletions downloader/AampCurlDefine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,10 @@ enum AampCurlInstance
eCURLINSTANCE_VIDEO,
eCURLINSTANCE_AUDIO,
eCURLINSTANCE_SUBTITLE,
eCURLINSTANCE_AUX_AUDIO,
eCURLINSTANCE_MANIFEST_MAIN,
eCURLINSTANCE_MANIFEST_PLAYLIST_VIDEO,
eCURLINSTANCE_MANIFEST_PLAYLIST_AUDIO,
eCURLINSTANCE_MANIFEST_PLAYLIST_SUBTITLE,
eCURLINSTANCE_MANIFEST_PLAYLIST_AUX_AUDIO,
eCURLINSTANCE_DAI,
eCURLINSTANCE_AES,
eCURLINSTANCE_PLAYLISTPRECACHE,
Expand Down
1 change: 0 additions & 1 deletion drm/DrmInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ ProfilerBucketType DrmInterface::MapDrmToProfilerBucket(DrmProfilerBucketType dr
case DRM_PROFILE_BUCKET_DECRYPT_VIDEO: return PROFILE_BUCKET_DECRYPT_VIDEO;
case DRM_PROFILE_BUCKET_DECRYPT_AUDIO: return PROFILE_BUCKET_DECRYPT_AUDIO;
case DRM_PROFILE_BUCKET_DECRYPT_SUBTITLE: return PROFILE_BUCKET_DECRYPT_SUBTITLE;
case DRM_PROFILE_BUCKET_DECRYPT_AUXILIARY:return PROFILE_BUCKET_DECRYPT_AUXILIARY;

case DRM_PROFILE_BUCKET_LA_TOTAL: return PROFILE_BUCKET_LA_TOTAL;
case DRM_PROFILE_BUCKET_LA_PREPROC: return PROFILE_BUCKET_LA_PREPROC;
Expand Down
Loading
Loading