mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver/audiodec/ffmpegdec.cpp: fix bits per sample, fix av_free_packet

Browse Source
This commit is contained in:
[CST] Focus
2013-12-02 18:29:03 +04:00
parent 38ca5c4f38
commit 6aab9783f1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/audiodec/ffmpegdec.cpp
View File

@@ -221,14 +221,14 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, const CFile::FileType ft, int /
mSampleRate = samplerate; mSampleRate = samplerate;
#if __BYTE_ORDER == __LITTLE_ENDIAN #if __BYTE_ORDER == __LITTLE_ENDIAN
audioDecoder->PrepareClipPlay(mChannels, mSampleRate, 32, 1); audioDecoder->PrepareClipPlay(mChannels, mSampleRate, 16, 1);
#else #else
audioDecoder->PrepareClipPlay(mChannels, mSampleRate, 32, 0); audioDecoder->PrepareClipPlay(mChannels, mSampleRate, 16, 0);
#endif #endif
AVFrame *frame = NULL; AVFrame *frame = NULL;
AVPacket packet; AVPacket rpacket;
av_init_packet(&packet); av_init_packet(&rpacket);
av_opt_set_int(swr, "in_channel_layout", c->channel_layout, 0); av_opt_set_int(swr, "in_channel_layout", c->channel_layout, 0);
av_opt_set_int(swr, "out_channel_layout", c->channel_layout, 0); av_opt_set_int(swr, "out_channel_layout", c->channel_layout, 0);
@@ -275,14 +275,17 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, const CFile::FileType ft, int /
while(*state==PAUSE && !is_stream) while(*state==PAUSE && !is_stream)
usleep(10000); usleep(10000);
if (av_read_frame(avc, &packet)) { if (av_read_frame(avc, &rpacket)) {
Status=DATA_ERR; Status=DATA_ERR;
break; break;
} }
if (packet.stream_index != best_stream) if (rpacket.stream_index != best_stream) {
av_free_packet(&rpacket);
continue; continue;
}
AVPacket packet = rpacket;
while (packet.size > 0) { while (packet.size > 0) {
int got_frame = 0; int got_frame = 0;
if (!frame) { if (!frame) {
@@ -337,6 +340,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, const CFile::FileType ft, int /
} }
if (time_played && avc->streams[best_stream]->time_base.den) if (time_played && avc->streams[best_stream]->time_base.den)
*time_played = (pts - start_pts) * avc->streams[best_stream]->time_base.num / avc->streams[best_stream]->time_base.den; *time_played = (pts - start_pts) * avc->streams[best_stream]->time_base.num / avc->streams[best_stream]->time_base.den;
av_free_packet(&rpacket);
} while (*state!=STOP_REQ && Status==OK); } while (*state!=STOP_REQ && Status==OK);
audioDecoder->StopClip(); audioDecoder->StopClip();
@@ -344,7 +348,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, const CFile::FileType ft, int /
swr_free(&swr); swr_free(&swr);
av_free(outbuf); av_free(outbuf);
av_free_packet(&packet); av_free_packet(&rpacket);
avcodec_free_frame(&frame); avcodec_free_frame(&frame);
avcodec_close(c); avcodec_close(c);
//av_free(avcc); //av_free(avcc);