To M56: Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits).

media/filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h"
@@ skipping 264 matching lines @@
     0xBD, 0xF7, 0xFA, 0xE3, 0x8A, 0x76, 0xCB, 0x6C, 0xC8, 0x13, 0xC4, 0x53,
     0x53, 0xDB, 0xAD, 0x37, 0x1A, 0xEB, 0xE0};
 
 // Class for testing the FFmpegH264ToAnnexBBitstreamConverter.
 class FFmpegH264ToAnnexBBitstreamConverterTest : public testing::Test {
  protected:
   FFmpegH264ToAnnexBBitstreamConverterTest() {
     // Set up AVCConfigurationRecord correctly for tests.
     // It's ok to do const cast here as data in kHeaderDataOkWithFieldLen4 is
     // never written to.
-    memset(&test_context_, 0, sizeof(AVCodecContext));
-    test_context_.extradata = const_cast<uint8_t*>(kHeaderDataOkWithFieldLen4);
-    test_context_.extradata_size = sizeof(kHeaderDataOkWithFieldLen4);
+    memset(&test_parameters_, 0, sizeof(AVCodecParameters));
+    test_parameters_.extradata =
+        const_cast<uint8_t*>(kHeaderDataOkWithFieldLen4);
+    test_parameters_.extradata_size = sizeof(kHeaderDataOkWithFieldLen4);
   }
 
   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);
   }
 
-  // Variable to hold valid dummy context for testing.
-  AVCodecContext test_context_;
+  // Variable to hold valid dummy parameters for testing.
+  AVCodecParameters test_parameters_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FFmpegH264ToAnnexBBitstreamConverterTest);
 };
 
 TEST_F(FFmpegH264ToAnnexBBitstreamConverterTest, Conversion_Success) {
-  FFmpegH264ToAnnexBBitstreamConverter converter(&test_context_);
+  FFmpegH264ToAnnexBBitstreamConverter converter(&test_parameters_);
 
   ScopedAVPacket test_packet(new AVPacket());
   CreatePacket(test_packet.get(), kPacketDataOkWithFieldLen4,
                sizeof(kPacketDataOkWithFieldLen4));
 
   // Try out the actual conversion (should be successful and allocate new
   // packet and destroy the old one).
   EXPECT_TRUE(converter.ConvertPacket(test_packet.get()));
 
   // Converter will be automatically cleaned up.
 }
 
 TEST_F(FFmpegH264ToAnnexBBitstreamConverterTest, Conversion_SuccessBigPacket) {
-  FFmpegH264ToAnnexBBitstreamConverter converter(&test_context_);
+  FFmpegH264ToAnnexBBitstreamConverter converter(&test_parameters_);
 
   // Create new packet with 1000 excess bytes.
   ScopedAVPacket test_packet(new AVPacket());
   static uint8_t excess_data[sizeof(kPacketDataOkWithFieldLen4) + 1000] = {0};
   memcpy(excess_data, kPacketDataOkWithFieldLen4,
          sizeof(kPacketDataOkWithFieldLen4));
   CreatePacket(test_packet.get(), excess_data, sizeof(excess_data));
 
   // Try out the actual conversion (should be successful and allocate new
   // packet and destroy the old one as we do NOT support in place transform).
   EXPECT_TRUE(converter.ConvertPacket(test_packet.get()));
 
   // Converter will be automatically cleaned up.
 }
 
 TEST_F(FFmpegH264ToAnnexBBitstreamConverterTest, Conversion_FailureNullParams) {
   // Set up AVCConfigurationRecord to represent NULL data.
-  AVCodecContext dummy_context;
-  dummy_context.extradata = NULL;
-  dummy_context.extradata_size = 0;
-  FFmpegH264ToAnnexBBitstreamConverter converter(&dummy_context);
+  AVCodecParameters dummy_parameters;
+  dummy_parameters.extradata = nullptr;
+  dummy_parameters.extradata_size = 0;
+  FFmpegH264ToAnnexBBitstreamConverter converter(&dummy_parameters);
 
   // Try out the actual conversion with NULL parameter.
-  EXPECT_FALSE(converter.ConvertPacket(NULL));
+  EXPECT_FALSE(converter.ConvertPacket(nullptr));
 
   // Create new packet to test actual conversion.
   ScopedAVPacket test_packet(new AVPacket());
   CreatePacket(test_packet.get(), kPacketDataOkWithFieldLen4,
                sizeof(kPacketDataOkWithFieldLen4));
 
   // Try out the actual conversion. This should fail due to missing extradata.
   EXPECT_FALSE(converter.ConvertPacket(test_packet.get()));
 
-  // Converted will be automatically cleaned up.
+  // Converter will be automatically cleaned up.
 }
 
 }  // namespace media