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

Side by Side Diff: media/muxers/webm_muxer_unittest.cc

Issue 1920483002: MediaRecorderHandler and WebmMuxer: add support for H264. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed TODO (V_MPEG4/ISO/AVC) and adapted unit tests Created 4 years, 7 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/muxers/webm_muxer.cc ('k') | 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/muxers/webm_muxer.h" 5 #include "media/muxers/webm_muxer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 // We'll also get lots of other header-related stuff. 230 // We'll also get lots of other header-related stuff.
231 EXPECT_CALL(*this, WriteCallback( 231 EXPECT_CALL(*this, WriteCallback(
232 AllOf(Not(Eq(encoded_video)), Not(Eq(encoded_audio))))) 232 AllOf(Not(Eq(encoded_video)), Not(Eq(encoded_audio)))))
233 .Times(AnyNumber()); 233 .Times(AnyNumber());
234 webm_muxer_.OnEncodedAudio(audio_params, 234 webm_muxer_.OnEncodedAudio(audio_params,
235 base::WrapUnique(new std::string(encoded_audio)), 235 base::WrapUnique(new std::string(encoded_audio)),
236 base::TimeTicks::Now()); 236 base::TimeTicks::Now());
237 } 237 }
238 238
239 const kTestParams kTestCases[] = { 239 const kTestParams kTestCases[] = {
240 // TODO: consider not enumerating every combination by hand.
241 {kCodecVP8, 1 /* num_video_tracks */, 0 /*num_audio_tracks*/}, 240 {kCodecVP8, 1 /* num_video_tracks */, 0 /*num_audio_tracks*/},
242 {kCodecVP8, 0, 1}, 241 {kCodecVP8, 0, 1},
243 {kCodecVP8, 1, 1}, 242 {kCodecVP8, 1, 1},
244 {kCodecVP9, 1, 0}, 243 {kCodecVP9, 1, 0},
245 {kCodecVP9, 0, 1}, 244 {kCodecVP9, 0, 1},
246 {kCodecVP9, 1, 1}, 245 {kCodecVP9, 1, 1},
246 {kCodecH264, 1, 0},
247 {kCodecH264, 0, 1},
248 {kCodecH264, 1, 1},
247 }; 249 };
248 250
249 INSTANTIATE_TEST_CASE_P(, WebmMuxerTest, ValuesIn(kTestCases)); 251 INSTANTIATE_TEST_CASE_P(, WebmMuxerTest, ValuesIn(kTestCases));
250 252
251 } // namespace media 253 } // namespace media
OLDNEW
« no previous file with comments | « media/muxers/webm_muxer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698