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

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

Issue 67252: Disabling the FFmpegDemuxerTest.ReadAndSeek test. (Closed)
Patch Set: Added crbug.com link Created 11 years, 8 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 | « no previous file | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <deque> 5 #include <deque>
6 6
7 #include "base/singleton.h" 7 #include "base/singleton.h"
8 #include "base/tuple.h" 8 #include "base/tuple.h"
9 #include "media/base/filter_host.h" 9 #include "media/base/filter_host.h"
10 #include "media/base/filters.h" 10 #include "media/base/filters.h"
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 stream->media_format().GetAsInteger(MediaFormat::kSampleRate, &result)); 372 stream->media_format().GetAsInteger(MediaFormat::kSampleRate, &result));
373 EXPECT_EQ(g_audio_codec.sample_rate, result); 373 EXPECT_EQ(g_audio_codec.sample_rate, result);
374 EXPECT_TRUE(stream->QueryInterface(&ffmpeg_demuxer_stream)); 374 EXPECT_TRUE(stream->QueryInterface(&ffmpeg_demuxer_stream));
375 EXPECT_TRUE(ffmpeg_demuxer_stream); 375 EXPECT_TRUE(ffmpeg_demuxer_stream);
376 EXPECT_EQ(&g_streams[2], ffmpeg_demuxer_stream->av_stream()); 376 EXPECT_EQ(&g_streams[2], ffmpeg_demuxer_stream->av_stream());
377 } 377 }
378 378
379 // TODO(scherkus): as we keep refactoring and improving our mocks (both FFmpeg 379 // TODO(scherkus): as we keep refactoring and improving our mocks (both FFmpeg
380 // and pipeline/filters), try to break this test into two. Big issue right now 380 // and pipeline/filters), try to break this test into two. Big issue right now
381 // is that it takes ~50 lines of code just to set up FFmpegDemuxer. 381 // is that it takes ~50 lines of code just to set up FFmpegDemuxer.
382 TEST(FFmpegDemuxerTest, ReadAndSeek) { 382 //
383 // Refer to http://crbug.com/10653
384 TEST(FFmpegDemuxerTest, DISABLED_ReadAndSeek) {
383 // Prepare some test data. 385 // Prepare some test data.
384 const int kAudio = 0; 386 const int kAudio = 0;
385 const int kVideo = 1; 387 const int kVideo = 1;
386 const size_t kDataSize = 4; 388 const size_t kDataSize = 4;
387 uint8 audio_data[kDataSize] = {0, 1, 2, 3}; 389 uint8 audio_data[kDataSize] = {0, 1, 2, 3};
388 uint8 video_data[kDataSize] = {4, 5, 6, 7}; 390 uint8 video_data[kDataSize] = {4, 5, 6, 7};
389 391
390 // Simulate media with a an audio stream and video stream. 392 // Simulate media with a an audio stream and video stream.
391 InitializeFFmpegMocks(); 393 InitializeFFmpegMocks();
392 g_format.nb_streams = 2; 394 g_format.nb_streams = 2;
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 reader->Read(audio_stream); 577 reader->Read(audio_stream);
576 pipeline.RunAllTasks(); 578 pipeline.RunAllTasks();
577 EXPECT_FALSE(reader->WaitForRead()); 579 EXPECT_FALSE(reader->WaitForRead());
578 EXPECT_FALSE(reader->called()); 580 EXPECT_FALSE(reader->called());
579 EXPECT_FALSE(reader->buffer()); 581 EXPECT_FALSE(reader->buffer());
580 582
581 // Manually release buffer, which should release any remaining AVPackets. 583 // Manually release buffer, which should release any remaining AVPackets.
582 reader = NULL; 584 reader = NULL;
583 EXPECT_EQ(0, PacketQueue::get()->outstanding_packets()); 585 EXPECT_EQ(0, PacketQueue::get()->outstanding_packets());
584 } 586 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698