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

Side by Side Diff: media/cast/sender/h264_vt_encoder_unittest.cc

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: Created 5 years, 6 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/cast/sender/audio_sender_unittest.cc ('k') | media/cast/test/sender.cc » ('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 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 <queue> 5 #include <queue>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/power_monitor/power_monitor.h" 10 #include "base/power_monitor/power_monitor.h"
(...skipping 24 matching lines...) Expand all
35 ~MediaTestSuite() final {} 35 ~MediaTestSuite() final {}
36 36
37 protected: 37 protected:
38 void Initialize() final; 38 void Initialize() final;
39 }; 39 };
40 40
41 void MediaTestSuite::Initialize() { 41 void MediaTestSuite::Initialize() {
42 base::TestSuite::Initialize(); 42 base::TestSuite::Initialize();
43 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 43 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
44 command_line->AppendSwitch(switches::kEnableInbandTextTracks); 44 command_line->AppendSwitch(switches::kEnableInbandTextTracks);
45 media::InitializeMediaLibraryForTesting(); 45 media::InitializeMediaLibrary();
46 } 46 }
47 47
48 } // namespace 48 } // namespace
49 49
50 int main(int argc, char** argv) { 50 int main(int argc, char** argv) {
51 { 51 {
52 base::AtExitManager at_exit_manager; 52 base::AtExitManager at_exit_manager;
53 CHECK(VideoToolboxGlue::Get()) 53 CHECK(VideoToolboxGlue::Get())
54 << "VideoToolbox is not available. Requires OS X 10.8 or iOS 8.0."; 54 << "VideoToolbox is not available. Requires OS X 10.8 or iOS 8.0.";
55 } 55 }
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 gfx::Size(kVideoWidth, kVideoHeight), base::TimeDelta())); 404 gfx::Size(kVideoWidth, kVideoHeight), base::TimeDelta()));
405 405
406 // After a power resume event, the factory should produce frames right away 406 // After a power resume event, the factory should produce frames right away
407 // because the encoder re-initializes on its own. 407 // because the encoder re-initializes on its own.
408 power_source_->GenerateResumeEvent(); 408 power_source_->GenerateResumeEvent();
409 CreateFrameAndMemsetPlane(video_frame_factory.get()); 409 CreateFrameAndMemsetPlane(video_frame_factory.get());
410 } 410 }
411 411
412 } // namespace cast 412 } // namespace cast
413 } // namespace media 413 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/audio_sender_unittest.cc ('k') | media/cast/test/sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698