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

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

Issue 11887011: Tighten up media::DecoderBuffer data requirements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
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 <algorithm> 5 #include <algorithm>
6 #include <deque> 6 #include <deque>
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 // stream being demuxed. 611 // stream being demuxed.
612 TEST_F(FFmpegDemuxerTest, UnsupportedVideoSupportedAudioDemux) { 612 TEST_F(FFmpegDemuxerTest, UnsupportedVideoSupportedAudioDemux) {
613 CreateDemuxer("vorbis_audio_wmv_video.mkv"); 613 CreateDemuxer("vorbis_audio_wmv_video.mkv");
614 InitializeDemuxer(); 614 InitializeDemuxer();
615 615
616 // Ensure the expected streams are present. 616 // Ensure the expected streams are present.
617 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::VIDEO)); 617 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::VIDEO));
618 EXPECT_TRUE(demuxer_->GetStream(DemuxerStream::AUDIO)); 618 EXPECT_TRUE(demuxer_->GetStream(DemuxerStream::AUDIO));
619 } 619 }
620 620
621 // FFmpeg returns null data pointers when samples have zero size, leading to
622 // mistakently creating end of stream buffers http://crbug.com/169133
acolwell GONE FROM CHROMIUM 2013/01/17 00:00:08 s/mistakently/mistakenly
scherkus (not reviewing) 2013/01/17 00:16:30 Done.
623 TEST_F(FFmpegDemuxerTest, MP4_ZeroStszEntry) {
624 #if !defined(USE_PROPRIETARY_CODECS)
acolwell GONE FROM CHROMIUM 2013/01/17 00:00:08 nit: Why don't we just put all these tests in a si
scherkus (not reviewing) 2013/01/17 00:16:30 This way they still get compiled -- alternatively
625 return;
626 #endif
627 CreateDemuxer("bear-1280x720-zero-stsz-entry.mp4");
628 InitializeDemuxer();
629 ReadUntilEndOfStream();
630 }
631
621 } // namespace media 632 } // namespace media
OLDNEW
« media/base/decoder_buffer.cc ('K') | « media/filters/ffmpeg_demuxer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698