Commit 810026ea authored by Dan Sanders's avatar Dan Sanders Committed by Commit Bot

Roll src/third_party/ffmpeg/ d2dd36c03..45b753b2d (1232 commits)

https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/d2dd36c03501..45b753b2d1

$ git log d2dd36c03..45b753b2d --date=short --no-merges --format='%ad %ae %s'
2020-08-17 sandersd@chromium.org Always use av_realloc() for ogg_stream |buf|.
2020-08-14 sandersd@chromium.org README.chromium file
2020-08-14 sandersd@chromium.org Chromium patches file
2020-08-14 sandersd@chromium.org GN Configuration
2020-08-01 lance.lmwang@gmail.com avcodec/libsvtav1: remove unneeded svt_av1_enc_deinit_handle()
(...)
2020-04-16 josh.brewster libavcodec/libx264: fix reference frame computation based on level
2020-04-20 barryjzhao lavf/mp3enc: fix ID3v1 year metadata setting issue
2020-04-26 lance.lmwang avformat/dashenc: use av_reallocp_array()
2020-04-26 lance.lmwang avformat/dashenc: use local variable and avoid calculate duration multiple times
2020-04-26 lance.lmwang avformat/dashenc: cosmetics

Created with:
  roll-dep src/third_party/ffmpeg

Bug: 1105118, 1117613
Change-Id: Ife0e3dca60640e88a2b3f508fbfc6fe8d9308be9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359167
Commit-Queue: Dan Sanders <sandersd@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799404}
parent 3b9e4292
...@@ -915,7 +915,7 @@ deps = { ...@@ -915,7 +915,7 @@ deps = {
}, },
'src/third_party/ffmpeg': 'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'd2dd36c03501e995e8ce2d792d834392b2e62bfe', Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '45b753b2d1d27b673a14419070ccc9558774efc2',
'src/third_party/flac': 'src/third_party/flac':
Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'af862024c8c8fa0ae07ced05e89013d881b00596', Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'af862024c8c8fa0ae07ced05e89013d881b00596',
......
...@@ -213,7 +213,7 @@ TEST_F(AudioFileReaderTest, AAC_SinglePacket) { ...@@ -213,7 +213,7 @@ TEST_F(AudioFileReaderTest, AAC_SinglePacket) {
TEST_F(AudioFileReaderTest, AAC_ADTS) { TEST_F(AudioFileReaderTest, AAC_ADTS) {
RunTest("sfx.adts", "1.80,1.66,2.31,3.26,4.46,3.36,", 1, 44100, RunTest("sfx.adts", "1.80,1.66,2.31,3.26,4.46,3.36,", 1, 44100,
base::TimeDelta::FromMicroseconds(2825180), 124591, 13312); base::TimeDelta::FromMicroseconds(384733), 16967, 13312);
} }
TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
......
...@@ -660,13 +660,6 @@ TEST_F(FFmpegDemuxerTest, Read_AudioNoStartTime) { ...@@ -660,13 +660,6 @@ TEST_F(FFmpegDemuxerTest, Read_AudioNoStartTime) {
} }
} }
TEST_F(FFmpegDemuxerTest, Read_InvalidNegativeTimestamp) {
CreateDemuxer("negative_ts.flac");
InitializeDemuxer();
EXPECT_CALL(host_, OnDemuxerError(DEMUXER_ERROR_COULD_NOT_PARSE));
ReadUntilEndOfStream(GetStream(DemuxerStream::AUDIO));
}
// Android has no Theora support, so these tests doesn't work. // Android has no Theora support, so these tests doesn't work.
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
TEST_F(FFmpegDemuxerTest, Read_AudioNegativeStartTimeAndOggDiscard_Bear) { TEST_F(FFmpegDemuxerTest, Read_AudioNegativeStartTimeAndOggDiscard_Bear) {
...@@ -861,7 +854,11 @@ TEST_F(FFmpegDemuxerTest, Read_AudioNegativeStartTimeAndOpusSfxDiscard_Sync) { ...@@ -861,7 +854,11 @@ TEST_F(FFmpegDemuxerTest, Read_AudioNegativeStartTimeAndOpusSfxDiscard_Sync) {
// Run the test twice with a seek in between. // Run the test twice with a seek in between.
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
Read(audio, FROM_HERE, 314, 0, true); // TODO(sandersd): Read_AudioNegativeStartTimeAndOpusDiscardH264Mp4_Sync
// has the same sequence, but doesn't have a different discard padding
// after seeking to the start. Why is this test different?
Read(audio, FROM_HERE, 314, 0, true, DemuxerStream::Status::kOk,
i == 0 ? base::TimeDelta::FromMicroseconds(6500) : base::TimeDelta());
Read(audio, FROM_HERE, 244, 20000, true); Read(audio, FROM_HERE, 244, 20000, true);
// Though the internal start time may be below zero, the exposed media time // Though the internal start time may be below zero, the exposed media time
......
...@@ -496,10 +496,10 @@ INSTANTIATE_TEST_SUITE_P(OpenCodecs, ...@@ -496,10 +496,10 @@ INSTANTIATE_TEST_SUITE_P(OpenCodecs,
#if BUILDFLAG(USE_PROPRIETARY_CODECS) #if BUILDFLAG(USE_PROPRIETARY_CODECS)
const PlaybackTestData kADTSTests[] = { const PlaybackTestData kADTSTests[] = {
{"bear-audio-main-aac.aac", 0, 2724}, {"bear-audio-main-aac.aac", 0, 2708},
{"bear-audio-lc-aac.aac", 0, 2717}, {"bear-audio-lc-aac.aac", 0, 2791},
{"bear-audio-implicit-he-aac-v1.aac", 0, 2812}, {"bear-audio-implicit-he-aac-v1.aac", 0, 2829},
{"bear-audio-implicit-he-aac-v2.aac", 0, 3047}, {"bear-audio-implicit-he-aac-v2.aac", 0, 2900},
}; };
// TODO(chcunningham): Migrate other basic playback tests to TEST_P. // TODO(chcunningham): Migrate other basic playback tests to TEST_P.
......
...@@ -349,7 +349,6 @@ crbug.com/874695 http/tests/images/webp-progressive-load.html [ Slow ] ...@@ -349,7 +349,6 @@ crbug.com/874695 http/tests/images/webp-progressive-load.html [ Slow ]
crbug.com/874695 http/tests/media/controls/toggle-class-with-state-source-buffer.html [ Slow ] crbug.com/874695 http/tests/media/controls/toggle-class-with-state-source-buffer.html [ Slow ]
crbug.com/874695 http/tests/media/preload-conditions.html [ Slow ] crbug.com/874695 http/tests/media/preload-conditions.html [ Slow ]
crbug.com/874695 http/tests/media/video-buffered.html [ Slow ] crbug.com/874695 http/tests/media/video-buffered.html [ Slow ]
crbug.com/874695 http/tests/media/video-load-metadata-decode-error.html [ Slow ]
crbug.com/874695 http/tests/media/video-play-stall-before-meta-data.html [ Slow ] crbug.com/874695 http/tests/media/video-play-stall-before-meta-data.html [ Slow ]
crbug.com/874695 http/tests/misc/adopt-iframe-src-attr-after-remove.html [ Slow ] crbug.com/874695 http/tests/misc/adopt-iframe-src-attr-after-remove.html [ Slow ]
crbug.com/874695 http/tests/misc/async-script-removed.html [ Slow ] crbug.com/874695 http/tests/misc/async-script-removed.html [ Slow ]
......
...@@ -6700,3 +6700,6 @@ crbug.com/1116681 [ Mac ] fast/frames/iframe-scaling-with-scroll.html [ Pass Fai ...@@ -6700,3 +6700,6 @@ crbug.com/1116681 [ Mac ] fast/frames/iframe-scaling-with-scroll.html [ Pass Fai
# Sheriff 2020-08-17 # Sheriff 2020-08-17
crbug.com/1069546 [ Mac ] compositing/layer-creation/overflow-scroll-overlap.html [ Pass Failure ] crbug.com/1069546 [ Mac ] compositing/layer-creation/overflow-scroll-overlap.html [ Pass Failure ]
# Unexpected demuxer success after M86 FFmpeg roll.
crbug.com/1117613 media/video-error-networkState.html [ Failure ]
#!/usr/bin/perl -wT
use strict;
use CGI;
use File::stat;
my $query = new CGI;
my $name = $query->param('name');
my $filesize = stat($name)->size;
# Get MIME type.
my $type = $query->param('type');
if (!$type) {
print "Status: 400 Bad Request\r\n";
return;
}
my $rangeEnd = $filesize - 1;
# Print HTTP Header, disabling cache.
print "Cache-Control: no-cache\n";
print "Content-Length: " . $filesize . "\n";
print "Content-Type: " . $type . "\n";
print "\n";
open FILE, $name or die;
binmode FILE;
my ($data, $n);
my $total = 0;
my $break = $filesize * 3 / 4;
my $string = "corrupt video";
seek(FILE, 0, 0);
while (($n = read FILE, $data, 1024) != 0) {
print $data;
$total += $n;
if ($total >= $filesize) {
last;
}
if ($total >= $break) {
print $string;
$total += length($string);
}
}
close(FILE);
<!DOCTYPE html>
<title>This test case simulates a decode error after loading meta data of a video.</title>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../../media-resources/media-file.js"></script>
<video></video>
<script>
async_test(function(t) {
var video = document.querySelector("video");
var watcher = new EventWatcher(t, video, ["loadedmetadata", "error"]);
watcher.wait_for(["loadedmetadata", "error"]).then(t.step_func_done(function() {
assert_equals(video.networkState, HTMLMediaElement.NETWORK_IDLE);
}));
var movie = "resources/test.ogv";
var type = mimeTypeForExtension(movie.split(".").pop());
video.src = "video-load-metadata-decode-error.cgi?name=" + movie + "&type=" + type;
video.play();
});
</script>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment