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 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer/container_ffmpeg: switch to ffmpeg 2.0 API

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 212a414a5e
Author: martii <m4rtii@gmx.de>
Date: 2014-04-03 (Thu, 03 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-03 18:10:03 +02:00
parent 5bddc3f8c7
commit beee99fbbc
4 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libeplayer3/container/container_ffmpeg.c
View File

@@ -435,7 +435,7 @@ static void FFMPEGThread(Context_t * context)
swr = NULL;
}
if (decoded_frame) {
avcodec_free_frame(&decoded_frame);
av_frame_free(&decoded_frame);
decoded_frame = NULL;
}
context->output->Command(context, OUTPUT_CLEAR, NULL);
@@ -455,7 +455,7 @@ static void FFMPEGThread(Context_t * context)
exit(1);
}
} else
avcodec_get_frame_defaults(decoded_frame);
av_frame_unref(decoded_frame);
int len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &packet);
if (len < 0) {
@@ -635,7 +635,7 @@ static void FFMPEGThread(Context_t * context)
if (swr)
swr_free(&swr);
if (decoded_frame)
avcodec_free_frame(&decoded_frame);
av_frame_free(&decoded_frame);
if (context->playback)
context->playback->abortPlayback = 1;

20
libeplayer3/output/writer/pcm.c
View File

@@ -125,8 +125,7 @@ static int prepareClipPlay(int uNoOfChannels, int uSampleRate,
memcpy(lpcm_prv, clpcm_prv, sizeof(lpcm_prv));
//figure out size of subframe
//and set up sample rate
// figure out size of subframe and set up sample rate
switch (uSampleRate) {
case 48000:
SubFrameLen = 40;
@@ -172,8 +171,7 @@ static int prepareClipPlay(int uNoOfChannels, int uSampleRate,
case 16:
break;
default:
printf("inappropriate bits per sample (%d) - must be 16 or 24\n",
uBitsPerSample);
printf("inappropriate bits per sample (%d) - must be 16 or 24\n", uBitsPerSample);
return 1;
}
@@ -240,16 +238,12 @@ static int writeData(void *_call)
}
//get first PES's worth
if (breakBufferFillSize > 0) {
memcpy(injectBuffer, breakBuffer,
sizeof(unsigned char) * breakBufferFillSize);
memcpy(&injectBuffer[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(injectBuffer, &buffer[pos],
sizeof(unsigned char) * SubFrameLen);
memcpy(injectBuffer, &buffer[pos], sizeof(unsigned char) * SubFrameLen);
pos += SubFrameLen;
}
@@ -291,9 +285,7 @@ static int writeData(void *_call)
//increment err... subframe count?
lpcm_prv[1] = ((lpcm_prv[1] + SubFramesPerPES) & 0x1F);
iov[0].iov_len =
InsertPesHeader(PesHeader, iov[1].iov_len + iov[2].iov_len,
PCM_PES_START_CODE, call->Pts, 0);
iov[0].iov_len = InsertPesHeader(PesHeader, iov[1].iov_len + iov[2].iov_len, PCM_PES_START_CODE, call->Pts, 0);
int len = writev(call->fd, iov, 3);
if (len < 0)
break;