53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
--- a/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
|
|
+++ b/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc
|
|
@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testi
|
|
EXPECT_FALSE(reader_->Open());
|
|
}
|
|
|
|
- void RunTestFailingDecode(const char* fn, int expect_read = 0) {
|
|
+ void RunTestFailingDecode(const char* fn) {
|
|
Initialize(fn);
|
|
EXPECT_TRUE(reader_->Open());
|
|
std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
|
|
- EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
|
|
+ EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
|
|
}
|
|
|
|
void RunTestPartialDecode(const char* fn) {
|
|
@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) {
|
|
}
|
|
|
|
TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
|
|
- RunTestFailingDecode("midstream_config_change.mp3", 42624);
|
|
+ RunTestFailingDecode("midstream_config_change.mp3");
|
|
}
|
|
#endif
|
|
|
|
--- a/src/3rdparty/chromium/media/filters/audio_video_metadata_extractor.cc
|
|
+++ b/src/3rdparty/chromium/media/filters/audio_video_metadata_extractor.cc
|
|
@@ -113,15 +113,6 @@ bool AudioVideoMetadataExtractor::Extrac
|
|
if (!stream)
|
|
continue;
|
|
|
|
- void* display_matrix =
|
|
- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
|
|
- if (display_matrix) {
|
|
- rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
|
|
- static_cast<int32_t*>(display_matrix))
|
|
- .rotation;
|
|
- info.tags["rotate"] = base::NumberToString(rotation_);
|
|
- }
|
|
-
|
|
// Extract dictionary from streams also. Needed for containers that attach
|
|
// metadata to contained streams instead the container itself, like OGG.
|
|
ExtractDictionary(stream->metadata, &info.tags);
|
|
@@ -264,6 +255,8 @@ void AudioVideoMetadataExtractor::Extrac
|
|
if (raw_tags->find(tag->key) == raw_tags->end())
|
|
(*raw_tags)[tag->key] = tag->value;
|
|
|
|
+ if (ExtractInt(tag, "rotate", &rotation_))
|
|
+ continue;
|
|
if (ExtractString(tag, "album", &album_))
|
|
continue;
|
|
if (ExtractString(tag, "artist", &artist_))
|