Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(557)

Side by Side Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 2434383003: Handle duplicate media track ids in FFmpegDemuxer (Closed)
Patch Set: Stream ids must be unique only per-stream-type Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/test/data/crbug657437.mp4 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <deque> 9 #include <deque>
10 #include <string> 10 #include <string>
(...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 EXPECT_EQ(video_track2.language(), "und"); 1339 EXPECT_EQ(video_track2.language(), "und");
1340 1340
1341 const MediaTrack& audio_track2 = *(media_tracks_->tracks()[3]); 1341 const MediaTrack& audio_track2 = *(media_tracks_->tracks()[3]);
1342 EXPECT_EQ(audio_track2.type(), MediaTrack::Audio); 1342 EXPECT_EQ(audio_track2.type(), MediaTrack::Audio);
1343 EXPECT_EQ(audio_track2.bytestream_track_id(), 4); 1343 EXPECT_EQ(audio_track2.bytestream_track_id(), 4);
1344 EXPECT_EQ(audio_track2.kind(), "main"); 1344 EXPECT_EQ(audio_track2.kind(), "main");
1345 EXPECT_EQ(audio_track2.label(), "SoundHandler"); 1345 EXPECT_EQ(audio_track2.label(), "SoundHandler");
1346 EXPECT_EQ(audio_track2.language(), "und"); 1346 EXPECT_EQ(audio_track2.language(), "und");
1347 } 1347 }
1348 1348
1349 TEST_F(FFmpegDemuxerTest, Read_Mp4_Crbug657437) {
1350 CreateDemuxer("crbug657437.mp4");
1351 InitializeDemuxer();
1352 }
1353
1349 #endif // defined(USE_PROPRIETARY_CODECS) 1354 #endif // defined(USE_PROPRIETARY_CODECS)
1350 1355
1351 TEST_F(FFmpegDemuxerTest, Read_Webm_Multiple_Tracks) { 1356 TEST_F(FFmpegDemuxerTest, Read_Webm_Multiple_Tracks) {
1352 CreateDemuxer("multitrack-3video-2audio.webm"); 1357 CreateDemuxer("multitrack-3video-2audio.webm");
1353 InitializeDemuxer(); 1358 InitializeDemuxer();
1354 1359
1355 EXPECT_EQ(media_tracks_->tracks().size(), 5u); 1360 EXPECT_EQ(media_tracks_->tracks().size(), 5u);
1356 1361
1357 const MediaTrack& video_track1 = *(media_tracks_->tracks()[0]); 1362 const MediaTrack& video_track1 = *(media_tracks_->tracks()[0]);
1358 EXPECT_EQ(video_track1.type(), MediaTrack::Video); 1363 EXPECT_EQ(video_track1.type(), MediaTrack::Video);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 1395
1391 const MediaTrack& audio_track = *(media_tracks_->tracks()[1]); 1396 const MediaTrack& audio_track = *(media_tracks_->tracks()[1]);
1392 EXPECT_EQ(audio_track.type(), MediaTrack::Audio); 1397 EXPECT_EQ(audio_track.type(), MediaTrack::Audio);
1393 EXPECT_EQ(audio_track.bytestream_track_id(), 2); 1398 EXPECT_EQ(audio_track.bytestream_track_id(), 2);
1394 EXPECT_EQ(audio_track.kind(), "main"); 1399 EXPECT_EQ(audio_track.kind(), "main");
1395 EXPECT_EQ(audio_track.label(), ""); 1400 EXPECT_EQ(audio_track.label(), "");
1396 EXPECT_EQ(audio_track.language(), ""); 1401 EXPECT_EQ(audio_track.language(), "");
1397 } 1402 }
1398 1403
1399 } // namespace media 1404 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/test/data/crbug657437.mp4 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698