commit eed9cc06486289d15a6e981ec167a5fdda3cf6be
author Xiaohan Wang <xhwang@chromium.org> Wed Apr 24 18:29:04 2019
committer Commit Bot <commit-bot@chromium.org> Wed Apr 24 18:29:04 2019
tree f857f794474b871c5ce9b3bf482e9ff431e1e675
parent f2131e7ccf1ca01a4e09058316f019b3ecb78fb7

Roll src/third_party/ffmpeg/ e02fc00c5..1b9f48f54 (136 commits)

https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/e02fc00c5da4..1b9f48f54205

$ git log e02fc00c5..1b9f48f54 --date=short --no-merges --format='%ad %ae %s'
2019-04-23 xhwang Revert "Update patches/README for downstream revert"
2019-04-23 xhwang Reland "lavf/oggparsevorbis: Fix change the case of metadata keys issue"
2019-04-23 xhwang Update patches/README for downstream revert
2019-04-23 xhwang Revert "lavf/oggparsevorbis: Fix change the case of metadata keys issue"
2019-04-23 xhwang Chromium patches file and GN Configuration
(...)
2019-03-26 matthew.w.fearnley libavcodec/zmbv: use PTRDIFF_SPECIFIER for `src - c->decomp_buf`.
2019-04-02 jamrial avcodec/opus: make redundancy_buf 32 byte aligned
2019-03-21 kjeyapal avformat/dashenc: Add support for Global SIDX
2019-03-24 kjeyapal avformat/movenc: Fix skip_trailer when global_sidx is enabled
2019-03-27 lq avformat/hls: make different warning message between open url and parse playlist

Created with:
  roll-dep src/third_party/ffmpeg

Also fix AudioVideoMetadataExtractorTest expected tags. Update the tag
names to be exactly the same as they appear in the file. See Bug 955606.

Bug: 950554,955606
Change-Id: I9635e4b0a7867d8a1d2a09346e61760216415129
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1580460
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653674}

DEPS

diff --git a/DEPS b/DEPS
index d5464fe..a20721f 100644
--- a/DEPS
+++ b/DEPS
@@ -865,7 +865,7 @@
   },
 
   'src/third_party/ffmpeg':
-    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'e02fc00c5da42ea5cdf2bf5b9bab93c323a1e698',
+    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '1b9f48f542058549f984d981ef331951559f9cb0',
 
   'src/third_party/flac':
     Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'af862024c8c8fa0ae07ced05e89013d881b00596',

media/filters/audio_video_metadata_extractor_unittest.cc

diff --git a/media/filters/audio_video_metadata_extractor_unittest.cc b/media/filters/audio_video_metadata_extractor_unittest.cc
index 237ee48..df1cb13 100644
--- a/media/filters/audio_video_metadata_extractor_unittest.cc
+++ b/media/filters/audio_video_metadata_extractor_unittest.cc
@@ -47,7 +47,12 @@
     const media::AudioVideoMetadataExtractor::TagDictionary& tags,
     const char* tag_name) {
   auto tag_data = tags.find(tag_name);
-  return tag_data == tags.end() ? "" : tag_data->second;
+  if (tag_data == tags.end()) {
+    DLOG(WARNING) << "Tag name \"" << tag_name << "\" not found!";
+    return "";
+  }
+
+  return tag_data->second;
 }
 
 TEST(AudioVideoMetadataExtractorTest, InvalidFile) {
@@ -67,7 +72,7 @@
   EXPECT_EQ(1u, extractor->stream_infos()[1].tags.size());
   EXPECT_EQ("vorbis", extractor->stream_infos()[1].type);
   EXPECT_EQ("Processed by SoX",
-            GetTagValue(extractor->stream_infos()[1].tags, "COMMENT"));
+            GetTagValue(extractor->stream_infos()[1].tags, "Comment"));
 
   EXPECT_EQ(0u, extractor->attached_images_bytes().size());
 }
@@ -104,9 +109,9 @@
 
   EXPECT_EQ(2u, extractor->stream_infos()[0].tags.size());
   EXPECT_EQ("Lavf55.43.100",
-            GetTagValue(extractor->stream_infos()[0].tags, "ENCODER"));
+            GetTagValue(extractor->stream_infos()[0].tags, "encoder"));
   EXPECT_EQ("Amadeus Pro",
-            GetTagValue(extractor->stream_infos()[0].tags, "ENCODED_BY"));
+            GetTagValue(extractor->stream_infos()[0].tags, "encoded_by"));
 
   EXPECT_EQ("flac", extractor->stream_infos()[1].type);
   EXPECT_EQ(0u, extractor->stream_infos()[1].tags.size());