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

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

Issue 2284923003: Implement support for multiple tracks in FFmpegDemuxer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 3 months 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/README » ('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 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1304 EXPECT_EQ(audio_track.language(), "und"); 1304 EXPECT_EQ(audio_track.language(), "und");
1305 1305
1306 const MediaTrack& video_track = *(media_tracks_->tracks()[1]); 1306 const MediaTrack& video_track = *(media_tracks_->tracks()[1]);
1307 EXPECT_EQ(video_track.type(), MediaTrack::Video); 1307 EXPECT_EQ(video_track.type(), MediaTrack::Video);
1308 EXPECT_EQ(video_track.bytestream_track_id(), 2); 1308 EXPECT_EQ(video_track.bytestream_track_id(), 2);
1309 EXPECT_EQ(video_track.kind(), "main"); 1309 EXPECT_EQ(video_track.kind(), "main");
1310 EXPECT_EQ(video_track.label(), "GPAC ISO Video Handler"); 1310 EXPECT_EQ(video_track.label(), "GPAC ISO Video Handler");
1311 EXPECT_EQ(video_track.language(), "und"); 1311 EXPECT_EQ(video_track.language(), "und");
1312 } 1312 }
1313 1313
1314 TEST_F(FFmpegDemuxerTest, Read_Mp4_Multiple_Tracks) {
1315 CreateDemuxer("bbb-320x240-2video-2audio.mp4");
1316 InitializeDemuxer();
1317
1318 EXPECT_EQ(media_tracks_->tracks().size(), 4u);
1319
1320 const MediaTrack& video_track = *(media_tracks_->tracks()[0]);
1321 EXPECT_EQ(video_track.type(), MediaTrack::Video);
1322 EXPECT_EQ(video_track.bytestream_track_id(), 1);
1323 EXPECT_EQ(video_track.kind(), "main");
1324 EXPECT_EQ(video_track.label(), "VideoHandler");
1325 EXPECT_EQ(video_track.language(), "und");
1326
1327 const MediaTrack& audio_track = *(media_tracks_->tracks()[1]);
1328 EXPECT_EQ(audio_track.type(), MediaTrack::Audio);
1329 EXPECT_EQ(audio_track.bytestream_track_id(), 2);
1330 EXPECT_EQ(audio_track.kind(), "main");
1331 EXPECT_EQ(audio_track.label(), "SoundHandler");
1332 EXPECT_EQ(audio_track.language(), "und");
1333
1334 const MediaTrack& video_track2 = *(media_tracks_->tracks()[2]);
1335 EXPECT_EQ(video_track2.type(), MediaTrack::Video);
1336 EXPECT_EQ(video_track2.bytestream_track_id(), 3);
1337 EXPECT_EQ(video_track2.kind(), "main");
1338 EXPECT_EQ(video_track2.label(), "VideoHandler");
1339 EXPECT_EQ(video_track2.language(), "und");
1340
1341 const MediaTrack& audio_track2 = *(media_tracks_->tracks()[3]);
1342 EXPECT_EQ(audio_track2.type(), MediaTrack::Audio);
1343 EXPECT_EQ(audio_track2.bytestream_track_id(), 4);
1344 EXPECT_EQ(audio_track2.kind(), "main");
1345 EXPECT_EQ(audio_track2.label(), "SoundHandler");
1346 EXPECT_EQ(audio_track2.language(), "und");
1347 }
1348
1314 #endif // defined(USE_PROPRIETARY_CODECS) 1349 #endif // defined(USE_PROPRIETARY_CODECS)
1315 1350
1351 TEST_F(FFmpegDemuxerTest, Read_Webm_Multiple_Tracks) {
1352 CreateDemuxer("multitrack-3video-2audio.webm");
1353 InitializeDemuxer();
1354
1355 EXPECT_EQ(media_tracks_->tracks().size(), 5u);
1356
1357 const MediaTrack& video_track1 = *(media_tracks_->tracks()[0]);
1358 EXPECT_EQ(video_track1.type(), MediaTrack::Video);
1359 EXPECT_EQ(video_track1.bytestream_track_id(), 1);
1360
1361 const MediaTrack& video_track2 = *(media_tracks_->tracks()[1]);
1362 EXPECT_EQ(video_track2.type(), MediaTrack::Video);
1363 EXPECT_EQ(video_track2.bytestream_track_id(), 2);
1364
1365 const MediaTrack& video_track3 = *(media_tracks_->tracks()[2]);
1366 EXPECT_EQ(video_track3.type(), MediaTrack::Video);
1367 EXPECT_EQ(video_track3.bytestream_track_id(), 3);
1368
1369 const MediaTrack& audio_track1 = *(media_tracks_->tracks()[3]);
1370 EXPECT_EQ(audio_track1.type(), MediaTrack::Audio);
1371 EXPECT_EQ(audio_track1.bytestream_track_id(), 4);
1372
1373 const MediaTrack& audio_track2 = *(media_tracks_->tracks()[4]);
1374 EXPECT_EQ(audio_track2.type(), MediaTrack::Audio);
1375 EXPECT_EQ(audio_track2.bytestream_track_id(), 5);
1376 }
1377
1316 TEST_F(FFmpegDemuxerTest, Read_Webm_Media_Track_Info) { 1378 TEST_F(FFmpegDemuxerTest, Read_Webm_Media_Track_Info) {
1317 CreateDemuxer("bear.webm"); 1379 CreateDemuxer("bear.webm");
1318 InitializeDemuxer(); 1380 InitializeDemuxer();
1319 1381
1320 EXPECT_EQ(media_tracks_->tracks().size(), 2u); 1382 EXPECT_EQ(media_tracks_->tracks().size(), 2u);
1321 1383
1322 const MediaTrack& video_track = *(media_tracks_->tracks()[0]); 1384 const MediaTrack& video_track = *(media_tracks_->tracks()[0]);
1323 EXPECT_EQ(video_track.type(), MediaTrack::Video); 1385 EXPECT_EQ(video_track.type(), MediaTrack::Video);
1324 EXPECT_EQ(video_track.bytestream_track_id(), 1); 1386 EXPECT_EQ(video_track.bytestream_track_id(), 1);
1325 EXPECT_EQ(video_track.kind(), "main"); 1387 EXPECT_EQ(video_track.kind(), "main");
1326 EXPECT_EQ(video_track.label(), ""); 1388 EXPECT_EQ(video_track.label(), "");
1327 EXPECT_EQ(video_track.language(), ""); 1389 EXPECT_EQ(video_track.language(), "");
1328 1390
1329 const MediaTrack& audio_track = *(media_tracks_->tracks()[1]); 1391 const MediaTrack& audio_track = *(media_tracks_->tracks()[1]);
1330 EXPECT_EQ(audio_track.type(), MediaTrack::Audio); 1392 EXPECT_EQ(audio_track.type(), MediaTrack::Audio);
1331 EXPECT_EQ(audio_track.bytestream_track_id(), 2); 1393 EXPECT_EQ(audio_track.bytestream_track_id(), 2);
1332 EXPECT_EQ(audio_track.kind(), "main"); 1394 EXPECT_EQ(audio_track.kind(), "main");
1333 EXPECT_EQ(audio_track.label(), ""); 1395 EXPECT_EQ(audio_track.label(), "");
1334 EXPECT_EQ(audio_track.language(), ""); 1396 EXPECT_EQ(audio_track.language(), "");
1335 } 1397 }
1336 1398
1337 } // namespace media 1399 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/test/data/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698