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

revert r2216 (changes to the libav* includes)

Browse source 
Originally committed to SVN as r2228.
This commit is contained in:
Karl Blomster 2008-07-04 00:20:14 +00:00
parent 5c2e749421
commit 075bc5ec75
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
aegisub/audio_provider_lavc.cpp
View file

@ -58,8 +58,8 @@
extern "C" { extern "C" {
#include <libavcodec/avcodec.h> #include <ffmpeg/avcodec.h>
#include <libavformat/avformat.h> #include <ffmpeg/avformat.h>
} }
#include "mkv_wrap.h" #include "mkv_wrap.h"
#include "lavc_file.h" #include "lavc_file.h"
@ -141,7 +141,9 @@ LAVCAudioProvider::LAVCAudioProvider(Aegisub::String _filename)
buffer = (int16_t *)malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE); buffer = (int16_t *)malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
if (!buffer) if (!buffer)
throw _T("Out of memory"); throw _T("Failed to allocate %d bytes for audio decoding buffer, out of memory?", AVCODEC_MAX_AUDIO_FRAME_SIZE);
leftover_samples = 0;
} catch (...) { } catch (...) {
Destroy(); Destroy();
@ -204,9 +206,10 @@ void LAVCAudioProvider::GetAudio(void *buf, int64_t start, int64_t count)
/* do the actual resampling */ /* do the actual resampling */
decoded_samples = audio_resample(rsct, _buf, buffer, decoded_samples / codecContext->channels); decoded_samples = audio_resample(rsct, _buf, buffer, decoded_samples / codecContext->channels);
/* make some noise if we somehow ended up with more samples than we wanted (will cause audio skew) */ if (decoded_samples > samples_to_decode) {
if (decoded_samples > samples_to_decode)
wxLogMessage(wxString::Format(_T("Warning: decoder output more samples than requested, audio skew highly likely! (Wanted %d, got %d)"), (int)samples_to_decode, decoded_samples)); wxLogMessage(wxString::Format(_T("Warning: decoder output more samples than requested, audio skew highly likely! (Wanted %d, got %d)"), (int)samples_to_decode, decoded_samples));
}
} else { } else {
/* no resampling needed, just copy to the buffer, but first make noise if we got an overflow */ /* no resampling needed, just copy to the buffer, but first make noise if we got an overflow */
if (decoded_samples > samples_to_decode) if (decoded_samples > samples_to_decode)

8
aegisub/audio_provider_lavc.h
View file

@ -52,13 +52,14 @@
*/ */
extern "C" { extern "C" {
#include <libavcodec/avcodec.h> #include <ffmpeg/avcodec.h>
#include <libavformat/avformat.h> #include <ffmpeg/avformat.h>
} }
#include "mkv_wrap.h" #include "mkv_wrap.h"
#include "lavc_file.h" #include "lavc_file.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "lavc_file.h" #include "lavc_file.h"
#include <vector>
/////////////////////// ///////////////////////
@ -74,6 +75,9 @@ private:
int audStream; int audStream;
int16_t *buffer; int16_t *buffer;
std::vector<int16_t> overshoot_buffer;
int leftover_samples;
void Destroy(); void Destroy();

4
aegisub/lavc_file.h
View file

@ -41,8 +41,8 @@
#endif #endif
#include <wx/filename.h> #include <wx/filename.h>
extern "C" { extern "C" {
#include <libavcodec/avcodec.h> #include <ffmpeg/avcodec.h>
#include <libavformat/avformat.h> #include <ffmpeg/avformat.h>
} }
#include "include/aegisub/aegisub.h" #include "include/aegisub/aegisub.h"

6
aegisub/video_provider_lavc.h
View file

@ -43,9 +43,9 @@
#define EMULATE_INTTYPES #define EMULATE_INTTYPES
#endif #endif
extern "C" { extern "C" {
#include <libavcodec/avcodec.h> #include <ffmpeg/avcodec.h>
#include <libavformat/avformat.h> #include <ffmpeg/avformat.h>
#include <libswscale/swscale.h> #include <ffmpeg/swscale.h>
} }
#include "include/aegisub/video_provider.h" #include "include/aegisub/video_provider.h"
#include "include/aegisub/aegisub.h" #include "include/aegisub/aegisub.h"