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

media/ffmpeg/ffmpeg_common_unittest.cc

 // Copyright (c) 2011 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 <stddef.h>
 #include <stdint.h>
 
 #include <cstring>
 
 #include "base/bind.h"
@@ skipping 24 matching lines @@
 
 template <typename T>
 void TestConfigConvertExtraData(
     AVStream* stream,
     T* decoder_config,
     const base::Callback<bool(const AVStream*, T*)>& converter_fn) {
   // Should initially convert.
   EXPECT_TRUE(converter_fn.Run(stream, decoder_config));
 
   // Store orig to let FFmpeg free whatever it allocated.
-  AVCodecContext* codec_context = stream->codec;
-  uint8_t* orig_extradata = codec_context->extradata;
-  int orig_extradata_size = codec_context->extradata_size;
+  AVCodecParameters* codec_parameters = stream->codecpar;
+  uint8_t* orig_extradata = codec_parameters->extradata;
+  int orig_extradata_size = codec_parameters->extradata_size;
 
   // Valid combination: extra_data = NULL && size = 0.
-  codec_context->extradata = NULL;
-  codec_context->extradata_size = 0;
+  codec_parameters->extradata = NULL;
+  codec_parameters->extradata_size = 0;
   EXPECT_TRUE(converter_fn.Run(stream, decoder_config));
-  EXPECT_EQ(static_cast<size_t>(codec_context->extradata_size),
+  EXPECT_EQ(static_cast<size_t>(codec_parameters->extradata_size),
             decoder_config->extra_data().size());
 
   // Valid combination: extra_data = non-NULL && size > 0.
-  codec_context->extradata = &kExtraData[0];
-  codec_context->extradata_size = arraysize(kExtraData);
+  codec_parameters->extradata = &kExtraData[0];
+  codec_parameters->extradata_size = arraysize(kExtraData);
   EXPECT_TRUE(converter_fn.Run(stream, decoder_config));
-  EXPECT_EQ(static_cast<size_t>(codec_context->extradata_size),
+  EXPECT_EQ(static_cast<size_t>(codec_parameters->extradata_size),
             decoder_config->extra_data().size());
-  EXPECT_EQ(0, memcmp(codec_context->extradata,
-                      &decoder_config->extra_data()[0],
-                      decoder_config->extra_data().size()));
+  EXPECT_EQ(
+      0, memcmp(codec_parameters->extradata, &decoder_config->extra_data()[0],
+                decoder_config->extra_data().size()));
 
-  // Invalid combination: extra_data = NULL && size != 0.
-  codec_context->extradata = NULL;
-  codec_context->extradata_size = 10;
-  EXPECT_FALSE(converter_fn.Run(stream, decoder_config));
+  // Possible combination: extra_data = NULL && size != 0, but the converter
+  // function considers this valid and having no extra_data, due to behavior of
+  // avcodec_parameters_to_context().
+  codec_parameters->extradata = NULL;
+  codec_parameters->extradata_size = 10;
+  EXPECT_TRUE(converter_fn.Run(stream, decoder_config));
+  EXPECT_EQ(0UL, decoder_config->extra_data().size());
 
   // Invalid combination: extra_data = non-NULL && size = 0.
-  codec_context->extradata = &kExtraData[0];
-  codec_context->extradata_size = 0;
+  codec_parameters->extradata = &kExtraData[0];
+  codec_parameters->extradata_size = 0;
   EXPECT_FALSE(converter_fn.Run(stream, decoder_config));
 
   // Restore orig values for sane cleanup.
-  codec_context->extradata = orig_extradata;
-  codec_context->extradata_size = orig_extradata_size;
+  codec_parameters->extradata = orig_extradata;
+  codec_parameters->extradata_size = orig_extradata_size;
 }
 
 TEST_F(FFmpegCommonTest, AVStreamToDecoderConfig) {
   // Open a file to get a real AVStreams from FFmpeg.
   base::MemoryMappedFile file;
   file.Initialize(GetTestDataFilePath("bear-320x240.webm"));
   InMemoryUrlProtocol protocol(file.data(), file.length(), false);
   FFmpegGlue glue(&protocol);
   ASSERT_TRUE(glue.OpenContext());
   AVFormatContext* format_context = glue.format_context();
 
   // Find the audio and video streams and test valid and invalid combinations
   // for extradata and extradata_size.
   bool found_audio = false;
   bool found_video = false;
   for (size_t i = 0;
        i < format_context->nb_streams && (!found_audio || !found_video);
        ++i) {
     AVStream* stream = format_context->streams[i];
-    AVCodecContext* codec_context = stream->codec;
-    AVMediaType codec_type = codec_context->codec_type;
+    AVCodecParameters* codec_parameters = stream->codecpar;
+    AVMediaType codec_type = codec_parameters->codec_type;
 
     if (codec_type == AVMEDIA_TYPE_AUDIO) {
       if (found_audio)
         continue;
       found_audio = true;
       AudioDecoderConfig audio_config;
       TestConfigConvertExtraData(stream, &audio_config,
                                  base::Bind(&AVStreamToAudioDecoderConfig));
     } else if (codec_type == AVMEDIA_TYPE_VIDEO) {
       if (found_video)
@@ skipping 69 matching lines @@
       int single_buffer_size =
           av_samples_get_buffer_size(NULL, 1, 1, format, 1);
       int bytes_per_channel = SampleFormatToBytesPerChannel(sample_format);
       EXPECT_EQ(bytes_per_channel, single_buffer_size);
     }
   }
 }
 
 TEST_F(FFmpegCommonTest, UTCDateToTime_Valid) {
   base::Time result;
-  EXPECT_TRUE(FFmpegUTCDateToTime("2012-11-10 12:34:56", &result));
+  EXPECT_TRUE(FFmpegUTCDateToTime("2012-11-10T12:34:56.987654Z", &result));
 
   base::Time::Exploded exploded;
   result.UTCExplode(&exploded);
   EXPECT_TRUE(exploded.HasValidValues());
   EXPECT_EQ(2012, exploded.year);
   EXPECT_EQ(11, exploded.month);
   EXPECT_EQ(6, exploded.day_of_week);
   EXPECT_EQ(10, exploded.day_of_month);
   EXPECT_EQ(12, exploded.hour);
   EXPECT_EQ(34, exploded.minute);
   EXPECT_EQ(56, exploded.second);
-  EXPECT_EQ(0, exploded.millisecond);
+  EXPECT_EQ(987, exploded.millisecond);
+
+  // base::Time exploding operations round fractional milliseconds down, so
+  // verify fractional milliseconds using a base::TimeDelta.
+  base::Time without_fractional_ms;
+  EXPECT_TRUE(base::Time::FromUTCExploded(exploded, &without_fractional_ms));
+  base::TimeDelta delta = result - without_fractional_ms;
+  EXPECT_EQ(654, delta.InMicroseconds());
 }
 
 TEST_F(FFmpegCommonTest, UTCDateToTime_Invalid) {
   const char* invalid_date_strings[] = {
-    "",
-    "2012-11-10",
-    "12:34:56",
-    "-- ::",
-    "2012-11-10 12:34:",
-    "2012-11-10 12::56",
-    "2012-11-10 :34:56",
-    "2012-11- 12:34:56",
-    "2012--10 12:34:56",
-    "-11-10 12:34:56",
-    "2012-11 12:34:56",
-    "2012-11-10-12 12:34:56",
-    "2012-11-10 12:34",
-    "2012-11-10 12:34:56:78",
-    "ABCD-11-10 12:34:56",
-    "2012-EF-10 12:34:56",
-    "2012-11-GH 12:34:56",
-    "2012-11-10 IJ:34:56",
-    "2012-11-10 12:JL:56",
-    "2012-11-10 12:34:MN",
-    "2012-11-10 12:34:56.123",
-    "2012-11-1012:34:56",
-    "2012-11-10 12:34:56 UTC",
+      "",
+      "2012-11-10 12:34:56",
+      "2012-11-10 12:34:56.987654Z",
+      "2012-11-10T12:34:56",
+      "2012-11-10T12:34:56.98765Z",
+      "2012-11-10T12:34:56.98765JZ",
+      "2012-11-10T12:34:56.987654Z3",
+      "2012-11-10T12:34:56.987654ZZ",
+      "2012-11-10T12:34:56.987654Z.987654Z",
+      "2012-11-10",
+      "12:34:56",
+      "-- ::",
+      "2012-11-10 12:34:",
+      "2012-11-10 12::56",
+      "2012-11-10 :34:56",
+      "2012-11- 12:34:56",
+      "2012--10 12:34:56",
+      "-11-10 12:34:56",
+      "2012-11 12:34:56",
+      "2012-11-10-12 12:34:56",
+      "2012-11-10 12:34",
+      "2012-11-10 12:34:56:78",
+      "ABCD-11-10 12:34:56",
+      "2012-EF-10 12:34:56",
+      "2012-11-GH 12:34:56",
+      "2012-11-10 IJ:34:56",
+      "2012-11-10 12:JL:56",
+      "2012-11-10 12:34:MN",
+      "2012-11-10 12:34:56.123",
+      "2012-11-1012:34:56",
+      "2012-11-10 12:34:56 UTC",
   };
 
   for (size_t i = 0; i < arraysize(invalid_date_strings); ++i) {
     const char* date_string = invalid_date_strings[i];
     base::Time result;
     EXPECT_FALSE(FFmpegUTCDateToTime(date_string, &result))
         << "date_string '" << date_string << "'";
     EXPECT_TRUE(result.is_null());
   }
 }
@@ skipping 25 matching lines @@
   // values; diff should verify.
 #if 0
   printf("<enum name=\"FFmpegCodecHashes\" type=\"int\">\n");
   for (const auto& kv : sorted_hashes)
     printf("  <int value=\"%d\" label=\"%s\"/>\n", kv.first, kv.second);
   printf("</enum>\n");
 #endif
 }
 
 }  // namespace media