mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

libspark/audio, libeplayer3: audio type adjustments

Browse Source
This commit is contained in:
martii
2013-11-11 12:30:47 +01:00
committed by Stefan Seyfried
parent beab047387
commit ed9299c780
5 changed files with 22 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"; 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

1
libeplayer3/include/writer.h
View File

@@ -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;

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

@@ -147,3 +147,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
};

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

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

4
libspark/playback_libeplayer3.cpp
View File

@@ -470,9 +470,13 @@ void cPlayback::FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t
apids[j]=(uint16_t)_pid; apids[j]=(uint16_t)_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))