Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1030308 - Clean up EbmlBufferWriter. r=cajbir DONTBUILD

Browse Source 
Fix comments to match code and correct indenting.
This commit is contained in:
Ralph Giles 2014-06-25 13:13:00 -07:00
parent 42131807a2
commit 6ae14a4ec6
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
media/libmkv/EbmlBufferWriter.c
View File

@ -14,21 +14,21 @@ Ebml_Serialize(EbmlGlobal *glob, const void *buffer_in, int buffer_size, unsigne
/* buffer_size:
* 1 - int8_t;
* 2 - int16_t;
* 3 - int32_t;
* 4 - int64_t;
* 4 - int32_t;
* 8 - int64_t;
*/
long i;
for(i = len-1; i >= 0; i--) {
unsigned char x;
if (buffer_size == 1) {
x = (char)(*(const int8_t *)buffer_in >> (i * 8));
} else if (buffer_size == 2) {
} else if (buffer_size == 2) {
x = (char)(*(const int16_t *)buffer_in >> (i * 8));
} else if (buffer_size == 4) {
} else if (buffer_size == 4) {
x = (char)(*(const int32_t *)buffer_in >> (i * 8));
} else if (buffer_size == 8) {
} else if (buffer_size == 8) {
x = (char)(*(const int64_t *)buffer_in >> (i * 8));
}
}
Ebml_Write(glob, &x, 1);
}
}
@ -65,7 +65,7 @@ void Ebml_StartSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc, unsigned long clas
Ebml_WriteID(glob, class_id);
ebmlLoc->offset = glob->offset;
// todo this is always taking 8 bytes, this may need later optimization
Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says lenght unknown
Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says length unknown
}
void Ebml_EndSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc) {

41
media/libmkv/cleanup.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git a/media/libmkv/EbmlBufferWriter.c b/media/libmkv/EbmlBufferWriter.c
index 8c26e80..5925504 100644
--- a/media/libmkv/EbmlBufferWriter.c
+++ b/media/libmkv/EbmlBufferWriter.c
@@ -14,21 +14,21 @@ Ebml_Serialize(EbmlGlobal *glob, const void *buffer_in, int buffer_size, unsigne
/* buffer_size:
* 1 - int8_t;
* 2 - int16_t;
- * 3 - int32_t;
- * 4 - int64_t;
+ * 4 - int32_t;
+ * 8 - int64_t;
*/
long i;
for(i = len-1; i >= 0; i--) {
unsigned char x;
if (buffer_size == 1) {
x = (char)(*(const int8_t *)buffer_in >> (i * 8));
- } else if (buffer_size == 2) {
+ } else if (buffer_size == 2) {
x = (char)(*(const int16_t *)buffer_in >> (i * 8));
- } else if (buffer_size == 4) {
+ } else if (buffer_size == 4) {
x = (char)(*(const int32_t *)buffer_in >> (i * 8));
- } else if (buffer_size == 8) {
+ } else if (buffer_size == 8) {
x = (char)(*(const int64_t *)buffer_in >> (i * 8));
- }
+ }
Ebml_Write(glob, &x, 1);
}
}
@@ -65,7 +65,7 @@ void Ebml_StartSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc, unsigned long clas
Ebml_WriteID(glob, class_id);
ebmlLoc->offset = glob->offset;
// todo this is always taking 8 bytes, this may need later optimization
- Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says lenght unknown
+ Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says length unknown
}
void Ebml_EndSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc) {

1
media/libmkv/update.sh
View File

@ -36,3 +36,4 @@ patch -p1 < gecko_fix.patch
patch -p1 < const_fix.patch
patch -p3 < bock_fix.patch
patch -p3 < bug970774.patch
patch -p3 < cleanup.patch