mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Revert r4828 as I decided to fix it in FFMS2 instead.

Browse source 
Originally committed to SVN as r5057.
This commit is contained in:
Thomas Goyne 2010-12-29 06:26:56 +00:00
parent ceb2bebf2c
commit ce2adcea79
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
aegisub/src/audio_provider_ffmpegsource.cpp
View file

@ -190,9 +190,8 @@ void FFmpegSourceAudioProvider::LoadAudio(wxString filename) {
channels = AudioInfo.Channels; channels = AudioInfo.Channels;
sample_rate = AudioInfo.SampleRate; sample_rate = AudioInfo.SampleRate;
delay = AudioInfo.FirstTime * sample_rate; num_samples = AudioInfo.NumSamples;
num_samples = AudioInfo.NumSamples + delay; if (channels <= 0 || sample_rate <= 0 || num_samples <= 0)
if (channels <= 0 || sample_rate <= 0 || num_samples <= 0 || delay < 0)
throw AudioOpenError("sanity check failed, consult your local psychiatrist"); throw AudioOpenError("sanity check failed, consult your local psychiatrist");
// FIXME: use the actual sample format too? // FIXME: use the actual sample format too?
@ -229,19 +228,7 @@ void FFmpegSourceAudioProvider::Close() {
/// @param Count /// @param Count
/// ///
void FFmpegSourceAudioProvider::GetAudio(void *Buf, int64_t Start, int64_t Count) const { void FFmpegSourceAudioProvider::GetAudio(void *Buf, int64_t Start, int64_t Count) const {
uint8_t *Buf2 = static_cast<uint8_t*>(Buf); if (FFMS_GetAudio(AudioSource, Buf, Start, Count, &ErrInfo)) {
Start -= delay;
if (Start < 0) {
size_t Bytes = std::min(-Start, Count) * bytes_per_sample * channels;
memset(Buf2, 0, Bytes);
Count += Start;
if (Count <= 0) return;
Start = 0;
Buf2 += Bytes;
}
if (FFMS_GetAudio(AudioSource, Buf2, Start, Count, &ErrInfo)) {
throw AudioDecodeError(std::string("Failed to get audio samples: ") + ErrInfo.Buffer); throw AudioDecodeError(std::string("Failed to get audio samples: ") + ErrInfo.Buffer);
} }
} }

3
aegisub/src/audio_provider_ffmpegsource.h
View file

@ -52,9 +52,6 @@ private:
void Close(); void Close();
void LoadAudio(wxString filename); void LoadAudio(wxString filename);
/// Audio delay in samples
int64_t delay;
public: public:
FFmpegSourceAudioProvider(wxString filename); FFmpegSourceAudioProvider(wxString filename);
virtual ~FFmpegSourceAudioProvider(); virtual ~FFmpegSourceAudioProvider();