diff options
author | Elliott Hughes <enh@google.com> | 2015-02-04 11:54:28 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-02-04 11:54:28 -0800 |
commit | a1e8944a21e5833b7aadc451776f11797f5f9273 (patch) | |
tree | b7f4c150346d21f4862f231160c7df6602509a12 /media/libstagefright/timedtext | |
parent | 16e8d463bc5c8805ae6815c67875b16d177a9d8a (diff) | |
download | frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.zip frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.tar.gz frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.tar.bz2 |
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
Diffstat (limited to 'media/libstagefright/timedtext')
-rw-r--r-- | media/libstagefright/timedtext/test/TimedTextSRTSource_test.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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()); } |