diff options
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp')
-rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp index 0dc525b0e5a..ea6e0c549fa 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp @@ -172,7 +172,8 @@ static const char* fileopen_error = "AUD_FFMPEGReader: File couldn't be " AUD_FFMPEGReader::AUD_FFMPEGReader(std::string filename) : m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1), - m_byteiocontext(NULL) + m_byteiocontext(NULL), + m_membuf(NULL) { // open file if(av_open_input_file(&m_formatCtx, filename.c_str(), NULL, 0, NULL)!=0) @@ -194,12 +195,15 @@ static const char* streamopen_error = "AUD_FFMPEGReader: Stream couldn't be " AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer) : m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1), - m_membuffer(buffer) + m_membuffer(buffer), + m_membufferpos(0) { - m_byteiocontext = (ByteIOContext*)av_mallocz(sizeof(ByteIOContext)); + m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)); - if(init_put_byte(m_byteiocontext, (data_t*)buffer.get()->getBuffer(), - buffer.get()->getSize(), 0, NULL, NULL, NULL, NULL) != 0) + m_byteiocontext = av_alloc_put_byte(m_membuf, FF_MIN_BUFFER_SIZE, 0, this, + read_packet, NULL, seek_packet); + + if(!m_byteiocontext) { av_free(m_byteiocontext); AUD_THROW(AUD_ERROR_FILE, fileopen_error); @@ -207,7 +211,7 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer) : AVProbeData probe_data; probe_data.filename = ""; - probe_data.buf = (data_t*)buffer.get()->getBuffer(); + probe_data.buf = reinterpret_cast<data_t*>(buffer.get()->getBuffer()); probe_data.buf_size = buffer.get()->getSize(); AVInputFormat* fmt = av_probe_input_format(&probe_data, 1); @@ -243,6 +247,40 @@ AUD_FFMPEGReader::~AUD_FFMPEGReader() av_close_input_file(m_formatCtx); } +int AUD_FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size) +{ + AUD_FFMPEGReader* reader = reinterpret_cast<AUD_FFMPEGReader*>(opaque); + + int size = AUD_MIN(buf_size, reader->m_membuffer.get()->getSize() - reader->m_membufferpos); + + if(size < 0) + return -1; + + memcpy(buf, ((data_t*)reader->m_membuffer.get()->getBuffer()) + reader->m_membufferpos, size); + reader->m_membufferpos += size; + + return size; +} + +int64_t AUD_FFMPEGReader::seek_packet(void* opaque, int64_t offset, int whence) +{ + AUD_FFMPEGReader* reader = reinterpret_cast<AUD_FFMPEGReader*>(opaque); + + switch(whence) + { + case SEEK_SET: + reader->m_membufferpos = 0; + break; + case SEEK_END: + reader->m_membufferpos = reader->m_membuffer.get()->getSize(); + break; + case AVSEEK_SIZE: + return reader->m_membuffer.get()->getSize(); + } + + return (reader->m_membufferpos += offset); +} + bool AUD_FFMPEGReader::isSeekable() const { return true; |