summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-12 10:58:24 -0700
committerAndreas Huber <andih@google.com>2010-08-12 10:58:24 -0700
commita6238a1e5b603ca2ccf3b2297c9bc8a141cf8559 (patch)
tree0dadd73439109d568374ac1c83b45407f1f480cd /media
parent6dc387a8c3f031f9f17d1138295368946563f7a5 (diff)
downloadframeworks_av-a6238a1e5b603ca2ccf3b2297c9bc8a141cf8559.zip
frameworks_av-a6238a1e5b603ca2ccf3b2297c9bc8a141cf8559.tar.gz
frameworks_av-a6238a1e5b603ca2ccf3b2297c9bc8a141cf8559.tar.bz2
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
Change-Id: I7cc468a3095537347d86803579001458b62fcadb
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/rtsp/AH263Assembler.cpp2
-rw-r--r--media/libstagefright/rtsp/ARTPWriter.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/rtsp/AH263Assembler.cpp b/media/libstagefright/rtsp/AH263Assembler.cpp
index 8b59998..2818041 100644
--- a/media/libstagefright/rtsp/AH263Assembler.cpp
+++ b/media/libstagefright/rtsp/AH263Assembler.cpp
@@ -110,7 +110,7 @@ ARTPAssembler::AssemblyStatus AH263Assembler::addPacket(
buffer->data()[0] = 0x00;
buffer->data()[1] = 0x00;
} else {
- buffer->setRange(2, buffer->size() - 2);
+ buffer->setRange(buffer->offset() + 2, buffer->size() - 2);
}
mPackets.push_back(buffer);
diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp
index cc23856..d6dd597 100644
--- a/media/libstagefright/rtsp/ARTPWriter.cpp
+++ b/media/libstagefright/rtsp/ARTPWriter.cpp
@@ -43,7 +43,7 @@ ARTPWriter::ARTPWriter(int fd)
#if 1
mRTPAddr.sin_addr.s_addr = INADDR_ANY;
#else
- mRTPAddr.sin_addr.s_addr = inet_addr("172.19.19.74");
+ mRTPAddr.sin_addr.s_addr = inet_addr("172.19.18.246");
#endif
mRTPAddr.sin_port = htons(5634);