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

Side by Side Diff: media/capture/video/file_video_capture_device.cc

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/capture/video/file_video_capture_device.h" 5 #include "media/capture/video/file_video_capture_device.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
16 #include "base/strings/string_util.h"
16 #include "base/threading/thread_task_runner_handle.h" 17 #include "base/threading/thread_task_runner_handle.h"
17 #include "media/base/video_capture_types.h" 18 #include "media/base/video_capture_types.h"
18 #include "media/filters/jpeg_parser.h" 19 #include "media/filters/jpeg_parser.h"
19 20
20 namespace media { 21 namespace media {
21 22
22 static const int kY4MHeaderMaxSize = 200; 23 static const int kY4MHeaderMaxSize = 200;
23 static const char kY4MSimpleFrameDelimiter[] = "FRAME"; 24 static const char kY4MSimpleFrameDelimiter[] = "FRAME";
24 static const int kY4MSimpleFrameDelimiterSize = 6; 25 static const int kY4MSimpleFrameDelimiterSize = 6;
25 static const float kMJpegFrameRate = 30.0f; 26 static const float kMJpegFrameRate = 30.0f;
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 if (next_frame_time_ < current_time) 386 if (next_frame_time_ < current_time)
386 next_frame_time_ = current_time; 387 next_frame_time_ = current_time;
387 } 388 }
388 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 389 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
389 FROM_HERE, base::Bind(&FileVideoCaptureDevice::OnCaptureTask, 390 FROM_HERE, base::Bind(&FileVideoCaptureDevice::OnCaptureTask,
390 base::Unretained(this)), 391 base::Unretained(this)),
391 next_frame_time_ - current_time); 392 next_frame_time_ - current_time);
392 } 393 }
393 394
394 } // namespace media 395 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_util.cc ('k') | media/capture/video/mac/video_capture_device_avfoundation_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698