mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

libspark/audio, libeplayer3: audio type adjustments

Browse Source 
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:
martii
2013-11-11 12:30:47 +01:00
parent 04e0664607
commit 76700e710d
6 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3/container/container_ffmpeg.c
View File

@@ -198,6 +198,8 @@ static char* Codec2Encoding(AVCodecContext *codec, int* version)
return "A_MP3";
case AV_CODEC_ID_AC3:
return "A_AC3";
case AV_CODEC_ID_EAC3:
return "A_EAC3";
case AV_CODEC_ID_DTS:
return "A_DTS";
#if 0

1
libeplayer3/include/writer.h
View File

@@ -58,6 +58,7 @@ extern Writer_t WriterAudioPCM;
extern Writer_t WriterAudioMP3;
extern Writer_t WriterAudioMPEGL3;
extern Writer_t WriterAudioAC3;
extern Writer_t WriterAudioEAC3;
extern Writer_t WriterAudioAAC;
extern Writer_t WriterAudioDTS;
extern Writer_t WriterAudioWMA;

14
libeplayer3/output/writer/ac3.c
View File

@@ -146,3 +146,17 @@ struct Writer_s WriterAudioAC3 = {
NULL,
&caps_ac3
};
static WriterCaps_t caps_eac3 = {
"ac3",
eAudio,
"A_AC3",
AUDIO_ENCODING_AC3
};
struct Writer_s WriterAudioEAC3 = {
&reset,
&writeData,
NULL,
&caps_eac3
};

1
libeplayer3/output/writer/writer.c
View File

@@ -64,6 +64,7 @@ static Writer_t * AvailableWriter[] = {
&WriterAudioMP3,
&WriterAudioMPEGL3,
&WriterAudioAC3,
&WriterAudioEAC3,
&WriterAudioAAC,
&WriterAudioDTS,
&WriterAudioWMA,

1
libspark/audio_lib.h
View File

@@ -77,6 +77,7 @@ class cAudio
int Stop(void);
bool Pause(bool Pcm = true);
void SetStreamType(AUDIO_FORMAT type);
AUDIO_FORMAT GetStreamType(void) { return StreamType; }
void SetSyncMode(AVSYNC_TYPE Mode);
/* select channels */

4
libspark/playback_libeplayer3.cpp
View File

@@ -518,9 +518,13 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
apids[j]=_pid;
// atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFLAC
if( !strncmp("A_MPEG/L3", TrackList[i+1], 9))
ac3flags[j] = 3;
if( !strncmp("A_MP3", TrackList[i+1], 5))
ac3flags[j] = 4;
else if(!strncmp("A_AC3", TrackList[i+1], 5))
ac3flags[j] = 1;
else if(!strncmp("A_EAC3", TrackList[i+1], 6))
ac3flags[j] = 7;
else if(!strncmp("A_DTS", TrackList[i+1], 5))
ac3flags[j] = 6;
else if(!strncmp("A_AAC", TrackList[i+1], 5))