am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"

* commit '432ed3d66d09464778df31c73374ee897f7b8840':
  libstagefright: fix 64-bit warnings

diff --cc media/libstagefright/httplive/LiveSession.cpp
index 61c54c1,033d981..6d48ab7
--- 1/media/libstagefright/httplive/LiveSession.cpp
--- 2/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@@ -37,9 -37,8 +37,10 @@@
  #include <media/stagefright/MetaData.h>
  #include <media/stagefright/Utils.h>
  
 +#include <utils/Mutex.h>
 +
  #include <ctype.h>
+ #include <inttypes.h>
  #include <openssl/aes.h>
  #include <openssl/md5.h>
  
@@@ -672,23 -554,16 +673,23 @@@ ssize_t LiveSession::fetchFile
          size = 65536;
      }
  
 -    sp<ABuffer> buffer = new ABuffer(size);
 -    buffer->setRange(0, 0);
 +    sp<ABuffer> buffer = *out != NULL ? *out : new ABuffer(size);
 +    if (*out == NULL) {
 +        buffer->setRange(0, 0);
 +    }
  
 +    ssize_t bytesRead = 0;
 +    // adjust range_length if only reading partial block
 +    if (block_size > 0 && (range_length == -1 || buffer->size() + block_size < range_length)) {
 +        range_length = buffer->size() + block_size;
 +    }
      for (;;) {
 +        // Only resize when we don't know the size.
          size_t bufferRemaining = buffer->capacity() - buffer->size();
 -
 -        if (bufferRemaining == 0) {
 +        if (bufferRemaining == 0 && getSizeErr != OK) {
              bufferRemaining = 32768;
  
-             ALOGV("increasing download buffer to %d bytes",
+             ALOGV("increasing download buffer to %zu bytes",
                   buffer->size() + bufferRemaining);
  
              sp<ABuffer> copy = new ABuffer(buffer->size() + bufferRemaining);

diff --cc media/libstagefright/httplive/PlaylistFetcher.cpp
Simple merge

diff --cc media/libstagefright/matroska/MatroskaExtractor.cpp
Simple merge

diff --cc media/libstagefright/mpeg2ts/ATSParser.cpp
Simple merge

diff --cc media/libstagefright/mpeg2ts/ESQueue.cpp
Simple merge