Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-31 16:09:28 +02:00
Code Issues Releases Wiki Activity

Allow best-effort importing of malformed Ogg Vorbis data, patch by Stefan Hajnoczi. Add log messages to recovered and unrecovered errors for diagnosis

Browse Source
This commit is contained in:
RichardAsh1981@gmail.com 2014-05-23 19:28:32 +00:00
parent 8a5d31588a
commit 54cca1deda
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/import/ImportOGG.cpp
View File

@ -63,6 +63,7 @@ void GetOGGImportPlugin(ImportPluginList *importPluginList,
#else /* USE_LIBVORBIS */
#include <wx/log.h>
#include <wx/string.h>
#include <wx/utils.h>
#include <wx/intl.h>
@ -306,9 +307,20 @@ int OggImportFileHandle::Import(TrackFactory *trackFactory, Track ***outTracks,
1, // signed
&bitstream);
if (bytesRead < 0) {
if (bytesRead == OV_HOLE) {
wxFileName f(mFilename);
wxLogError(wxT("Ogg Vorbis importer: file %s is malformed, ov_read() reported a hole"),
f.GetFullName().c_str());
/* http://lists.xiph.org/pipermail/vorbis-dev/2001-February/003223.html
* is the justification for doing this - best effort for malformed file,
* hence the message.
*/
continue;
} else if (bytesRead < 0) {
/* Malformed Ogg Vorbis file. */
/* TODO: Return some sort of meaningful error. */
wxLogError(wxT("Ogg Vorbis importer: ov_read() returned error %i"),
bytesRead);
break;
}