Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1230)

Unified Diff: media/filters/ffmpeg_aac_bitstream_converter_unittest.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
index 6f92f76a1174895f4cf0efa46bbfa4f47dfaa529..520bce12ae346d564a3cc41e5b896c278d2d8c03 100644
--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
+++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
@@ -30,7 +30,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test {
test_context_.extradata_size = sizeof(context_header_);
}
- void CreatePacket(AVPacket* packet, const uint8* data, uint32 data_size) {
+ void CreatePacket(AVPacket* packet, const uint8_t* data, uint32_t data_size) {
// Create new packet sized of |data_size| from |data|.
EXPECT_EQ(av_new_packet(packet, data_size), 0);
memcpy(packet->data, data, data_size);
@@ -40,7 +40,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test {
AVCodecContext test_context_;
private:
- uint8 context_header_[2];
+ uint8_t context_header_[2];
DISALLOW_COPY_AND_ASSIGN(FFmpegAACBitstreamConverterTest);
};
@@ -48,7 +48,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test {
TEST_F(FFmpegAACBitstreamConverterTest, Conversion_Success) {
FFmpegAACBitstreamConverter converter(&test_context_);
- uint8 dummy_packet[1000];
+ uint8_t dummy_packet[1000];
// Fill dummy packet with junk data. aac converter doesn't look into packet
// data, just header, so can fill with whatever we want for test.
for(size_t i = 0; i < sizeof(dummy_packet); i++) {
@@ -81,7 +81,7 @@ TEST_F(FFmpegAACBitstreamConverterTest, Conversion_FailureNullParams) {
dummy_context.extradata_size = 0;
FFmpegAACBitstreamConverter converter(&dummy_context);
- uint8 dummy_packet[1000] = {0};
+ uint8_t dummy_packet[1000] = {0};
// Try out the actual conversion with NULL parameter.
EXPECT_FALSE(converter.ConvertPacket(NULL));
@@ -97,7 +97,7 @@ TEST_F(FFmpegAACBitstreamConverterTest, Conversion_FailureNullParams) {
TEST_F(FFmpegAACBitstreamConverterTest, Conversion_AudioProfileType) {
FFmpegAACBitstreamConverter converter(&test_context_);
- uint8 dummy_packet[1000] = {0};
+ uint8_t dummy_packet[1000] = {0};
ScopedAVPacket test_packet(new AVPacket());
CreatePacket(test_packet.get(), dummy_packet,
@@ -136,7 +136,7 @@ TEST_F(FFmpegAACBitstreamConverterTest, Conversion_AudioProfileType) {
TEST_F(FFmpegAACBitstreamConverterTest, Conversion_MultipleLength) {
FFmpegAACBitstreamConverter converter(&test_context_);
- uint8 dummy_packet[1000];
+ uint8_t dummy_packet[1000];
ScopedAVPacket test_packet(new AVPacket());
CreatePacket(test_packet.get(), dummy_packet,

Powered by Google App Engine
This is Rietveld 408576698