git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c8a325
)
properly use 'long long' for aligned_start, aligned_end
author
Felix Domke
<tmbinc@elitedvb.net>
Sun, 20 May 2007 14:23:40 +0000
(14:23 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sun, 20 May 2007 14:23:40 +0000
(14:23 +0000)
lib/dvb/dvb.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index 934ce249494f19c1f502d1d0d4bb93506e8381e6..aab903baad282656b7b0c04e78bae6ffa67eb9a2 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-933,7
+933,7
@@
void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
max = align(m_skipmode_n, blocksize);
}
max = align(m_skipmode_n, blocksize);
}
- eDebug("getNextSourceSpan, current offset is %08llx
!", current_offset
);
+ eDebug("getNextSourceSpan, current offset is %08llx
, m_skipmode_m = %d!", current_offset, m_skipmode_m
);
current_offset += align(m_skipmode_m, blocksize);
current_offset += align(m_skipmode_m, blocksize);
@@
-1010,14
+1010,14
@@
void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
}
eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
}
eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
- current_offset =
offset;
+ current_offset =
align(offset, blocksize); /* in case tstools return non-aligned offset */
}
for (std::list<std::pair<off_t, off_t> >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i)
{
}
for (std::list<std::pair<off_t, off_t> >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i)
{
-
int
aligned_start = align(i->first, blocksize);
-
int
aligned_end = align(i->second, blocksize);
-
+
long long
aligned_start = align(i->first, blocksize);
+
long long
aligned_end = align(i->second, blocksize);
+
if ((current_offset >= aligned_start) && (current_offset < aligned_end))
{
start = current_offset;
if ((current_offset >= aligned_start) && (current_offset < aligned_end))
{
start = current_offset;