i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Barrett:

Browse Source 
Initialize the stream's IO buffer, otherwise it could crash in ~StreamBase().
It's only initialized when the media format was actually successfully probed.
Fix #6595. Thanks.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39374 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-11-09 15:46:23 +00:00
parent 2778794cff
commit 801843aed6
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
+9 -7
View File
@@ -229,6 +229,8 @@ StreamBase::StreamBase(BPositionIO* source, BLocker* sourceLock,
fStreamBuildsIndexWhileReading(false) fStreamBuildsIndexWhileReading(false)
{ {
// NOTE: Don't use streamLock here, it may not yet be initialized! // NOTE: Don't use streamLock here, it may not yet be initialized!
fIOContext.buffer = NULL;
av_new_packet(&fPacket, 0); av_new_packet(&fPacket, 0);
memset(&fFormat, 0, sizeof(media_format)); memset(&fFormat, 0, sizeof(media_format));
} }
@@ -429,7 +431,7 @@ StreamBase::FrameRate() const
&& fStream->codec->time_base.num) { && fStream->codec->time_base.num) {
frameRate = 1 / av_q2d(fStream->codec->time_base); frameRate = 1 / av_q2d(fStream->codec->time_base);
} }
// TODO: Fix up interlaced video for real // TODO: Fix up interlaced video for real
if (frameRate == 50.0f) if (frameRate == 50.0f)
frameRate = 25.0f; frameRate = 25.0f;
@@ -520,7 +522,7 @@ StreamBase::Seek(uint32 flags, int64* frame, bigtime_t* time)
return B_ERROR; return B_ERROR;
} }
seekAgain = false; seekAgain = false;
// Our last packet is toast in any case. Read the next one so we // Our last packet is toast in any case. Read the next one so we
// know where we really seeked. // know where we really seeked.
fReusePacket = false; fReusePacket = false;
@@ -609,7 +611,7 @@ StreamBase::Seek(uint32 flags, int64* frame, bigtime_t* time)
bigtime_t foundTime = _ConvertFromStreamTimeBase(streamTimeStamp); bigtime_t foundTime = _ConvertFromStreamTimeBase(streamTimeStamp);
bigtime_t timeDiff = foundTime > *time bigtime_t timeDiff = foundTime > *time
? foundTime - *time : *time - foundTime; ? foundTime - *time : *time - foundTime;
if (timeDiff > 1000000 if (timeDiff > 1000000
&& (fStreamBuildsIndexWhileReading && (fStreamBuildsIndexWhileReading
|| index == fStream->nb_index_entries - 1)) { || index == fStream->nb_index_entries - 1)) {
@@ -654,11 +656,11 @@ StreamBase::Seek(uint32 flags, int64* frame, bigtime_t* time)
*time = 0; *time = 0;
} }
} }
// Our last packet is toast in any case. Read the next one so // Our last packet is toast in any case. Read the next one so
// we know where we really sought. // we know where we really sought.
bigtime_t foundTime = *time; bigtime_t foundTime = *time;
fReusePacket = false; fReusePacket = false;
if (_NextPacket(true) == B_OK) { if (_NextPacket(true) == B_OK) {
if (fPacket.pts != kNoPTSValue) if (fPacket.pts != kNoPTSValue)
@@ -667,7 +669,7 @@ StreamBase::Seek(uint32 flags, int64* frame, bigtime_t* time)
TRACE_SEEK(" no PTS in packet after seeking\n"); TRACE_SEEK(" no PTS in packet after seeking\n");
} else } else
TRACE_SEEK(" _NextPacket() failed!\n"); TRACE_SEEK(" _NextPacket() failed!\n");
*time = foundTime; *time = foundTime;
TRACE_SEEK(" sought time: %.2fs\n", *time / 1000000.0); TRACE_SEEK(" sought time: %.2fs\n", *time / 1000000.0);
if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0) { if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0) {
@@ -1105,7 +1107,7 @@ AVFormatReader::Stream::Init(int32 virtualIndex)
format->u.raw_audio.format format->u.raw_audio.format
= avformat_to_beos_format(codecContext->sample_fmt); = avformat_to_beos_format(codecContext->sample_fmt);
format->u.raw_audio.buffer_size = 0; format->u.raw_audio.buffer_size = 0;
// Read one packet and mark it for later re-use. (So our first // Read one packet and mark it for later re-use. (So our first
// GetNextChunk() call does not read another packet.) // GetNextChunk() call does not read another packet.)
if (_NextPacket(true) == B_OK) { if (_NextPacket(true) == B_OK) {