Merge "Don't use sp<>&" into nyc-dev
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 9f63027..0b10ae4 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -188,6 +188,7 @@
mPlaybackSettings(AUDIO_PLAYBACK_RATE_DEFAULT),
mVideoFpsHint(-1.f),
mStarted(false),
+ mPrepared(false),
mResetting(false),
mSourceStarted(false),
mPaused(false),
@@ -768,9 +769,17 @@
newRate.mSpeed = mPlaybackSettings.mSpeed;
mPlaybackSettings = newRate;
} else { /* rate.mSpeed != 0.f */
- onResume();
- mPausedByClient = false;
mPlaybackSettings = rate;
+ if (mStarted) {
+ // do not resume yet if the source is still buffering
+ if (!mPausedForBuffering) {
+ onResume();
+ }
+ } else if (mPrepared) {
+ onStart();
+ }
+
+ mPausedByClient = false;
}
}
@@ -1323,6 +1332,7 @@
mAudioEOS = false;
mVideoEOS = false;
mStarted = true;
+ mPaused = false;
uint32_t flags = 0;
@@ -2012,6 +2022,7 @@
}
mStarted = false;
+ mPrepared = false;
mResetting = false;
mSourceStarted = false;
}
@@ -2124,6 +2135,8 @@
new FlushDecoderAction(FLUSH_CMD_SHUTDOWN /* audio */,
FLUSH_CMD_SHUTDOWN /* video */));
processDeferredActions();
+ } else {
+ mPrepared = true;
}
sp<NuPlayerDriver> driver = mDriver.promote();
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h
index 7431532..ae17c76 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h
@@ -198,6 +198,7 @@
AVSyncSettings mSyncSettings;
float mVideoFpsHint;
bool mStarted;
+ bool mPrepared;
bool mResetting;
bool mSourceStarted;
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index 06bb53d..0f4dce9 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -243,7 +243,10 @@
status_t NuPlayerDriver::start() {
ALOGD("start(%p), state is %d, eos is %d", this, mState, mAtEOS);
Mutex::Autolock autoLock(mLock);
+ return start_l();
+}
+status_t NuPlayerDriver::start_l() {
switch (mState) {
case STATE_UNPREPARED:
{
@@ -357,8 +360,11 @@
if (rate.mSpeed == 0.f && mState == STATE_RUNNING) {
mState = STATE_PAUSED;
notifyListener_l(MEDIA_PAUSED);
- } else if (rate.mSpeed != 0.f && mState == STATE_PAUSED) {
- mState = STATE_RUNNING;
+ } else if (rate.mSpeed != 0.f
+ && (mState == STATE_PAUSED
+ || mState == STATE_STOPPED_AND_PREPARED
+ || mState == STATE_PREPARED)) {
+ err = start_l();
}
}
return err;
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
index d5b4ba1..26d3a60 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h
@@ -123,6 +123,7 @@
bool mAutoLoop;
status_t prepare_l();
+ status_t start_l();
void notifyListener_l(int msg, int ext1 = 0, int ext2 = 0, const Parcel *in = NULL);
DISALLOW_EVIL_CONSTRUCTORS(NuPlayerDriver);
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index bb4497b..cbc28e3 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1732,6 +1732,14 @@
return INVALID_OPERATION;
}
+ // propagate bitrate to the output so that the muxer has it
+ if (encoder && msg->findInt32("bitrate", &bitRate)) {
+ // Technically ISO spec says that 'bitrate' should be 0 for VBR even though it is the
+ // average bitrate. We've been setting both bitrate and max-bitrate to this same value.
+ outputFormat->setInt32("bitrate", bitRate);
+ outputFormat->setInt32("max-bitrate", bitRate);
+ }
+
int32_t storeMeta;
if (encoder
&& msg->findInt32("android._input-metadata-buffer-type", &storeMeta)
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index cc5f7a0..24fb987 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -3041,9 +3041,9 @@
mOwner->writeInt16(0x03); // XXX
mOwner->writeInt8(0x00); // buffer size 24-bit (0x300)
- int32_t avgBitrate = 256000;
+ int32_t avgBitrate = 0;
(void)mMeta->findInt32(kKeyBitRate, &avgBitrate);
- int32_t maxBitrate = avgBitrate;
+ int32_t maxBitrate = 0;
(void)mMeta->findInt32(kKeyMaxBitRate, &maxBitrate);
mOwner->writeInt32(maxBitrate);
mOwner->writeInt32(avgBitrate);
@@ -3084,9 +3084,9 @@
};
mOwner->write(kData, sizeof(kData));
- int32_t avgBitrate = 256000;
+ int32_t avgBitrate = 0;
(void)mMeta->findInt32(kKeyBitRate, &avgBitrate);
- int32_t maxBitrate = avgBitrate;
+ int32_t maxBitrate = 0;
(void)mMeta->findInt32(kKeyMaxBitRate, &maxBitrate);
mOwner->writeInt32(maxBitrate);
mOwner->writeInt32(avgBitrate);
diff --git a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_dpb.c b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_dpb.c
index 9517d0a..799bd16 100644
--- a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_dpb.c
+++ b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_dpb.c
@@ -60,6 +60,7 @@
#include "h264bsd_util.h"
#include "basetype.h"
+#include <log/log.h>
/*------------------------------------------------------------------------------
2. External compiler flags
--------------------------------------------------------------------------------
@@ -998,6 +999,13 @@
ASSERT(maxFrameNum);
ASSERT(dpbSize);
+ // see comment in loop below about size calculation
+ if (picSizeInMbs > (UINT32_MAX - 32 - 15) / 384) {
+ ALOGE("b/28533562");
+ android_errorWriteLog(0x534e4554, "28533562");
+ return(MEMORY_ALLOCATION_ERROR);
+ }
+
dpb->maxLongTermFrameIdx = NO_LONG_TERM_FRAME_INDICES;
dpb->maxRefFrames = MAX(maxRefFrames, 1);
if (noReordering)