libstagefright: 64-bit compile warnings (a5750e0d) · Commits · e / os / android_frameworks_av

media/libstagefright/AACWriter.cpp

+7 −5

Original line number	Diff line number	Diff line
		@@ -14,6 +14,12 @@
		* limitations under the License.
		*/

		#include <fcntl.h>
		#include <inttypes.h>
		#include <sys/prctl.h>
		#include <sys/stat.h>
		#include <sys/types.h>

		//#define LOG_NDEBUG 0
		#define LOG_TAG "AACWriter"
		#include <utils/Log.h>
		@@ -27,10 +33,6 @@
		#include <media/stagefright/MediaSource.h>
		#include <media/stagefright/MetaData.h>
		#include <media/mediarecorder.h>
		#include <sys/prctl.h>
		#include <sys/types.h>
		#include <sys/stat.h>
		#include <fcntl.h>

		namespace android {

		@@ -348,7 +350,7 @@ status_t AACWriter::threadFunc() {
		mResumed = false;
		}
		timestampUs -= previousPausedDurationUs;
		ALOGV("time stamp: %lld, previous paused duration: %lld",
		ALOGV("time stamp: %" PRId64 ", previous paused duration: %" PRId64,
		timestampUs, previousPausedDurationUs);
		if (timestampUs > maxTimestampUs) {
		maxTimestampUs = timestampUs;

media/libstagefright/AMRWriter.cpp

+7 −5

Original line number	Diff line number	Diff line
		@@ -14,6 +14,12 @@
		* limitations under the License.
		*/

		#include <fcntl.h>
		#include <inttypes.h>
		#include <sys/prctl.h>
		#include <sys/stat.h>
		#include <sys/types.h>

		#include <media/stagefright/foundation/ADebug.h>
		#include <media/stagefright/AMRWriter.h>
		#include <media/stagefright/MediaBuffer.h>
		@@ -22,10 +28,6 @@
		#include <media/stagefright/MediaSource.h>
		#include <media/stagefright/MetaData.h>
		#include <media/mediarecorder.h>
		#include <sys/prctl.h>
		#include <sys/types.h>
		#include <sys/stat.h>
		#include <fcntl.h>

		namespace android {

		@@ -235,7 +237,7 @@ status_t AMRWriter::threadFunc() {
		mResumed = false;
		}
		timestampUs -= previousPausedDurationUs;
		ALOGV("time stamp: %lld, previous paused duration: %lld",
		ALOGV("time stamp: %" PRId64 ", previous paused duration: %" PRId64,
		timestampUs, previousPausedDurationUs);
		if (timestampUs > maxTimestampUs) {
		maxTimestampUs = timestampUs;

media/libstagefright/AudioPlayer.cpp

+8 −6

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		* limitations under the License.
		*/

		#include <inttypes.h>

		//#define LOG_NDEBUG 0
		#define LOG_TAG "AudioPlayer"
		#include <utils/Log.h>
		@@ -566,12 +568,12 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) {
		int64_t timeToCompletionUs =
		(1000000ll * numFramesPendingPlayout) / mSampleRate;

		ALOGV("total number of frames played: %lld (%lld us)",
		ALOGV("total number of frames played: %" PRId64 " (%lld us)",
		(mNumFramesPlayed + numAdditionalFrames),
		1000000ll * (mNumFramesPlayed + numAdditionalFrames)
		/ mSampleRate);

		ALOGV("%d frames left to play, %lld us (%.2f secs)",
		ALOGV("%d frames left to play, %" PRId64 " us (%.2f secs)",
		numFramesPendingPlayout,
		timeToCompletionUs, timeToCompletionUs / 1E6);

		@@ -628,7 +630,7 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) {
		mPositionTimeRealUs =
		((mNumFramesPlayed + size_done / mFrameSize) * 1000000)
		/ mSampleRate;
		ALOGV("buffer->size() = %d, "
		ALOGV("buffer->size() = %zu, "
		"mPositionTimeMediaUs=%.2f mPositionTimeRealUs=%.2f",
		mInputBuffer->range_length(),
		mPositionTimeMediaUs / 1E6, mPositionTimeRealUs / 1E6);
		@@ -746,7 +748,7 @@ int64_t AudioPlayer::getOutputPlayPositionUs_l()

		// HAL position is relative to the first buffer we sent at mStartPosUs
		const int64_t renderedDuration = mStartPosUs + playedUs;
		ALOGV("getOutputPlayPositionUs_l %lld", renderedDuration);
		ALOGV("getOutputPlayPositionUs_l %" PRId64, renderedDuration);
		return renderedDuration;
		}

		@@ -758,7 +760,7 @@ int64_t AudioPlayer::getMediaTimeUs() {
		return mSeekTimeUs;
		}
		mPositionTimeRealUs = getOutputPlayPositionUs_l();
		ALOGV("getMediaTimeUs getOutputPlayPositionUs_l() mPositionTimeRealUs %lld",
		ALOGV("getMediaTimeUs getOutputPlayPositionUs_l() mPositionTimeRealUs %" PRId64,
		mPositionTimeRealUs);
		return mPositionTimeRealUs;
		}
		@@ -796,7 +798,7 @@ bool AudioPlayer::getMediaTimeMapping(
		status_t AudioPlayer::seekTo(int64_t time_us) {
		Mutex::Autolock autoLock(mLock);

		ALOGV("seekTo( %lld )", time_us);
		ALOGV("seekTo( %" PRId64 " )", time_us);

		mSeeking = true;
		mPositionTimeRealUs = mPositionTimeMediaUs = -1;

media/libstagefright/AudioSource.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -14,6 +14,9 @@
		* limitations under the License.
		*/

		#include <inttypes.h>
		#include <stdlib.h>

		//#define LOG_NDEBUG 0
		#define LOG_TAG "AudioSource"
		#include <utils/Log.h>
		@@ -26,7 +29,6 @@
		#include <media/stagefright/foundation/ADebug.h>
		#include <media/stagefright/foundation/ALooper.h>
		#include <cutils/properties.h>
		#include <stdlib.h>

		namespace android {

		@@ -136,7 +138,7 @@ void AudioSource::releaseQueuedFrames_l() {
		}

		void AudioSource::waitOutstandingEncodingFrames_l() {
		ALOGV("waitOutstandingEncodingFrames_l: %lld", mNumClientOwnedBuffers);
		ALOGV("waitOutstandingEncodingFrames_l: %" PRId64, mNumClientOwnedBuffers);
		while (mNumClientOwnedBuffers > 0) {
		mFrameEncodingCompletionCondition.wait(mLock);
		}
		@@ -269,7 +271,7 @@ void AudioSource::signalBufferReturned(MediaBuffer *buffer) {
		status_t AudioSource::dataCallback(const AudioRecord::Buffer& audioBuffer) {
		int64_t timeUs = systemTime() / 1000ll;

		ALOGV("dataCallbackTimestamp: %lld us", timeUs);
		ALOGV("dataCallbackTimestamp: %" PRId64 " us", timeUs);
		Mutex::Autolock autoLock(mLock);
		if (!mStarted) {
		ALOGW("Spurious callback from AudioRecord. Drop the audio data.");
		@@ -279,7 +281,7 @@ status_t AudioSource::dataCallback(const AudioRecord::Buffer& audioBuffer) {
		// Drop retrieved and previously lost audio data.
		if (mNumFramesReceived == 0 && timeUs < mStartTimeUs) {
		(void) mRecord->getInputFramesLost();
		ALOGV("Drop audio data at %lld/%lld us", timeUs, mStartTimeUs);
		ALOGV("Drop audio data at %" PRId64 "/%" PRId64 " us", timeUs, mStartTimeUs);
		return OK;
		}

media/libstagefright/AwesomePlayer.cpp

+10 −8

Original line number	Diff line number	Diff line
		@@ -19,7 +19,9 @@
		//#define LOG_NDEBUG 0
		#define LOG_TAG "AwesomePlayer"
		#define ATRACE_TAG ATRACE_TAG_VIDEO

		#include <inttypes.h>

		#include <utils/Log.h>
		#include <utils/Trace.h>

		@@ -1715,7 +1717,7 @@ void AwesomePlayer::finishSeekIfNecessary(int64_t videoTimeUs) {
		}

		if (mAudioPlayer != NULL) {
		ALOGV("seeking audio to %lld us (%.2f secs).", videoTimeUs, videoTimeUs / 1E6);
		ALOGV("seeking audio to %" PRId64 " us (%.2f secs).", videoTimeUs, videoTimeUs / 1E6);

		// If we don't have a video time, seek audio to the originally
		// requested seek time instead.
		@@ -1779,7 +1781,7 @@ void AwesomePlayer::onVideoEvent() {
		if (!mVideoBuffer) {
		MediaSource::ReadOptions options;
		if (mSeeking != NO_SEEK) {
		ALOGV("seeking to %lld us (%.2f secs)", mSeekTimeUs, mSeekTimeUs / 1E6);
		ALOGV("seeking to %" PRId64 " us (%.2f secs)", mSeekTimeUs, mSeekTimeUs / 1E6);

		options.setSeekTo(
		mSeekTimeUs,
		@@ -1849,7 +1851,7 @@ void AwesomePlayer::onVideoEvent() {

		if (mSeeking == SEEK_VIDEO_ONLY) {
		if (mSeekTimeUs > timeUs) {
		ALOGI("XXX mSeekTimeUs = %lld us, timeUs = %lld us",
		ALOGI("XXX mSeekTimeUs = %" PRId64 " us, timeUs = %" PRId64 " us",
		mSeekTimeUs, timeUs);
		}
		}
		@@ -1947,13 +1949,13 @@ void AwesomePlayer::onVideoEvent() {

		if (latenessUs > 40000) {
		// We're more than 40ms late.
		ALOGV("we're late by %lld us (%.2f secs)",
		ALOGV("we're late by %" PRId64 " us (%.2f secs)",
		latenessUs, latenessUs / 1E6);

		if (!(mFlags & SLOW_DECODER_HACK)
		\|\| mSinceLastDropped > FRAME_DROP_FREQ)
		{
		ALOGV("we're late by %lld us (%.2f secs) dropping "
		ALOGV("we're late by %" PRId64 " us (%.2f secs) dropping "
		"one after %d frames",
		latenessUs, latenessUs / 1E6, mSinceLastDropped);

		@@ -2315,12 +2317,12 @@ status_t AwesomePlayer::finishSetDataSource_l() {

		if (finalStatus != OK
		\|\| (metaDataSize >= 0
		&& cachedDataRemaining >= metaDataSize)
		&& (off64_t)cachedDataRemaining >= metaDataSize)
		\|\| (mFlags & PREPARE_CANCELLED)) {
		break;
		}

		ALOGV("now cached %d bytes of data", cachedDataRemaining);
		ALOGV("now cached %zu bytes of data", cachedDataRemaining);

		if (metaDataSize < 0
		&& cachedDataRemaining >= kMinBytesForSniffing) {
		@@ -2699,7 +2701,7 @@ status_t AwesomePlayer::selectAudioTrack_l(

		status_t AwesomePlayer::selectTrack(size_t trackIndex, bool select) {
		ATRACE_CALL();
		ALOGV("selectTrack: trackIndex = %d and select=%d", trackIndex, select);
		ALOGV("selectTrack: trackIndex = %zu and select=%d", trackIndex, select);
		Mutex::Autolock autoLock(mLock);
		size_t trackCount = mExtractor->countTracks();
		if (mTextDriver != NULL) {