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

Side by Side Diff: media/cast/test/simulator.cc

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/test/sender.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.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 // Simulate end to end streaming. 5 // Simulate end to end streaming.
6 // 6 //
7 // Input: 7 // Input:
8 // --source= 8 // --source=
9 // WebM used as the source of video and audio frames. 9 // WebM used as the source of video and audio frames.
10 // --output= 10 // --output=
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 732
733 const base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); 733 const base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
734 base::FilePath media_path = cmd->GetSwitchValuePath(media::cast::kLibDir); 734 base::FilePath media_path = cmd->GetSwitchValuePath(media::cast::kLibDir);
735 if (media_path.empty()) { 735 if (media_path.empty()) {
736 if (!PathService::Get(base::DIR_MODULE, &media_path)) { 736 if (!PathService::Get(base::DIR_MODULE, &media_path)) {
737 LOG(ERROR) << "Failed to load FFmpeg."; 737 LOG(ERROR) << "Failed to load FFmpeg.";
738 return 1; 738 return 1;
739 } 739 }
740 } 740 }
741 741
742 media::InitializeMediaLibrary(); 742 if (!media::InitializeMediaLibrary(media_path)) {
743 LOG(ERROR) << "Failed to initialize FFmpeg.";
744 return 1;
745 }
743 746
744 base::FilePath source_path = cmd->GetSwitchValuePath( 747 base::FilePath source_path = cmd->GetSwitchValuePath(
745 media::cast::kSourcePath); 748 media::cast::kSourcePath);
746 base::FilePath log_output_path = cmd->GetSwitchValuePath( 749 base::FilePath log_output_path = cmd->GetSwitchValuePath(
747 media::cast::kOutputPath); 750 media::cast::kOutputPath);
748 if (log_output_path.empty()) { 751 if (log_output_path.empty()) {
749 base::GetTempDir(&log_output_path); 752 base::GetTempDir(&log_output_path);
750 log_output_path = log_output_path.AppendASCII("sim-events.gz"); 753 log_output_path = log_output_path.AppendASCII("sim-events.gz");
751 } 754 }
752 base::FilePath metrics_output_path = cmd->GetSwitchValuePath( 755 base::FilePath metrics_output_path = cmd->GetSwitchValuePath(
(...skipping 10 matching lines...) Expand all
763 values.SetString("sim-id", sim_id); 766 values.SetString("sim-id", sim_id);
764 767
765 std::string extra_data; 768 std::string extra_data;
766 base::JSONWriter::Write(values, &extra_data); 769 base::JSONWriter::Write(values, &extra_data);
767 770
768 // Run. 771 // Run.
769 media::cast::RunSimulation(source_path, log_output_path, metrics_output_path, 772 media::cast::RunSimulation(source_path, log_output_path, metrics_output_path,
770 yuv_output_path, extra_data, model); 773 yuv_output_path, extra_data, model);
771 return 0; 774 return 0;
772 } 775 }
OLDNEW
« no previous file with comments | « media/cast/test/sender.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698