am 432ed3d6: Merge "libstagefright: fix 64-bit warnings" (6bb7a891) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ OMX_ERRORTYPE SoftFlacEncoder::internalSetParameter(

		if (defParams->nPortIndex == 0) {
		if (defParams->nBufferSize > kMaxInputBufferSize) {
		ALOGE("Input buffer size must be at most %zu bytes",
		ALOGE("Input buffer size must be at most %d bytes",
		kMaxInputBufferSize);
		return OMX_ErrorUnsupportedSetting;
		}
		@@ -363,7 +363,7 @@ FLAC__StreamEncoderWriteStatus SoftFlacEncoder::onEncodedFlacAvailable(
		if ((samples == 0) \|\| !mEncoderWriteData) {
		// called by the encoder because there's header data to save, but it's not the role
		// of this component (unless WRITE_FLAC_HEADER_IN_FIRST_BUFFER is defined)
		ALOGV("ignoring %d bytes of header data (samples=%d)", bytes, samples);
		ALOGV("ignoring %zu bytes of header data (samples=%d)", bytes, samples);
		return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
		}

		@@ -384,9 +384,9 @@ FLAC__StreamEncoderWriteStatus SoftFlacEncoder::onEncodedFlacAvailable(
		#endif

		// write encoded data
		ALOGV(" writing %d bytes of encoded data on output port", bytes);
		ALOGV(" writing %zu bytes of encoded data on output port", bytes);
		if (bytes > outHeader->nAllocLen - outHeader->nOffset - outHeader->nFilledLen) {
		ALOGE(" not enough space left to write encoded data, dropping %u bytes", bytes);
		ALOGE(" not enough space left to write encoded data, dropping %zu bytes", bytes);
		// a fatal error would stop the encoding
		return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
		}

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,8 @@

		#include "SoftMPEG4Encoder.h"

		#include <inttypes.h>

		namespace android {

		template<class T>
		@@ -725,7 +727,7 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) {
		if (!PVEncodeVideoFrame(mHandle, &vin, &vout,
		&modTimeMs, outPtr, &dataLength, &nLayer) \|\|
		!PVGetHintTrack(mHandle, &hintTrack)) {
		ALOGE("Failed to encode frame or get hink track at frame %lld",
		ALOGE("Failed to encode frame or get hink track at frame %" PRId64,
		mNumInputFrames);
		mSignalledError = true;
		notify(OMX_EventError, OMX_ErrorUndefined, 0, 0);

media/libstagefright/httplive/LiveSession.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		#include <utils/Mutex.h>

		#include <ctype.h>
		#include <inttypes.h>
		#include <openssl/aes.h>
		#include <openssl/md5.h>

		@@ -172,7 +173,7 @@ status_t LiveSession::dequeueAccessUnit(
		if (stream == STREAMTYPE_AUDIO \|\| stream == STREAMTYPE_VIDEO) {
		int64_t timeUs;
		CHECK((*accessUnit)->meta()->findInt64("timeUs", &timeUs));
		ALOGV("[%s] read buffer at time %lld us", streamStr, timeUs);
		ALOGV("[%s] read buffer at time %" PRId64 " us", streamStr, timeUs);

		mLastDequeuedTimeUs = timeUs;
		mRealTimeBaseUs = ALooper::GetNowUs() - timeUs;
		@@ -688,7 +689,7 @@ ssize_t LiveSession::fetchFile(
		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);
		@@ -701,7 +702,7 @@ ssize_t LiveSession::fetchFile(
		size_t maxBytesToRead = bufferRemaining;
		if (range_length >= 0) {
		int64_t bytesLeftInRange = range_length - buffer->size();
		if (bytesLeftInRange < maxBytesToRead) {
		if (bytesLeftInRange < (int64_t)maxBytesToRead) {
		maxBytesToRead = bytesLeftInRange;

		if (bytesLeftInRange == 0) {
		@@ -968,7 +969,7 @@ void LiveSession::changeConfiguration(

		mPrevBandwidthIndex = bandwidthIndex;

		ALOGV("changeConfiguration => timeUs:%lld us, bwIndex:%d, pickTrack:%d",
		ALOGV("changeConfiguration => timeUs:%" PRId64 " us, bwIndex:%zu, pickTrack:%d",
		timeUs, bandwidthIndex, pickTrack);

		if (pickTrack) {

media/libstagefright/httplive/PlaylistFetcher.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		#include <media/stagefright/Utils.h>

		#include <ctype.h>
		#include <inttypes.h>
		#include <openssl/aes.h>
		#include <openssl/md5.h>

		@@ -796,7 +797,7 @@ void PlaylistFetcher::onDownloadNext() {
		ALOGE("Cannot find sequence number %d in playlist "
		"(contains %d - %d)",
		mSeqNumber, firstSeqNumberInPlaylist,
		firstSeqNumberInPlaylist + mPlaylist->size() - 1);
		firstSeqNumberInPlaylist + (int32_t)mPlaylist->size() - 1);

		notifyError(ERROR_END_OF_STREAM);
		return;

media/libstagefright/id3/ID3.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -41,9 +41,9 @@ struct MemorySource : public DataSource {
		}

		virtual ssize_t readAt(off64_t offset, void *data, size_t size) {
		off64_t available = (offset >= mSize) ? 0ll : mSize - offset;
		off64_t available = (offset >= (off64_t)mSize) ? 0ll : mSize - offset;

		size_t copy = (available > size) ? size : available;
		size_t copy = (available > (off64_t)size) ? size : available;
		memcpy(data, mData + offset, copy);

		return copy;
		@@ -172,7 +172,7 @@ struct id3_header {
		}

		if (size > kMaxMetadataSize) {
		ALOGE("skipping huge ID3 metadata of size %d", size);
		ALOGE("skipping huge ID3 metadata of size %zu", size);
		return false;
		}

		@@ -654,8 +654,8 @@ void ID3::Iterator::findFrame() {
		mFrameSize += 6;

		if (mOffset + mFrameSize > mParent.mSize) {
		ALOGV("partial frame at offset %d (size = %d, bytes-remaining = %d)",
		mOffset, mFrameSize, mParent.mSize - mOffset - 6);
		ALOGV("partial frame at offset %zu (size = %zu, bytes-remaining = %zu)",
		mOffset, mFrameSize, mParent.mSize - mOffset - (size_t)6);
		return;
		}

		@@ -695,8 +695,8 @@ void ID3::Iterator::findFrame() {
		mFrameSize = 10 + baseSize;

		if (mOffset + mFrameSize > mParent.mSize) {
		ALOGV("partial frame at offset %d (size = %d, bytes-remaining = %d)",
		mOffset, mFrameSize, mParent.mSize - mOffset - 10);
		ALOGV("partial frame at offset %zu (size = %zu, bytes-remaining = %zu)",
		mOffset, mFrameSize, mParent.mSize - mOffset - (size_t)10);
		return;
		}