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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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/base/media_file_checker.h" 5 #include "media/base/media_file_checker.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "media/ffmpeg/ffmpeg_common.h" 11 #include "media/ffmpeg/ffmpeg_common.h"
12 #include "media/filters/blocking_url_protocol.h" 12 #include "media/filters/blocking_url_protocol.h"
13 #include "media/filters/ffmpeg_glue.h" 13 #include "media/filters/ffmpeg_glue.h"
14 #include "media/filters/file_data_source.h" 14 #include "media/filters/file_data_source.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 static const int64 kMaxCheckTimeInSeconds = 5; 18 static const int64_t kMaxCheckTimeInSeconds = 5;
19 19
20 static void OnError(bool* called) { 20 static void OnError(bool* called) {
21 *called = false; 21 *called = false;
22 } 22 }
23 23
24 MediaFileChecker::MediaFileChecker(base::File file) : file_(file.Pass()) { 24 MediaFileChecker::MediaFileChecker(base::File file) : file_(file.Pass()) {
25 } 25 }
26 26
27 MediaFileChecker::~MediaFileChecker() { 27 MediaFileChecker::~MediaFileChecker() {
28 } 28 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (result >= 0 && frame_decoded) 96 if (result >= 0 && frame_decoded)
97 av_frame_unref(frame.get()); 97 av_frame_unref(frame.get());
98 } 98 }
99 av_packet_unref(&packet); 99 av_packet_unref(&packet);
100 } while (base::TimeTicks::Now() < deadline && read_ok && result >= 0); 100 } while (base::TimeTicks::Now() < deadline && read_ok && result >= 0);
101 101
102 return read_ok && (result == AVERROR_EOF || result >= 0); 102 return read_ok && (result == AVERROR_EOF || result >= 0);
103 } 103 }
104 104
105 } // namespace media 105 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698