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 --- media/libstagefright/wifi-display/VideoFormats.cpp | 2 +- .../wifi-display/source/TSPacketizer.cpp | 2 +- .../wifi-display/source/WifiDisplaySource.cpp | 26 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'media/libstagefright/wifi-display') 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