From d9e8115caeb092cd31554ade6a47f1958cc623d4 Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 28 Jul 2013 09:54:39 +0200 Subject: [PATCH] Fix libeplayer3's broken PCM injection implementation. Jumps in movieplayer now works without losing a/v sync. --- libeplayer3/output/writer/pcm.c | 233 +++++++++++++++----------------- 1 file changed, 107 insertions(+), 126 deletions(-) diff --git a/libeplayer3/output/writer/pcm.c b/libeplayer3/output/writer/pcm.c index 6f854f8..79c996f 100644 --- a/libeplayer3/output/writer/pcm.c +++ b/libeplayer3/output/writer/pcm.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -82,13 +83,6 @@ static int initialHeader = 1; static unsigned int SubFrameLen = 0; static unsigned int SubFramesPerPES = 0; -static const unsigned char clpcm_pes[18] = { 0x00, 0x00, 0x01, 0xBD, //start code - 0x07, 0xF1, //pes length - 0x81, 0x81, 0x09, //fixed - 0x21, 0x00, 0x01, 0x00, 0x01, //PTS marker bits - 0x1E, 0x60, 0x0A, //first pes only, 0xFF after - 0xFF - }; // reference: search for TypeLpcmDVDAudio in player/frame_parser/frame_parser_audio_lpcm.cpp static const unsigned char clpcm_prv[14] = { 0xA0, //sub_stream_id 0, 0, //resvd and UPC_EAN_ISRC stuff, unused @@ -130,106 +124,99 @@ static int prepareClipPlay(int uNoOfChannels, int uSampleRate, int uBitsPerSampl SubFramesPerPES = 0; breakBufferFillSize = 0; - memcpy(lpcm_pes, clpcm_pes, sizeof(lpcm_pes)); memcpy(lpcm_prv, clpcm_prv, sizeof(lpcm_prv)); //figure out size of subframe //and set up sample rate switch(uSampleRate) { - case 48000: SubFrameLen = 40; - break; - case 96000: lpcm_prv[8] |= 0x10; - SubFrameLen = 80; - break; - case 192000: lpcm_prv[8] |= 0x20; - SubFrameLen = 160; - break; - case 44100: lpcm_prv[8] |= 0x80; - SubFrameLen = 40; - break; - case 88200: lpcm_prv[8] |= 0x90; - SubFrameLen = 80; - break; - case 176400: lpcm_prv[8] |= 0xA0; - SubFrameLen = 160; - break; - default: break; + case 48000: SubFrameLen = 40; + break; + case 96000: lpcm_prv[8] |= 0x10; + SubFrameLen = 80; + break; + case 192000: lpcm_prv[8] |= 0x20; + SubFrameLen = 160; + break; + case 44100: lpcm_prv[8] |= 0x80; + SubFrameLen = 40; + break; + case 88200: lpcm_prv[8] |= 0x90; + SubFrameLen = 80; + break; + case 176400: lpcm_prv[8] |= 0xA0; + SubFrameLen = 160; + break; + default: break; } SubFrameLen *= uNoOfChannels; SubFrameLen *= (uBitsPerSample / 8); //rewrite PES size to have as many complete subframes per PES as we can - SubFramesPerPES = ((2048-sizeof(lpcm_pes))-sizeof(lpcm_prv))/SubFrameLen; + // FIXME: PES header size was hardcoded to 18 in previous code. It's 14 at the moment. + SubFramesPerPES = ((2048 - 18) - sizeof(lpcm_prv))/SubFrameLen; SubFrameLen *= SubFramesPerPES; - lpcm_pes[4] = ((SubFrameLen+(sizeof(lpcm_pes)-6)+sizeof(lpcm_prv))>>8) & 0xFF; - lpcm_pes[5] = (SubFrameLen+(sizeof(lpcm_pes)-6)+sizeof(lpcm_prv)) & 0xFF; - //set number of channels - lpcm_prv[10] = uNoOfChannels - 1; + lpcm_prv[10] = uNoOfChannels - 1; switch(uBitsPerSample) { - case 16: break; - case 24: lpcm_prv[7] |= 0x20; - break; - default: printf("inappropriate bits per sample (%d) - must be 16 or 24\n",uBitsPerSample); - return 1; + case 24: lpcm_prv[7] |= 0x20; + case 16: + break; + default: + printf("inappropriate bits per sample (%d) - must be 16 or 24\n",uBitsPerSample); + return 1; } - return 0; + return 0; } static int reset() { - initialHeader = 1; - return 0; + initialHeader = 1; + return 0; } static int writeData(void* _call) { - WriterAVCallData_t* call = (WriterAVCallData_t*) _call; + WriterAVCallData_t* call = (WriterAVCallData_t*) _call; - pcm_printf(10, "\n"); + unsigned char PesHeader[PES_MAX_HEADER_SIZE]; - if (call == NULL) - { - pcm_err("call data is NULL...\n"); - return 0; - } + pcm_printf(10, "\n"); - pcm_printf(10, "AudioPts %lld\n", call->Pts); + if (!call) { + pcm_err("call data is NULL...\n"); + return 0; + } - if ((call->data == NULL) || (call->len <= 0)) - { - pcm_err("parsing NULL Data. ignoring...\n"); - return 0; - } + pcm_printf(10, "AudioPts %lld\n", call->Pts); - if (call->fd < 0) - { - pcm_err("file pointer < 0. ignoring ...\n"); - return 0; - } + if ((call->data == NULL) || (call->len <= 0)) { + pcm_err("parsing NULL Data. ignoring...\n"); + return 0; + } - pcmPrivateData_t* pcmPrivateData = (pcmPrivateData_t*)call->private_data; + if (call->fd < 0) { + pcm_err("file pointer < 0. ignoring ...\n"); + return 0; + } - if (initialHeader) - { - initialHeader = 0; - prepareClipPlay(pcmPrivateData->uNoOfChannels, pcmPrivateData->uSampleRate, - pcmPrivateData->uBitsPerSample, pcmPrivateData->bLittleEndian); - } + pcmPrivateData_t* pcmPrivateData = (pcmPrivateData_t*)call->private_data; - unsigned char * buffer = call->data; - unsigned int size = call->len; - //printf("PCM %d size SubFrameLen=%d\n", size, SubFrameLen); + if (initialHeader) { + initialHeader = 0; + prepareClipPlay(pcmPrivateData->uNoOfChannels, pcmPrivateData->uSampleRate, + pcmPrivateData->uBitsPerSample, pcmPrivateData->bLittleEndian); + } + + unsigned char * buffer = call->data; + unsigned int size = call->len; unsigned int n; - unsigned int injectBufferSize = sizeof(lpcm_pes) + sizeof(lpcm_prv) + SubFrameLen; - unsigned char * injectBuffer = (unsigned char *)malloc(sizeof(unsigned char)*injectBufferSize); - unsigned char * injectBufferDataPointer = &injectBuffer[sizeof(lpcm_pes)+sizeof(lpcm_prv)]; - unsigned int pos; + unsigned char * injectBuffer = (unsigned char *)malloc(SubFrameLen); + unsigned int pos; for(pos = 0; pos < size; ) { @@ -242,72 +229,66 @@ static int writeData(void* _call) break; } - //get first PES's worth + //get first PES's worth if(breakBufferFillSize > 0) { - memcpy(injectBufferDataPointer, breakBuffer, sizeof(unsigned char)*breakBufferFillSize); - memcpy(&injectBufferDataPointer[breakBufferFillSize], &buffer[pos], sizeof(unsigned char)*(SubFrameLen - breakBufferFillSize)); + memcpy(injectBuffer, breakBuffer, sizeof(unsigned char)*breakBufferFillSize); + memcpy(&injectBuffer[breakBufferFillSize], &buffer[pos], sizeof(unsigned char)*(SubFrameLen - breakBufferFillSize)); pos += (SubFrameLen - breakBufferFillSize); breakBufferFillSize = 0; } else { - memcpy(injectBufferDataPointer, &buffer[pos], sizeof(unsigned char)*SubFrameLen); + memcpy(injectBuffer, &buffer[pos], sizeof(unsigned char)*SubFrameLen); pos += SubFrameLen; } - //write the PES header - memcpy(injectBuffer, lpcm_pes, sizeof(lpcm_pes)); + struct iovec iov[3]; + iov[0].iov_base = PesHeader; + iov[1].iov_base = lpcm_prv; + iov[1].iov_len = sizeof(lpcm_prv); - //write the private data area - memcpy(&injectBuffer[sizeof(lpcm_pes)], lpcm_prv, sizeof(lpcm_prv)); + iov[2].iov_base = injectBuffer; + iov[2].iov_len = SubFrameLen; //write the PCM data if(pcmPrivateData->uBitsPerSample == 16) { for(n=0; nfd, injectBuffer, injectBufferSize); - //printf("PCM %d bytes injected\n", injectBufferSize); - //Hexdump(injectBuffer, 126); + iov[0].iov_len = InsertPesHeader (PesHeader, iov[1].iov_len + iov[2].iov_len, 0xBD, call->Pts, 0); + int len = writev(call->fd, iov, 3); + if (len < 0) + break; } free(injectBuffer); - return size; + return size; } /* ***************************** */ @@ -315,29 +296,29 @@ static int writeData(void* _call) /* ***************************** */ static WriterCaps_t caps_pcm = { - "pcm", - eAudio, - "A_PCM", - AUDIO_ENCODING_LPCMA + "pcm", + eAudio, + "A_PCM", + AUDIO_ENCODING_LPCMA }; struct Writer_s WriterAudioPCM = { - &reset, - &writeData, - NULL, - &caps_pcm + &reset, + &writeData, + NULL, + &caps_pcm }; static WriterCaps_t caps_ipcm = { - "ipcm", - eAudio, - "A_IPCM", - AUDIO_ENCODING_LPCMA + "ipcm", + eAudio, + "A_IPCM", + AUDIO_ENCODING_LPCMA }; struct Writer_s WriterAudioIPCM = { - &reset, - &writeData, - NULL, - &caps_ipcm + &reset, + &writeData, + NULL, + &caps_ipcm };