mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 23:12:44 +02:00
libspark/audio, libeplayer3: audio type adjustments
Origin commit data
------------------
Branch: master
Commit: a56e611a05
Author: martii <m4rtii@gmx.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -198,6 +198,8 @@ static char* Codec2Encoding(AVCodecContext *codec, int* version)
|
|||||||
return "A_MP3";
|
return "A_MP3";
|
||||||
case AV_CODEC_ID_AC3:
|
case AV_CODEC_ID_AC3:
|
||||||
return "A_AC3";
|
return "A_AC3";
|
||||||
|
case AV_CODEC_ID_EAC3:
|
||||||
|
return "A_EAC3";
|
||||||
case AV_CODEC_ID_DTS:
|
case AV_CODEC_ID_DTS:
|
||||||
return "A_DTS";
|
return "A_DTS";
|
||||||
#if 0
|
#if 0
|
||||||
|
@@ -58,6 +58,7 @@ extern Writer_t WriterAudioPCM;
|
|||||||
extern Writer_t WriterAudioMP3;
|
extern Writer_t WriterAudioMP3;
|
||||||
extern Writer_t WriterAudioMPEGL3;
|
extern Writer_t WriterAudioMPEGL3;
|
||||||
extern Writer_t WriterAudioAC3;
|
extern Writer_t WriterAudioAC3;
|
||||||
|
extern Writer_t WriterAudioEAC3;
|
||||||
extern Writer_t WriterAudioAAC;
|
extern Writer_t WriterAudioAAC;
|
||||||
extern Writer_t WriterAudioDTS;
|
extern Writer_t WriterAudioDTS;
|
||||||
extern Writer_t WriterAudioWMA;
|
extern Writer_t WriterAudioWMA;
|
||||||
|
@@ -146,3 +146,17 @@ struct Writer_s WriterAudioAC3 = {
|
|||||||
NULL,
|
NULL,
|
||||||
&caps_ac3
|
&caps_ac3
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static WriterCaps_t caps_eac3 = {
|
||||||
|
"ac3",
|
||||||
|
eAudio,
|
||||||
|
"A_AC3",
|
||||||
|
AUDIO_ENCODING_AC3
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Writer_s WriterAudioEAC3 = {
|
||||||
|
&reset,
|
||||||
|
&writeData,
|
||||||
|
NULL,
|
||||||
|
&caps_eac3
|
||||||
|
};
|
||||||
|
@@ -64,6 +64,7 @@ static Writer_t * AvailableWriter[] = {
|
|||||||
&WriterAudioMP3,
|
&WriterAudioMP3,
|
||||||
&WriterAudioMPEGL3,
|
&WriterAudioMPEGL3,
|
||||||
&WriterAudioAC3,
|
&WriterAudioAC3,
|
||||||
|
&WriterAudioEAC3,
|
||||||
&WriterAudioAAC,
|
&WriterAudioAAC,
|
||||||
&WriterAudioDTS,
|
&WriterAudioDTS,
|
||||||
&WriterAudioWMA,
|
&WriterAudioWMA,
|
||||||
|
@@ -77,6 +77,7 @@ class cAudio
|
|||||||
int Stop(void);
|
int Stop(void);
|
||||||
bool Pause(bool Pcm = true);
|
bool Pause(bool Pcm = true);
|
||||||
void SetStreamType(AUDIO_FORMAT type);
|
void SetStreamType(AUDIO_FORMAT type);
|
||||||
|
AUDIO_FORMAT GetStreamType(void) { return StreamType; }
|
||||||
void SetSyncMode(AVSYNC_TYPE Mode);
|
void SetSyncMode(AVSYNC_TYPE Mode);
|
||||||
|
|
||||||
/* select channels */
|
/* select channels */
|
||||||
|
@@ -518,9 +518,13 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
|
|||||||
apids[j]=_pid;
|
apids[j]=_pid;
|
||||||
// atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFLAC
|
// atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFLAC
|
||||||
if( !strncmp("A_MPEG/L3", TrackList[i+1], 9))
|
if( !strncmp("A_MPEG/L3", TrackList[i+1], 9))
|
||||||
|
ac3flags[j] = 3;
|
||||||
|
if( !strncmp("A_MP3", TrackList[i+1], 5))
|
||||||
ac3flags[j] = 4;
|
ac3flags[j] = 4;
|
||||||
else if(!strncmp("A_AC3", TrackList[i+1], 5))
|
else if(!strncmp("A_AC3", TrackList[i+1], 5))
|
||||||
ac3flags[j] = 1;
|
ac3flags[j] = 1;
|
||||||
|
else if(!strncmp("A_EAC3", TrackList[i+1], 6))
|
||||||
|
ac3flags[j] = 7;
|
||||||
else if(!strncmp("A_DTS", TrackList[i+1], 5))
|
else if(!strncmp("A_DTS", TrackList[i+1], 5))
|
||||||
ac3flags[j] = 6;
|
ac3flags[j] = 6;
|
||||||
else if(!strncmp("A_AAC", TrackList[i+1], 5))
|
else if(!strncmp("A_AAC", TrackList[i+1], 5))
|
||||||
|
Reference in New Issue
Block a user