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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef 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
« no previous file with comments | « media/base/media.cc ('k') | media/base/media_keys.h » ('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>
8 #include <stdint.h>
9
7 #include <map> 10 #include <map>
8 11
9 #include "base/bind.h" 12 #include "base/bind.h"
10 #include "base/time/time.h" 13 #include "base/time/time.h"
11 #include "media/ffmpeg/ffmpeg_common.h" 14 #include "media/ffmpeg/ffmpeg_common.h"
12 #include "media/filters/blocking_url_protocol.h" 15 #include "media/filters/blocking_url_protocol.h"
13 #include "media/filters/ffmpeg_glue.h" 16 #include "media/filters/ffmpeg_glue.h"
14 #include "media/filters/file_data_source.h" 17 #include "media/filters/file_data_source.h"
15 18
16 namespace media { 19 namespace media {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (result >= 0 && frame_decoded) 99 if (result >= 0 && frame_decoded)
97 av_frame_unref(frame.get()); 100 av_frame_unref(frame.get());
98 } 101 }
99 av_packet_unref(&packet); 102 av_packet_unref(&packet);
100 } while (base::TimeTicks::Now() < deadline && read_ok && result >= 0); 103 } while (base::TimeTicks::Now() < deadline && read_ok && result >= 0);
101 104
102 return read_ok && (result == AVERROR_EOF || result >= 0); 105 return read_ok && (result == AVERROR_EOF || result >= 0);
103 } 106 }
104 107
105 } // namespace media 108 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media.cc ('k') | media/base/media_keys.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698