sukibaby
6f497f70e7
Resolves #610. `RageSoundReader_MP3` has three different methods of setting the position. The default choice of `SetPosition_toc` is unable to provide an accurate result. The reason Edit Mode has such a severe desync when working with MP3's is due to the preference of using `SetPosition_toc`. We can prevent this by using `SetPosition_hard` which works very well. Judging by comments in the file, it seems like `SetPosition_hard` was too resource intensive to use as the default method, 20+ years ago. The only downside is, if you start from an arbitrary position (which is **only** possible in Edit Mode), you have a few milliseconds of corrupted audio, but then the sync is perfect. You can hear this in the demonstration video below. When we start from the beginning of a file, such as playing a song, or using `Play whole song` in edit mode, `MADLIB_rewind` will be used. `SetPosition_hard` provides an accurate result, and is consistent with the offset provided by `MADLIB_rewind`. The result is a consistent sync experience whether the MP3 is started from the beginning, or from an arbitrary position midway thru the file. The `m_bAccurateSync` boolean dependency has been removed from SetPosition since it does not seem to provide any benefit on modern hardware. It seems fine to remove it so that we can call `MADLIB_rewind` or `SetPosition_hard` as fast as possible. In my testing I never got `SetPosition_estimate` to be used, but I've left it in as a backup option.
84 lines
2.8 KiB
C++
84 lines
2.8 KiB
C++
/* RageSoundReader_MP3 - An interface to read MP3s via MAD. */
|
|
|
|
#ifndef RAGE_SOUND_READER_MP3_H
|
|
#define RAGE_SOUND_READER_MP3_H
|
|
|
|
#include "RageSoundReader_FileReader.h"
|
|
#include "RageFile.h"
|
|
|
|
struct madlib_t;
|
|
|
|
typedef unsigned long id3_length_t;
|
|
|
|
signed long id3_tag_query( const unsigned char *data, id3_length_t length );
|
|
void fill_frame_index_cache( madlib_t *mad );
|
|
|
|
class RageSoundReader_MP3: public RageSoundReader_FileReader
|
|
{
|
|
public:
|
|
OpenResult Open( RageFileBasic *pFile );
|
|
void Close();
|
|
int GetLength() const { return GetLengthConst(false); }
|
|
int GetLength_Fast() const { return GetLengthConst(true); }
|
|
int SetPosition( int iSample );
|
|
int Read( float *pBuf, int iFrames );
|
|
unsigned GetNumChannels() const { return Channels; }
|
|
int GetSampleRate() const { return SampleRate; }
|
|
int GetNextSourceFrame() const;
|
|
bool SetProperty( const RString &sProperty, float fValue );
|
|
|
|
RageSoundReader_MP3();
|
|
~RageSoundReader_MP3();
|
|
RageSoundReader_MP3( const RageSoundReader_MP3 & ); /* not defined; don't use */
|
|
RageSoundReader_MP3 *Copy() const;
|
|
|
|
private:
|
|
int SampleRate;
|
|
int Channels;
|
|
bool m_bAccurateSync;
|
|
|
|
madlib_t *mad;
|
|
|
|
|
|
bool MADLIB_rewind();
|
|
int SetPosition_hard( int iSample );
|
|
int SetPosition_estimate( int iSample );
|
|
|
|
int fill_buffer();
|
|
int do_mad_frame_decode( bool headers_only=false );
|
|
int resync();
|
|
void synth_output();
|
|
int seek_stream_to_byte( int byte );
|
|
bool handle_first_frame();
|
|
int GetLengthInternal( bool fast );
|
|
int GetLengthConst( bool fast ) const;
|
|
};
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Copyright (c) 2001-2004 Chris Danford, Glenn Maynard
|
|
* All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
* whom the Software is furnished to do so, provided that the above
|
|
* copyright notice(s) and this permission notice appear in all copies of
|
|
* the Software and that both the above copyright notice(s) and this
|
|
* permission notice appear in supporting documentation.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|