decoder/ffmpeg: log detailed error message
This commit is contained in:
parent
2fd81b4932
commit
e8564b4c90
@ -817,6 +817,7 @@ endif
|
|||||||
if ENABLE_FFMPEG
|
if ENABLE_FFMPEG
|
||||||
noinst_LIBRARIES += libffmpeg.a
|
noinst_LIBRARIES += libffmpeg.a
|
||||||
libffmpeg_a_SOURCES = \
|
libffmpeg_a_SOURCES = \
|
||||||
|
src/lib/ffmpeg/LogError.cxx src/lib/ffmpeg/LogError.hxx \
|
||||||
src/lib/ffmpeg/Error.cxx src/lib/ffmpeg/Error.hxx \
|
src/lib/ffmpeg/Error.cxx src/lib/ffmpeg/Error.hxx \
|
||||||
src/lib/ffmpeg/Domain.cxx src/lib/ffmpeg/Domain.hxx
|
src/lib/ffmpeg/Domain.cxx src/lib/ffmpeg/Domain.hxx
|
||||||
libffmpeg_a_CPPFLAGS = $(AM_CPPFLAGS) \
|
libffmpeg_a_CPPFLAGS = $(AM_CPPFLAGS) \
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "FfmpegDecoderPlugin.hxx"
|
#include "FfmpegDecoderPlugin.hxx"
|
||||||
#include "lib/ffmpeg/Domain.hxx"
|
#include "lib/ffmpeg/Domain.hxx"
|
||||||
|
#include "lib/ffmpeg/LogError.hxx"
|
||||||
#include "../DecoderAPI.hxx"
|
#include "../DecoderAPI.hxx"
|
||||||
#include "FfmpegMetaData.hxx"
|
#include "FfmpegMetaData.hxx"
|
||||||
#include "tag/TagBuilder.hxx"
|
#include "tag/TagBuilder.hxx"
|
||||||
@ -335,8 +336,7 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
|
|||||||
&packet2);
|
&packet2);
|
||||||
if (len < 0) {
|
if (len < 0) {
|
||||||
/* if error, we skip the frame */
|
/* if error, we skip the frame */
|
||||||
LogDefault(ffmpeg_domain,
|
LogFfmpegError(len, "decoding failed, frame skipped");
|
||||||
"decoding failed, frame skipped");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
45
src/lib/ffmpeg/LogError.cxx
Normal file
45
src/lib/ffmpeg/LogError.cxx
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "LogError.hxx"
|
||||||
|
#include "Domain.hxx"
|
||||||
|
#include "Log.hxx"
|
||||||
|
|
||||||
|
#include <cstdint> /* needed due to libavutil bug */
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#include <libavutil/error.h>
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
LogFfmpegError(int errnum)
|
||||||
|
{
|
||||||
|
char msg[256];
|
||||||
|
av_strerror(errnum, msg, sizeof(msg));
|
||||||
|
LogError(ffmpeg_domain, msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
LogFfmpegError(int errnum, const char *prefix)
|
||||||
|
{
|
||||||
|
char msg[256];
|
||||||
|
av_strerror(errnum, msg, sizeof(msg));
|
||||||
|
FormatError(ffmpeg_domain, "%s: %s", prefix, msg);
|
||||||
|
}
|
29
src/lib/ffmpeg/LogError.hxx
Normal file
29
src/lib/ffmpeg/LogError.hxx
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MPD_FFMPEG_LOG_ERROR_HXX
|
||||||
|
#define MPD_FFMPEG_LOG_ERROR_HXX
|
||||||
|
|
||||||
|
void
|
||||||
|
LogFfmpegError(int errnum);
|
||||||
|
|
||||||
|
void
|
||||||
|
LogFfmpegError(int errnum, const char *prefix);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user