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

Side by Side Diff: media/formats/common/stream_parser_test_base.cc

Issue 239423005: Wire up codec_delay() to MP3StreamParser and FFmpegAudioDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Switch codec_delay() to frames. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/formats/common/stream_parser_test_base.h" 5 #include "media/formats/common/stream_parser_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/base/test_data_util.h" 8 #include "media/base/test_data_util.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 } 80 }
81 81
82 bool StreamParserTestBase::OnNewConfig( 82 bool StreamParserTestBase::OnNewConfig(
83 const AudioDecoderConfig& audio_config, 83 const AudioDecoderConfig& audio_config,
84 const VideoDecoderConfig& video_config, 84 const VideoDecoderConfig& video_config,
85 const StreamParser::TextTrackConfigMap& text_config) { 85 const StreamParser::TextTrackConfigMap& text_config) {
86 DVLOG(1) << __FUNCTION__ << "(" << audio_config.IsValidConfig() << ", " 86 DVLOG(1) << __FUNCTION__ << "(" << audio_config.IsValidConfig() << ", "
87 << video_config.IsValidConfig() << ")"; 87 << video_config.IsValidConfig() << ")";
88 EXPECT_TRUE(audio_config.IsValidConfig()); 88 EXPECT_TRUE(audio_config.IsValidConfig());
89 EXPECT_FALSE(video_config.IsValidConfig()); 89 EXPECT_FALSE(video_config.IsValidConfig());
90 last_audio_config_ = audio_config;
90 return true; 91 return true;
91 } 92 }
92 93
93 bool StreamParserTestBase::OnNewBuffers( 94 bool StreamParserTestBase::OnNewBuffers(
94 const StreamParser::BufferQueue& audio_buffers, 95 const StreamParser::BufferQueue& audio_buffers,
95 const StreamParser::BufferQueue& video_buffers, 96 const StreamParser::BufferQueue& video_buffers,
96 const StreamParser::TextBufferQueueMap& text_map) { 97 const StreamParser::TextBufferQueueMap& text_map) {
97 EXPECT_FALSE(audio_buffers.empty()); 98 EXPECT_FALSE(audio_buffers.empty());
98 EXPECT_TRUE(video_buffers.empty()); 99 EXPECT_TRUE(video_buffers.empty());
99 100
(...skipping 16 matching lines...) Expand all
116 DVLOG(1) << __FUNCTION__; 117 DVLOG(1) << __FUNCTION__;
117 results_stream_ << "NewSegment"; 118 results_stream_ << "NewSegment";
118 } 119 }
119 120
120 void StreamParserTestBase::OnEndOfSegment() { 121 void StreamParserTestBase::OnEndOfSegment() {
121 DVLOG(1) << __FUNCTION__; 122 DVLOG(1) << __FUNCTION__;
122 results_stream_ << "EndOfSegment"; 123 results_stream_ << "EndOfSegment";
123 } 124 }
124 125
125 } // namespace media 126 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698