Permalink
Browse files

Merge pull request #256 from FernetMenta/latm

vdr-plugin-vnsiserver: fix latm, wrong codec name
  • Loading branch information...
FernetMenta committed Dec 31, 2013
2 parents a32a0bd + a69b94d commit fb736a66feee710cd5200fa29a652e39aa8a240a
@@ -484,6 +484,7 @@ bool cVNSIDemuxer::EnsureParsers()
void cVNSIDemuxer::SetChannelStreams(const cChannel *channel) void cVNSIDemuxer::SetChannelStreams(const cChannel *channel)
{ {
sStreamInfo newStream; sStreamInfo newStream;
int index = 0;
if (channel->Vpid()) if (channel->Vpid())
{ {
newStream.pID = channel->Vpid(); newStream.pID = channel->Vpid();
@@ -498,9 +499,9 @@ void cVNSIDemuxer::SetChannelStreams(const cChannel *channel)
} }
const int *DPids = channel->Dpids(); const int *DPids = channel->Dpids();
index = 0;
for ( ; *DPids; DPids++) for ( ; *DPids; DPids++)
{ {
int index = 0;
if (!FindStream(*DPids)) if (!FindStream(*DPids))
{ {
newStream.pID = *DPids; newStream.pID = *DPids;
@@ -516,9 +517,9 @@ void cVNSIDemuxer::SetChannelStreams(const cChannel *channel)
} }
const int *APids = channel->Apids(); const int *APids = channel->Apids();
index = 0;
for ( ; *APids; APids++) for ( ; *APids; APids++)
{ {
int index = 0;
if (!FindStream(*APids)) if (!FindStream(*APids))
{ {
newStream.pID = *APids; newStream.pID = *APids;
@@ -538,7 +539,7 @@ void cVNSIDemuxer::SetChannelStreams(const cChannel *channel)
const int *SPids = channel->Spids(); const int *SPids = channel->Spids();
if (SPids) if (SPids)
{ {
int index = 0; index = 0;
for ( ; *SPids; SPids++) for ( ; *SPids; SPids++)
{ {
if (!FindStream(*SPids)) if (!FindStream(*SPids))
@@ -380,7 +380,7 @@ void cLiveStreamer::sendStreamChange()
else if (stream->Type() == stAACLATM) else if (stream->Type() == stAACLATM)
{ {
stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign); stream->GetAudioInformation(Channels, SampleRate, BitRate, BitsPerSample, BlockAlign);
resp->add_String("AACLATM"); resp->add_String("AAC_LATM");
resp->add_String(stream->GetLanguage()); resp->add_String(stream->GetLanguage());
resp->add_U32(Channels); resp->add_U32(Channels);
resp->add_U32(SampleRate); resp->add_U32(SampleRate);

0 comments on commit fb736a6

Please sign in to comment.