| Index: media/formats/mp4/track_run_iterator.h
|
| diff --git a/media/formats/mp4/track_run_iterator.h b/media/formats/mp4/track_run_iterator.h
|
| index fa82cc1e6372c8ea9d014ea3bdecfc272c5f5e60..3039393a438af229036c31c7dbd1eeb0f6e7fa0f 100644
|
| --- a/media/formats/mp4/track_run_iterator.h
|
| +++ b/media/formats/mp4/track_run_iterator.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
|
| #define MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -21,9 +23,10 @@ class DecryptConfig;
|
|
|
| namespace mp4 {
|
|
|
| -base::TimeDelta MEDIA_EXPORT TimeDeltaFromRational(int64 numer, int64 denom);
|
| -DecodeTimestamp MEDIA_EXPORT DecodeTimestampFromRational(int64 numer,
|
| - int64 denom);
|
| +base::TimeDelta MEDIA_EXPORT TimeDeltaFromRational(int64_t numer,
|
| + int64_t denom);
|
| +DecodeTimestamp MEDIA_EXPORT DecodeTimestampFromRational(int64_t numer,
|
| + int64_t denom);
|
|
|
| struct SampleInfo;
|
| struct TrackRunInfo;
|
| @@ -54,18 +57,18 @@ class MEDIA_EXPORT TrackRunIterator {
|
| // Caches the CENC data from the given buffer. |buf| must be a buffer starting
|
| // at the offset given by cenc_offset(), with a |size| of at least
|
| // cenc_size(). Returns true on success, false on error.
|
| - bool CacheAuxInfo(const uint8* buf, int size);
|
| + bool CacheAuxInfo(const uint8_t* buf, int size);
|
|
|
| // Returns the maximum buffer location at which no data earlier in the stream
|
| // will be required in order to read the current or any subsequent sample. You
|
| // may clear all data up to this offset before reading the current sample
|
| // safely. Result is in the same units as offset() (for Media Source this is
|
| // in bytes past the the head of the MOOF box).
|
| - int64 GetMaxClearOffset();
|
| + int64_t GetMaxClearOffset();
|
|
|
| // Property of the current run. Only valid if IsRunValid().
|
| - uint32 track_id() const;
|
| - int64 aux_info_offset() const;
|
| + uint32_t track_id() const;
|
| + int64_t aux_info_offset() const;
|
| int aux_info_size() const;
|
| bool is_encrypted() const;
|
| bool is_audio() const;
|
| @@ -74,7 +77,7 @@ class MEDIA_EXPORT TrackRunIterator {
|
| const VideoSampleEntry& video_description() const;
|
|
|
| // Properties of the current sample. Only valid if IsSampleValid().
|
| - int64 sample_offset() const;
|
| + int64_t sample_offset() const;
|
| int sample_size() const;
|
| DecodeTimestamp dts() const;
|
| base::TimeDelta cts() const;
|
| @@ -89,12 +92,12 @@ class MEDIA_EXPORT TrackRunIterator {
|
| void ResetRun();
|
| const TrackEncryption& track_encryption() const;
|
|
|
| - uint32 GetGroupDescriptionIndex(uint32 sample_index) const;
|
| + uint32_t GetGroupDescriptionIndex(uint32_t sample_index) const;
|
|
|
| // Sample encryption information.
|
| bool IsSampleEncrypted(size_t sample_index) const;
|
| - uint8 GetIvSize(size_t sample_index) const;
|
| - const std::vector<uint8>& GetKeyId(size_t sample_index) const;
|
| + uint8_t GetIvSize(size_t sample_index) const;
|
| + const std::vector<uint8_t>& GetKeyId(size_t sample_index) const;
|
|
|
| const Movie* moov_;
|
| scoped_refptr<MediaLog> media_log_;
|
| @@ -105,8 +108,8 @@ class MEDIA_EXPORT TrackRunIterator {
|
|
|
| std::vector<FrameCENCInfo> cenc_info_;
|
|
|
| - int64 sample_dts_;
|
| - int64 sample_offset_;
|
| + int64_t sample_dts_;
|
| + int64_t sample_offset_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TrackRunIterator);
|
| };
|
|
|