| Index: media/formats/mp4/es_descriptor_unittest.cc
|
| diff --git a/media/formats/mp4/es_descriptor_unittest.cc b/media/formats/mp4/es_descriptor_unittest.cc
|
| index 6334f5bd1c54a7a264c7662004df7eccbeadd4f0..4a0262bc655e2815d198537602d5848b2128dfc7 100644
|
| --- a/media/formats/mp4/es_descriptor_unittest.cc
|
| +++ b/media/formats/mp4/es_descriptor_unittest.cc
|
| @@ -12,13 +12,10 @@ namespace mp4 {
|
|
|
| TEST(ESDescriptorTest, SingleByteLengthTest) {
|
| ESDescriptor es_desc;
|
| - uint8 buffer[] = {
|
| - 0x03, 0x19, 0x00, 0x01, 0x00, 0x04, 0x11, 0x40,
|
| - 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
| - 0x00, 0x00, 0x00, 0x00, 0x05, 0x02, 0x12, 0x10,
|
| - 0x06, 0x01, 0x02
|
| - };
|
| - std::vector<uint8> data;
|
| + uint8_t buffer[] = {0x03, 0x19, 0x00, 0x01, 0x00, 0x04, 0x11, 0x40, 0x15,
|
| + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
| + 0x00, 0x00, 0x05, 0x02, 0x12, 0x10, 0x06, 0x01, 0x02};
|
| + std::vector<uint8_t> data;
|
|
|
| data.assign(buffer, buffer + sizeof(buffer));
|
|
|
| @@ -32,13 +29,10 @@ TEST(ESDescriptorTest, SingleByteLengthTest) {
|
|
|
| TEST(ESDescriptorTest, NonAACTest) {
|
| ESDescriptor es_desc;
|
| - uint8 buffer[] = {
|
| - 0x03, 0x19, 0x00, 0x01, 0x00, 0x04, 0x11, 0x66,
|
| - 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
| - 0x00, 0x00, 0x00, 0x00, 0x05, 0x02, 0x12, 0x10,
|
| - 0x06, 0x01, 0x02
|
| - };
|
| - std::vector<uint8> data;
|
| + uint8_t buffer[] = {0x03, 0x19, 0x00, 0x01, 0x00, 0x04, 0x11, 0x66, 0x15,
|
| + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
| + 0x00, 0x00, 0x05, 0x02, 0x12, 0x10, 0x06, 0x01, 0x02};
|
| + std::vector<uint8_t> data;
|
|
|
| data.assign(buffer, buffer + sizeof(buffer));
|
|
|
| @@ -51,14 +45,11 @@ TEST(ESDescriptorTest, NonAACTest) {
|
|
|
| TEST(ESDescriptorTest, MultiByteLengthTest) {
|
| ESDescriptor es_desc;
|
| - uint8 buffer[] = {
|
| - 0x03, 0x80, 0x19, 0x00, 0x01, 0x00, 0x04, 0x80,
|
| - 0x80, 0x11, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00,
|
| - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
|
| - 0x80, 0x80, 0x80, 0x02, 0x12, 0x10, 0x06, 0x01,
|
| - 0x02
|
| - };
|
| - std::vector<uint8> data;
|
| + uint8_t buffer[] = {0x03, 0x80, 0x19, 0x00, 0x01, 0x00, 0x04, 0x80, 0x80,
|
| + 0x11, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
| + 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x80, 0x80,
|
| + 0x02, 0x12, 0x10, 0x06, 0x01, 0x02};
|
| + std::vector<uint8_t> data;
|
|
|
| data.assign(buffer, buffer + sizeof(buffer));
|
|
|
| @@ -71,14 +62,11 @@ TEST(ESDescriptorTest, MultiByteLengthTest) {
|
|
|
| TEST(ESDescriptorTest, FiveByteLengthTest) {
|
| ESDescriptor es_desc;
|
| - uint8 buffer[] = {
|
| - 0x03, 0x80, 0x19, 0x00, 0x01, 0x00, 0x04, 0x80,
|
| - 0x80, 0x11, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00,
|
| - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
|
| - 0x80, 0x80, 0x80, 0x80, 0x02, 0x12, 0x10, 0x06,
|
| - 0x01, 0x02
|
| - };
|
| - std::vector<uint8> data;
|
| + uint8_t buffer[] = {0x03, 0x80, 0x19, 0x00, 0x01, 0x00, 0x04, 0x80, 0x80,
|
| + 0x11, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
| + 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x80, 0x80, 0x80,
|
| + 0x80, 0x02, 0x12, 0x10, 0x06, 0x01, 0x02};
|
| + std::vector<uint8_t> data;
|
|
|
| data.assign(buffer, buffer + sizeof(buffer));
|
|
|
|
|