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

Side by Side Diff: media/base/media_file_checker.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/base/decoder_buffer.h ('k') | media/base/media_file_checker_unittest.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 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/base/media_file_checker.h" 5 #include "media/base/media_file_checker.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9
10 #include <map> 9 #include <map>
10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "media/ffmpeg/ffmpeg_common.h" 14 #include "media/ffmpeg/ffmpeg_common.h"
15 #include "media/filters/blocking_url_protocol.h" 15 #include "media/filters/blocking_url_protocol.h"
16 #include "media/filters/ffmpeg_glue.h" 16 #include "media/filters/ffmpeg_glue.h"
17 #include "media/filters/file_data_source.h" 17 #include "media/filters/file_data_source.h"
18 18
19 namespace media { 19 namespace media {
20 20
21 static const int64_t kMaxCheckTimeInSeconds = 5; 21 static const int64_t kMaxCheckTimeInSeconds = 5;
22 22
23 static void OnError(bool* called) { 23 static void OnError(bool* called) {
24 *called = false; 24 *called = false;
25 } 25 }
26 26
27 MediaFileChecker::MediaFileChecker(base::File file) : file_(file.Pass()) { 27 MediaFileChecker::MediaFileChecker(base::File file) : file_(std::move(file)) {}
28 }
29 28
30 MediaFileChecker::~MediaFileChecker() { 29 MediaFileChecker::~MediaFileChecker() {
31 } 30 }
32 31
33 bool MediaFileChecker::Start(base::TimeDelta check_time) { 32 bool MediaFileChecker::Start(base::TimeDelta check_time) {
34 media::FileDataSource source(file_.Pass()); 33 media::FileDataSource source(std::move(file_));
35 bool read_ok = true; 34 bool read_ok = true;
36 media::BlockingUrlProtocol protocol(&source, base::Bind(&OnError, &read_ok)); 35 media::BlockingUrlProtocol protocol(&source, base::Bind(&OnError, &read_ok));
37 media::FFmpegGlue glue(&protocol); 36 media::FFmpegGlue glue(&protocol);
38 AVFormatContext* format_context = glue.format_context(); 37 AVFormatContext* format_context = glue.format_context();
39 38
40 if (!glue.OpenContext()) 39 if (!glue.OpenContext())
41 return false; 40 return false;
42 41
43 if (avformat_find_stream_info(format_context, NULL) < 0) 42 if (avformat_find_stream_info(format_context, NULL) < 0)
44 return false; 43 return false;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 if (result >= 0 && frame_decoded) 98 if (result >= 0 && frame_decoded)
100 av_frame_unref(frame.get()); 99 av_frame_unref(frame.get());
101 } 100 }
102 av_packet_unref(&packet); 101 av_packet_unref(&packet);
103 } while (base::TimeTicks::Now() < deadline && read_ok && result >= 0); 102 } while (base::TimeTicks::Now() < deadline && read_ok && result >= 0);
104 103
105 return read_ok && (result == AVERROR_EOF || result >= 0); 104 return read_ok && (result == AVERROR_EOF || result >= 0);
106 } 105 }
107 106
108 } // namespace media 107 } // namespace media
OLDNEW
« no previous file with comments | « media/base/decoder_buffer.h ('k') | media/base/media_file_checker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698