| Index: device/capture/video/file_video_capture_device.cc
|
| diff --git a/media/capture/video/file_video_capture_device.cc b/device/capture/video/file_video_capture_device.cc
|
| similarity index 97%
|
| rename from media/capture/video/file_video_capture_device.cc
|
| rename to device/capture/video/file_video_capture_device.cc
|
| index 10b3710f53fdf9775cda8682174c3ae5faf2aa84..7aa594c65d5b2907d37c2ab93487a0267d3d035a 100644
|
| --- a/media/capture/video/file_video_capture_device.cc
|
| +++ b/device/capture/video/file_video_capture_device.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/capture/video/file_video_capture_device.h"
|
| +#include "device/capture/video/file_video_capture_device.h"
|
|
|
| #include <stddef.h>
|
| #include <utility>
|
| @@ -17,7 +17,7 @@
|
| #include "media/base/video_capture_types.h"
|
| #include "media/filters/jpeg_parser.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| static const int kY4MHeaderMaxSize = 200;
|
| static const char kY4MSimpleFrameDelimiter[] = "FRAME";
|
| @@ -226,8 +226,9 @@ bool MjpegFileParser::Initialize(media::VideoCaptureFormat* capture_format) {
|
| return false;
|
| }
|
|
|
| - JpegParseResult result;
|
| - if (!ParseJpegStream(mapped_file_->data(), mapped_file_->length(), &result))
|
| + media::JpegParseResult result;
|
| + if (!media::ParseJpegStream(mapped_file_->data(), mapped_file_->length(),
|
| + &result))
|
| return false;
|
|
|
| frame_size_ = result.image_size;
|
| @@ -250,9 +251,9 @@ bool MjpegFileParser::Initialize(media::VideoCaptureFormat* capture_format) {
|
| const uint8_t* MjpegFileParser::GetNextFrame(int* frame_size) {
|
| const uint8_t* buf_ptr = mapped_file_->data() + current_byte_index_;
|
|
|
| - JpegParseResult result;
|
| - if (!ParseJpegStream(buf_ptr, mapped_file_->length() - current_byte_index_,
|
| - &result)) {
|
| + media::JpegParseResult result;
|
| + if (!media::ParseJpegStream(
|
| + buf_ptr, mapped_file_->length() - current_byte_index_, &result)) {
|
| return nullptr;
|
| }
|
| *frame_size = frame_size_ = result.image_size;
|
| @@ -391,4 +392,4 @@ void FileVideoCaptureDevice::OnCaptureTask() {
|
| next_frame_time_ - current_time);
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|