Skip to content

Commit 8f267c4

Browse files
committed
LibAAH_RTP: Fix a deserialization bug. DO NOT MERGE
Fix for bug 6446715 Fix a deserialization bug which was causing an assertion failure in stagefright and bringing down the entire media server. Basically, you will hit this any time you play a track longer than ~2147 seconds. (Technically, the crash will happen any time the play pointer at a position which is ~2147 * (1 * 2N) where N >= 0) Change-Id: Ic0d371b0f6c29fddf0a033f5de08a70b3e63c854
1 parent 115284b commit 8f267c4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

media/libaah_rtp/aah_rx_player_substream.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ void AAH_RXPlayer::Substream::processPayloadStart(uint8_t* buf,
200200
if (ts_valid) {
201201
uint32_t ts_upper = U32_AT(buf + parse_offset);
202202
parse_offset += 4;
203-
ts = (static_cast<int64_t>(ts_upper) << 32) | ts_lower;
203+
ts = (static_cast<int64_t>(ts_upper) << 32) |
204+
static_cast<uint32_t>(ts_lower);
204205
}
205206

206207
// Check the flags to see if there is another 24 bytes of timestamp

0 commit comments

Comments
 (0)