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

Side by Side Diff: media/formats/webm/webm_video_client.h

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 13 matching lines...) Expand all
24 void Reset(); 24 void Reset();
25 25
26 // Initialize |config| with the data in |codec_id|, |codec_private|, 26 // Initialize |config| with the data in |codec_id|, |codec_private|,
27 // |is_encrypted| and the fields parsed from the last video track element this 27 // |is_encrypted| and the fields parsed from the last video track element this
28 // object was used to parse. 28 // object was used to parse.
29 // Returns true if |config| was successfully initialized. 29 // Returns true if |config| was successfully initialized.
30 // Returns false if there was unexpected values in the provided parameters or 30 // Returns false if there was unexpected values in the provided parameters or
31 // video track element fields. The contents of |config| are undefined in this 31 // video track element fields. The contents of |config| are undefined in this
32 // case and should not be relied upon. 32 // case and should not be relied upon.
33 bool InitializeConfig(const std::string& codec_id, 33 bool InitializeConfig(const std::string& codec_id,
34 const std::vector<uint8>& codec_private, 34 const std::vector<uint8_t>& codec_private,
35 bool is_encrypted, 35 bool is_encrypted,
36 VideoDecoderConfig* config); 36 VideoDecoderConfig* config);
37 37
38 private: 38 private:
39 // WebMParserClient implementation. 39 // WebMParserClient implementation.
40 bool OnUInt(int id, int64 val) override; 40 bool OnUInt(int id, int64_t val) override;
41 bool OnBinary(int id, const uint8* data, int size) override; 41 bool OnBinary(int id, const uint8_t* data, int size) override;
42 bool OnFloat(int id, double val) override; 42 bool OnFloat(int id, double val) override;
43 43
44 scoped_refptr<MediaLog> media_log_; 44 scoped_refptr<MediaLog> media_log_;
45 int64 pixel_width_; 45 int64_t pixel_width_;
46 int64 pixel_height_; 46 int64_t pixel_height_;
47 int64 crop_bottom_; 47 int64_t crop_bottom_;
48 int64 crop_top_; 48 int64_t crop_top_;
49 int64 crop_left_; 49 int64_t crop_left_;
50 int64 crop_right_; 50 int64_t crop_right_;
51 int64 display_width_; 51 int64_t display_width_;
52 int64 display_height_; 52 int64_t display_height_;
53 int64 display_unit_; 53 int64_t display_unit_;
54 int64 alpha_mode_; 54 int64_t alpha_mode_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(WebMVideoClient); 56 DISALLOW_COPY_AND_ASSIGN(WebMVideoClient);
57 }; 57 };
58 58
59 } // namespace media 59 } // namespace media
60 60
61 #endif // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ 61 #endif // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698