diff options
| author | Ralph Giles <giles@mozilla.com> | 2014-02-03 11:00:11 -0800 |
|---|---|---|
| committer | Ralph Giles <giles@mozilla.com> | 2014-02-04 16:39:27 -0800 |
| commit | e5643437c50e07aca699315cc462d8a15f0904c3 (patch) | |
| tree | f46508fb3bad6dc980ec6a824ab512a8184438e5 /third_party | |
| parent | f3bd5d82e501834e01e5d0d9b1a634f8c80012ce (diff) | |
| download | libvpx-e5643437c50e07aca699315cc462d8a15f0904c3.tar libvpx-e5643437c50e07aca699315cc462d8a15f0904c3.tar.gz libvpx-e5643437c50e07aca699315cc462d8a15f0904c3.tar.bz2 libvpx-e5643437c50e07aca699315cc462d8a15f0904c3.zip | |
libmkv: Use uint64_t instead of UInt64.
The rest of the code uses stdint types and this makes porting
easier.
Change-Id: Ie2f565f6a919199f0145b6aea97bb7588548e97d
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libmkv/WebMElement.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/third_party/libmkv/WebMElement.c b/third_party/libmkv/WebMElement.c index 3ab388054..6c3670a28 100644 --- a/third_party/libmkv/WebMElement.c +++ b/third_party/libmkv/WebMElement.c @@ -11,6 +11,7 @@ #include "EbmlIDs.h" #include "WebMElement.h" #include <stdio.h> +#include "vpx/vpx_integer.h" #define kVorbisPrivateMaxSize 4000 @@ -43,12 +44,12 @@ void writeSimpleBlock(EbmlGlobal *glob, unsigned char trackNumber, short timeCod Ebml_Write(glob, data, dataLength); } -static UInt64 generateTrackID(unsigned int trackNumber) { - UInt64 t = time(NULL) * trackNumber; - UInt64 r = rand(); +static uint64_t generateTrackID(unsigned int trackNumber) { + uint64_t t = time(NULL) * trackNumber; + uint64_t r = rand(); r = r << 32; r += rand(); - UInt64 rval = t ^ r; + uint64_t rval = t ^ r; return rval; } @@ -59,7 +60,7 @@ void writeVideoTrack(EbmlGlobal *glob, unsigned int trackNumber, EbmlLoc start; Ebml_StartSubElement(glob, &start, TrackEntry); Ebml_SerializeUnsigned(glob, TrackNumber, trackNumber); - UInt64 trackID = generateTrackID(trackNumber); + uint64_t trackID = generateTrackID(trackNumber); Ebml_SerializeUnsigned(glob, TrackUID, trackID); Ebml_SerializeString(glob, CodecName, "VP8"); // TODO shouldn't be fixed @@ -82,7 +83,7 @@ void writeAudioTrack(EbmlGlobal *glob, unsigned int trackNumber, EbmlLoc start; Ebml_StartSubElement(glob, &start, TrackEntry); Ebml_SerializeUnsigned(glob, TrackNumber, trackNumber); - UInt64 trackID = generateTrackID(trackNumber); + uint64_t trackID = generateTrackID(trackNumber); Ebml_SerializeUnsigned(glob, TrackUID, trackID); Ebml_SerializeUnsigned(glob, TrackType, 2); // audio is always 2 // I am using defaults for thesed required fields |