From a1e8944a21e5833b7aadc451776f11797f5f9273 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 4 Feb 2015 11:54:28 -0800 Subject: Move AString's StringPrintf out of the way. We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35 --- cmds/stagefright/SimplePlayer.cpp | 2 +- include/media/stagefright/foundation/AString.h | 2 +- media/libstagefright/MediaCodec.cpp | 4 +-- media/libstagefright/foundation/AMessage.cpp | 30 +++++++++++----------- .../libstagefright/foundation/ANetworkSession.cpp | 6 ++--- media/libstagefright/foundation/AString.cpp | 2 +- media/libstagefright/httplive/LiveSession.cpp | 4 +-- media/libstagefright/rtsp/ARTPWriter.cpp | 6 ++--- media/libstagefright/rtsp/ARTSPConnection.cpp | 2 +- media/libstagefright/rtsp/MyHandler.h | 6 ++--- .../timedtext/test/TimedTextSRTSource_test.cpp | 14 +++++----- media/libstagefright/wifi-display/VideoFormats.cpp | 2 +- .../wifi-display/source/TSPacketizer.cpp | 2 +- .../wifi-display/source/WifiDisplaySource.cpp | 26 +++++++++---------- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/cmds/stagefright/SimplePlayer.cpp b/cmds/stagefright/SimplePlayer.cpp index 1b2f792..4b2f980 100644 --- a/cmds/stagefright/SimplePlayer.cpp +++ b/cmds/stagefright/SimplePlayer.cpp @@ -332,7 +332,7 @@ status_t SimplePlayer::onPrepare() { size_t j = 0; sp buffer; - while (format->findBuffer(StringPrintf("csd-%d", j).c_str(), &buffer)) { + while (format->findBuffer(AStringPrintf("csd-%d", j).c_str(), &buffer)) { state->mCSD.push_back(buffer); ++j; diff --git a/include/media/stagefright/foundation/AString.h b/include/media/stagefright/foundation/AString.h index c3a68e1..822dbb3 100644 --- a/include/media/stagefright/foundation/AString.h +++ b/include/media/stagefright/foundation/AString.h @@ -102,7 +102,7 @@ private: void makeMutable(); }; -AString StringPrintf(const char *format, ...); +AString AStringPrintf(const char *format, ...); } // namespace android diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 5f55484..4367510 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1685,7 +1685,7 @@ void MediaCodec::extractCSD(const sp &format) { size_t i = 0; for (;;) { sp csd; - if (!format->findBuffer(StringPrintf("csd-%u", i).c_str(), &csd)) { + if (!format->findBuffer(AStringPrintf("csd-%u", i).c_str(), &csd)) { break; } @@ -2208,7 +2208,7 @@ status_t MediaCodec::amendOutputFormatWithCodecSpecificData( memcpy(csd->data() + 4, nalStart, nalSize); mOutputFormat->setBuffer( - StringPrintf("csd-%u", csdIndex).c_str(), csd); + AStringPrintf("csd-%u", csdIndex).c_str(), csd); ++csdIndex; } diff --git a/media/libstagefright/foundation/AMessage.cpp b/media/libstagefright/foundation/AMessage.cpp index 795e8a6..1f46bc9 100644 --- a/media/libstagefright/foundation/AMessage.cpp +++ b/media/libstagefright/foundation/AMessage.cpp @@ -426,19 +426,19 @@ AString AMessage::debugString(int32_t indent) const { AString tmp; if (isFourcc(mWhat)) { - tmp = StringPrintf( + tmp = AStringPrintf( "'%c%c%c%c'", (char)(mWhat >> 24), (char)((mWhat >> 16) & 0xff), (char)((mWhat >> 8) & 0xff), (char)(mWhat & 0xff)); } else { - tmp = StringPrintf("0x%08x", mWhat); + tmp = AStringPrintf("0x%08x", mWhat); } s.append(tmp); if (mTarget != 0) { - tmp = StringPrintf(", target = %d", mTarget); + tmp = AStringPrintf(", target = %d", mTarget); s.append(tmp); } s.append(") = {\n"); @@ -448,37 +448,37 @@ AString AMessage::debugString(int32_t indent) const { switch (item.mType) { case kTypeInt32: - tmp = StringPrintf( + tmp = AStringPrintf( "int32_t %s = %d", item.mName, item.u.int32Value); break; case kTypeInt64: - tmp = StringPrintf( + tmp = AStringPrintf( "int64_t %s = %lld", item.mName, item.u.int64Value); break; case kTypeSize: - tmp = StringPrintf( + tmp = AStringPrintf( "size_t %s = %d", item.mName, item.u.sizeValue); break; case kTypeFloat: - tmp = StringPrintf( + tmp = AStringPrintf( "float %s = %f", item.mName, item.u.floatValue); break; case kTypeDouble: - tmp = StringPrintf( + tmp = AStringPrintf( "double %s = %f", item.mName, item.u.doubleValue); break; case kTypePointer: - tmp = StringPrintf( + tmp = AStringPrintf( "void *%s = %p", item.mName, item.u.ptrValue); break; case kTypeString: - tmp = StringPrintf( + tmp = AStringPrintf( "string %s = \"%s\"", item.mName, item.u.stringValue->c_str()); break; case kTypeObject: - tmp = StringPrintf( + tmp = AStringPrintf( "RefBase *%s = %p", item.mName, item.u.refValue); break; case kTypeBuffer: @@ -486,18 +486,18 @@ AString AMessage::debugString(int32_t indent) const { sp buffer = static_cast(item.u.refValue); if (buffer != NULL && buffer->data() != NULL && buffer->size() <= 64) { - tmp = StringPrintf("Buffer %s = {\n", item.mName); + tmp = AStringPrintf("Buffer %s = {\n", item.mName); hexdump(buffer->data(), buffer->size(), indent + 4, &tmp); appendIndent(&tmp, indent + 2); tmp.append("}"); } else { - tmp = StringPrintf( + tmp = AStringPrintf( "Buffer *%s = %p", item.mName, buffer.get()); } break; } case kTypeMessage: - tmp = StringPrintf( + tmp = AStringPrintf( "AMessage %s = %s", item.mName, static_cast( @@ -505,7 +505,7 @@ AString AMessage::debugString(int32_t indent) const { indent + strlen(item.mName) + 14).c_str()); break; case kTypeRect: - tmp = StringPrintf( + tmp = AStringPrintf( "Rect %s(%d, %d, %d, %d)", item.mName, item.u.rectValue.mLeft, diff --git a/media/libstagefright/foundation/ANetworkSession.cpp b/media/libstagefright/foundation/ANetworkSession.cpp index 4504c2b..b230400 100644 --- a/media/libstagefright/foundation/ANetworkSession.cpp +++ b/media/libstagefright/foundation/ANetworkSession.cpp @@ -187,7 +187,7 @@ ANetworkSession::Session::Session( CHECK_GE(res, 0); in_addr_t addr = ntohl(localAddr.sin_addr.s_addr); - AString localAddrString = StringPrintf( + AString localAddrString = AStringPrintf( "%d.%d.%d.%d", (addr >> 24), (addr >> 16) & 0xff, @@ -195,7 +195,7 @@ ANetworkSession::Session::Session( addr & 0xff); addr = ntohl(remoteAddr.sin_addr.s_addr); - AString remoteAddrString = StringPrintf( + AString remoteAddrString = AStringPrintf( "%d.%d.%d.%d", (addr >> 24), (addr >> 16) & 0xff, @@ -301,7 +301,7 @@ status_t ANetworkSession::Session::readMore() { uint32_t ip = ntohl(remoteAddr.sin_addr.s_addr); notify->setString( "fromAddr", - StringPrintf( + AStringPrintf( "%u.%u.%u.%u", ip >> 24, (ip >> 16) & 0xff, diff --git a/media/libstagefright/foundation/AString.cpp b/media/libstagefright/foundation/AString.cpp index 9835ca3..b167543 100644 --- a/media/libstagefright/foundation/AString.cpp +++ b/media/libstagefright/foundation/AString.cpp @@ -366,7 +366,7 @@ status_t AString::writeToParcel(Parcel *parcel) const { return err; } -AString StringPrintf(const char *format, ...) { +AString AStringPrintf(const char *format, ...) { va_list ap; va_start(ap, format); diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index a934e72..bff0aa0 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -822,11 +822,11 @@ ssize_t LiveSession::fetchFile( headers.add( String8("Range"), String8( - StringPrintf( + AStringPrintf( "bytes=%lld-%s", range_offset, range_length < 0 - ? "" : StringPrintf("%lld", + ? "" : AStringPrintf("%lld", range_offset + range_length - 1).c_str()).c_str())); } status_t err = mHTTPDataSource->connect(url, &headers); diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp index 793d116..e1607bf 100644 --- a/media/libstagefright/rtsp/ARTPWriter.cpp +++ b/media/libstagefright/rtsp/ARTPWriter.cpp @@ -461,7 +461,7 @@ void ARTPWriter::dumpSessionDesc() { sdp.append("m=audio "); } - sdp.append(StringPrintf("%d", ntohs(mRTPAddr.sin_port))); + sdp.append(AStringPrintf("%d", ntohs(mRTPAddr.sin_port))); sdp.append( " RTP/AVP " PT_STR "\r\n" "b=AS 320000\r\n" @@ -480,7 +480,7 @@ void ARTPWriter::dumpSessionDesc() { CHECK_EQ(sampleRate, (mMode == AMR_NB) ? 8000 : 16000); sdp.append(mMode == AMR_NB ? "AMR" : "AMR-WB"); - sdp.append(StringPrintf("/%d/%d", sampleRate, numChannels)); + sdp.append(AStringPrintf("/%d/%d", sampleRate, numChannels)); } else { TRESPASS(); } @@ -543,7 +543,7 @@ void ARTPWriter::makeH264SPropParamSets(MediaBuffer *buffer) { CHECK_EQ((unsigned)data[0], 0x67u); mProfileLevel = - StringPrintf("%02X%02X%02X", data[1], data[2], data[3]); + AStringPrintf("%02X%02X%02X", data[1], data[2], data[3]); encodeBase64(data, startCodePos, &mSeqParamSet); diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index f25539c..60b3aaf 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -42,7 +42,7 @@ const int64_t ARTSPConnection::kSelectTimeoutUs = 1000ll; // static const AString ARTSPConnection::sUserAgent = - StringPrintf("User-Agent: %s\r\n", MakeUserAgent().c_str()); + AStringPrintf("User-Agent: %s\r\n", MakeUserAgent().c_str()); ARTSPConnection::ARTSPConnection(bool uidValid, uid_t uid) : mUIDValid(uidValid), diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index 423a420..3bf489b 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -156,7 +156,7 @@ struct MyHandler : public AHandler { mSessionURL.append("rtsp://"); mSessionURL.append(host); mSessionURL.append(":"); - mSessionURL.append(StringPrintf("%u", port)); + mSessionURL.append(AStringPrintf("%u", port)); mSessionURL.append(path); ALOGV("rewritten session url: '%s'", mSessionURL.c_str()); @@ -508,7 +508,7 @@ struct MyHandler : public AHandler { mSessionURL.append("rtsp://"); mSessionURL.append(host); mSessionURL.append(":"); - mSessionURL.append(StringPrintf("%u", port)); + mSessionURL.append(AStringPrintf("%u", port)); mSessionURL.append(path); ALOGI("rewritten session url: '%s'", mSessionURL.c_str()); @@ -1238,7 +1238,7 @@ struct MyHandler : public AHandler { request.append("\r\n"); request.append( - StringPrintf( + AStringPrintf( "Range: npt=%lld-\r\n", timeUs / 1000000ll)); request.append("\r\n"); diff --git a/media/libstagefright/timedtext/test/TimedTextSRTSource_test.cpp b/media/libstagefright/timedtext/test/TimedTextSRTSource_test.cpp index 40e93c7..3a06d61 100644 --- a/media/libstagefright/timedtext/test/TimedTextSRTSource_test.cpp +++ b/media/libstagefright/timedtext/test/TimedTextSRTSource_test.cpp @@ -120,26 +120,26 @@ TEST_F(TimedTextSRTSourceTest, readAll) { err = mSource->read(&startTimeUs, &endTimeUs, &parcel); EXPECT_EQ(OK, err); CheckStartTimeMs(parcel, i * kSecToMsec); - subtitle = StringPrintf("%d\n\n", i); + subtitle = AStringPrintf("%d\n\n", i); CheckDataEquals(parcel, subtitle.c_str()); } // read edge cases err = mSource->read(&startTimeUs, &endTimeUs, &parcel); EXPECT_EQ(OK, err); CheckStartTimeMs(parcel, 5500); - subtitle = StringPrintf("6\n\n"); + subtitle = AStringPrintf("6\n\n"); CheckDataEquals(parcel, subtitle.c_str()); err = mSource->read(&startTimeUs, &endTimeUs, &parcel); EXPECT_EQ(OK, err); CheckStartTimeMs(parcel, 5800); - subtitle = StringPrintf("7\n\n"); + subtitle = AStringPrintf("7\n\n"); CheckDataEquals(parcel, subtitle.c_str()); err = mSource->read(&startTimeUs, &endTimeUs, &parcel); EXPECT_EQ(OK, err); CheckStartTimeMs(parcel, 6000); - subtitle = StringPrintf("8\n\n"); + subtitle = AStringPrintf("8\n\n"); CheckDataEquals(parcel, subtitle.c_str()); err = mSource->read(&startTimeUs, &endTimeUs, &parcel); @@ -202,21 +202,21 @@ TEST_F(TimedTextSRTSourceTest, checkEdgeCase) { err = mSource->read(&startTimeUs, &endTimeUs, &parcel, &options); EXPECT_EQ(OK, err); EXPECT_EQ(5500 * kMsecToUsec, startTimeUs); - subtitle = StringPrintf("6\n\n"); + subtitle = AStringPrintf("6\n\n"); CheckDataEquals(parcel, subtitle.c_str()); options.setSeekTo(5800 * kMsecToUsec, MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC); err = mSource->read(&startTimeUs, &endTimeUs, &parcel, &options); EXPECT_EQ(OK, err); EXPECT_EQ(5800 * kMsecToUsec, startTimeUs); - subtitle = StringPrintf("7\n\n"); + subtitle = AStringPrintf("7\n\n"); CheckDataEquals(parcel, subtitle.c_str()); options.setSeekTo(6000 * kMsecToUsec, MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC); err = mSource->read(&startTimeUs, &endTimeUs, &parcel, &options); EXPECT_EQ(OK, err); EXPECT_EQ(6000 * kMsecToUsec, startTimeUs); - subtitle = StringPrintf("8\n\n"); + subtitle = AStringPrintf("8\n\n"); CheckDataEquals(parcel, subtitle.c_str()); } diff --git a/media/libstagefright/wifi-display/VideoFormats.cpp b/media/libstagefright/wifi-display/VideoFormats.cpp index 04e02c1..2f4af5b 100644 --- a/media/libstagefright/wifi-display/VideoFormats.cpp +++ b/media/libstagefright/wifi-display/VideoFormats.cpp @@ -435,7 +435,7 @@ AString VideoFormats::getFormatSpec(bool forM4Message) const { // max-hres (none or 2 byte) // max-vres (none or 2 byte) - return StringPrintf( + return AStringPrintf( "%02x 00 %02x %02x %08x %08x %08x 00 0000 0000 00 none none", forM4Message ? 0x00 : ((mNativeIndex << 3) | mNativeType), mConfigs[mNativeType][mNativeIndex].profile, diff --git a/media/libstagefright/wifi-display/source/TSPacketizer.cpp b/media/libstagefright/wifi-display/source/TSPacketizer.cpp index 50d317a..4c5ad17 100644 --- a/media/libstagefright/wifi-display/source/TSPacketizer.cpp +++ b/media/libstagefright/wifi-display/source/TSPacketizer.cpp @@ -106,7 +106,7 @@ void TSPacketizer::Track::extractCSDIfNecessary() { || !strcasecmp(mMIME.c_str(), MEDIA_MIMETYPE_AUDIO_AAC)) { for (size_t i = 0;; ++i) { sp csd; - if (!mFormat->findBuffer(StringPrintf("csd-%d", i).c_str(), &csd)) { + if (!mFormat->findBuffer(AStringPrintf("csd-%d", i).c_str(), &csd)) { break; } diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index 0c39ccf..7eb8b73 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -598,7 +598,7 @@ status_t WifiDisplaySource::sendM3(int32_t sessionID) { AppendCommonResponse(&request, mNextCSeq); request.append("Content-Type: text/parameters\r\n"); - request.append(StringPrintf("Content-Length: %d\r\n", body.size())); + request.append(AStringPrintf("Content-Length: %d\r\n", body.size())); request.append("\r\n"); request.append(body); @@ -639,26 +639,26 @@ status_t WifiDisplaySource::sendM4(int32_t sessionID) { if (mSinkSupportsAudio) { body.append( - StringPrintf("wfd_audio_codecs: %s\r\n", + AStringPrintf("wfd_audio_codecs: %s\r\n", (mUsingPCMAudio ? "LPCM 00000002 00" // 2 ch PCM 48kHz : "AAC 00000001 00"))); // 2 ch AAC 48kHz } body.append( - StringPrintf( + AStringPrintf( "wfd_presentation_URL: rtsp://%s/wfd1.0/streamid=0 none\r\n", mClientInfo.mLocalIP.c_str())); body.append( - StringPrintf( + AStringPrintf( "wfd_client_rtp_ports: %s\r\n", mWfdClientRtpPorts.c_str())); AString request = "SET_PARAMETER rtsp://localhost/wfd1.0 RTSP/1.0\r\n"; AppendCommonResponse(&request, mNextCSeq); request.append("Content-Type: text/parameters\r\n"); - request.append(StringPrintf("Content-Length: %d\r\n", body.size())); + request.append(AStringPrintf("Content-Length: %d\r\n", body.size())); request.append("\r\n"); request.append(body); @@ -704,7 +704,7 @@ status_t WifiDisplaySource::sendTrigger( AppendCommonResponse(&request, mNextCSeq); request.append("Content-Type: text/parameters\r\n"); - request.append(StringPrintf("Content-Length: %d\r\n", body.size())); + request.append(AStringPrintf("Content-Length: %d\r\n", body.size())); request.append("\r\n"); request.append(body); @@ -729,7 +729,7 @@ status_t WifiDisplaySource::sendM16(int32_t sessionID) { CHECK_EQ(sessionID, mClientSessionID); request.append( - StringPrintf("Session: %d\r\n", mClientInfo.mPlaybackSessionID)); + AStringPrintf("Session: %d\r\n", mClientInfo.mPlaybackSessionID)); request.append("\r\n"); // Empty body status_t err = @@ -1305,7 +1305,7 @@ status_t WifiDisplaySource::onSetupRequest( if (rtpMode == RTPSender::TRANSPORT_TCP_INTERLEAVED) { response.append( - StringPrintf( + AStringPrintf( "Transport: RTP/AVP/TCP;interleaved=%d-%d;", clientRtp, clientRtcp)); } else { @@ -1318,14 +1318,14 @@ status_t WifiDisplaySource::onSetupRequest( if (clientRtcp >= 0) { response.append( - StringPrintf( + AStringPrintf( "Transport: RTP/AVP/%s;unicast;client_port=%d-%d;" "server_port=%d-%d\r\n", transportString.c_str(), clientRtp, clientRtcp, serverRtp, serverRtp + 1)); } else { response.append( - StringPrintf( + AStringPrintf( "Transport: RTP/AVP/%s;unicast;client_port=%d;" "server_port=%d\r\n", transportString.c_str(), @@ -1585,15 +1585,15 @@ void WifiDisplaySource::AppendCommonResponse( response->append(buf); response->append("\r\n"); - response->append(StringPrintf("Server: %s\r\n", sUserAgent.c_str())); + response->append(AStringPrintf("Server: %s\r\n", sUserAgent.c_str())); if (cseq >= 0) { - response->append(StringPrintf("CSeq: %d\r\n", cseq)); + response->append(AStringPrintf("CSeq: %d\r\n", cseq)); } if (playbackSessionID >= 0ll) { response->append( - StringPrintf( + AStringPrintf( "Session: %d;timeout=%lld\r\n", playbackSessionID, kPlaybackSessionTimeoutSecs)); } -- cgit v1.1