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: don't set cover-art variable on failure

Browse Source
This commit is contained in:
martii
2013-11-11 19:12:36 +01:00
committed by [CST] Focus
parent 5d02024ae1
commit 1575fad077
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,8 @@ extern cAudio * audioDecoder;
#define ProgName "FfmpegDec" #define ProgName "FfmpegDec"
#define COVERFILE "/tmp/cover.jpg"
static OpenThreads::Mutex mutex; static OpenThreads::Mutex mutex;
static void log_callback(void *, int, const char *format, va_list ap) static void log_callback(void *, int, const char *format, va_list ap)
@@ -184,7 +186,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, const CFile::FileType ft, int /
RetCode Status=OK; RetCode Status=OK;
is_stream = fseek((FILE *)in, 0, SEEK_SET); is_stream = fseek((FILE *)in, 0, SEEK_SET);
unlink ("/tmp/cover.jpg"); unlink (COVERFILE);
if (!SetMetaData((FILE *)in, ft, _meta_data)) { if (!SetMetaData((FILE *)in, ft, _meta_data)) {
DeInit(); DeInit();
Status=DATA_ERR; Status=DATA_ERR;
@@ -430,13 +432,13 @@ bool CFfmpegDec::SetMetaData(FILE *_in, CFile::FileType ft, CAudioMetaData* m)
if (avc->streams[i]->codec->bit_rate > 0) if (avc->streams[i]->codec->bit_rate > 0)
bitrate += avc->streams[i]->codec->bit_rate; bitrate += avc->streams[i]->codec->bit_rate;
if (avc->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC) { if (avc->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC) {
FILE *cover = fopen("/tmp/cover.jpg", "wb"); FILE *cover = fopen(COVERFILE, "wb");
if (cover) { if (cover) {
AVPacket *pkt = &avc->streams[i]->attached_pic; AVPacket *pkt = &avc->streams[i]->attached_pic;
fwrite(pkt->data, pkt->size, 1, cover); fwrite(pkt->data, pkt->size, 1, cover);
fclose(cover); fclose(cover);
m->cover = COVERFILE;
} }
m->cover = "/tmp/cover.jpg";
} }
} }
if(m->filesize && bitrate) if(m->filesize && bitrate)