frodovdr
/
vdr-plugin-softhddevice
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removes LPCM detection from TS parser.

This commit is contained in:
Johns 2012-03-03 16:11:38 +01:00
parent de79e9211f
commit dda9011abc
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
User johns User johns
Date: Date:
Removes LPCM detection from TS parser.
Rewrote video/audio start code. Rewrote video/audio start code.
Add support for attach/detach plugin. Add support for attach/detach plugin.
OSS needs bigger audio buffers. OSS needs bigger audio buffers.

19
softhddev.c
View File

@ -492,6 +492,8 @@ void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_start)
return; return;
case PES_START: // at start of pes packet payload case PES_START: // at start of pes packet payload
#if 0
// Played with PlayAudio
// FIXME: need 0x80 -- 0xA0 state // FIXME: need 0x80 -- 0xA0 state
if (AudioCodecID == CODEC_ID_NONE) { if (AudioCodecID == CODEC_ID_NONE) {
if ((*p & 0xF0) == 0x80) { // AC-3 & DTS if ((*p & 0xF0) == 0x80) { // AC-3 & DTS
@ -501,9 +503,11 @@ void PesParse(PesDemux * pesdx, const uint8_t * data, int size, int is_start)
pesdx->State = PES_LPCM_HEADER; pesdx->State = PES_LPCM_HEADER;
pesdx->HeaderIndex = 0; pesdx->HeaderIndex = 0;
pesdx->HeaderSize = 7; pesdx->HeaderSize = 7;
break; // FIXME: need harder LPCM check
//break;
} }
} }
#endif
case PES_INIT: // find start of audio packet case PES_INIT: // find start of audio packet
// FIXME: increase if needed the buffer // FIXME: increase if needed the buffer
@ -1082,6 +1086,7 @@ int PlayTsAudio(const uint8_t * data, int size)
if (NewAudioStream) { if (NewAudioStream) {
// FIXME: does this clear the audio ringbuffer? // FIXME: does this clear the audio ringbuffer?
CodecAudioClose(MyAudioDecoder); CodecAudioClose(MyAudioDecoder);
// max time between audio packets 200ms + 24ms hw buffer
AudioSetBufferTime(264); AudioSetBufferTime(264);
AudioCodecID = CODEC_ID_NONE; AudioCodecID = CODEC_ID_NONE;
NewAudioStream = 0; NewAudioStream = 0;
@ -1349,10 +1354,18 @@ int VideoDecode(void)
return -1; return -1;
} }
#if 0 #if 0
int f;
// FIXME: flush buffers, if close is in the queue // FIXME: flush buffers, if close is in the queue
while (filled) { for (f = 0; f < filled; ++f) {
avpkt = &VideoPacketRb[VideoPacketRead]; avpkt = &VideoPacketRb[(VideoPacketRead + f) % VIDEO_PACKET_MAX];
if ((int)(size_t) avpkt->priv == CODEC_ID_NONE) { if ((int)(size_t) avpkt->priv == CODEC_ID_NONE) {
printf("video: close\n");
if (f) {
atomic_sub(f, &VideoPacketsFilled);
VideoPacketRead = (VideoPacketRead + f) % VIDEO_PACKET_MAX;
}
break;
} }
} }
#endif #endif