highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2

Browse Source 
* commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35':
  qt-faststart: Add a note about the -movflags +faststart feature
  qt-faststart: Avoid unintentionally sign extending BE_32
  qt-faststart: Check offset_count before reading from the moov_atom buffer
  qt-faststart: Check the ftello() return codes
  qt-faststart: Fix the signedness of variables keeping the ftello return values
  qt-faststart: Check fseeko() return codes
  qt-faststart: Simplify code by using a MIN() macro
  qt-faststart: Increase the copy buffer size to 64 KB

Conflicts:
	tools/qt-faststart.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-03 22:39:08 +01:00
parent c4149c4d54 a6a2d8eb8f
commit 7ff4cd2acc
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tools/qt-faststart.c
View File

@@ -37,11 +37,11 @@
#define ftello(x) _ftelli64(x) #define ftello(x) _ftelli64(x)
#endif #endif
#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) #define MIN(a,b) ((a) > (b) ? (b) : (a))
#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ #define BE_32(x) (((uint32_t)(((uint8_t*)(x))[0]) << 24) | \
(((uint8_t*)(x))[1] << 16) | \ (((uint8_t*)(x))[1] << 16) | \
(((uint8_t*)(x))[2] << 8) | \ (((uint8_t*)(x))[2] << 8) | \
((uint8_t*)(x))[3]) ((uint8_t*)(x))[3])
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
uint32_t atom_type = 0; uint32_t atom_type = 0;
uint64_t atom_size = 0; uint64_t atom_size = 0;
uint64_t atom_offset = 0; uint64_t atom_offset = 0;
uint64_t last_offset; int64_t last_offset;
unsigned char *moov_atom = NULL; unsigned char *moov_atom = NULL;
unsigned char *ftyp_atom = NULL; unsigned char *ftyp_atom = NULL;
uint64_t moov_atom_size; uint64_t moov_atom_size;
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
if (fread(atom_bytes, ATOM_PREAMBLE_SIZE, 1, infile) != 1) { if (fread(atom_bytes, ATOM_PREAMBLE_SIZE, 1, infile) != 1) {
break; break;
} }
atom_size = (uint32_t) BE_32(&atom_bytes[0]); atom_size = BE_32(&atom_bytes[0]);
atom_type = BE_32(&atom_bytes[4]); atom_type = BE_32(&atom_bytes[4]);
/* keep ftyp atom */ /* keep ftyp atom */
@@ -137,9 +137,9 @@ int main(int argc, char *argv[])
atom_size); atom_size);
goto error_out; goto error_out;
} }
if ( fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR) if (fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR) ||
|| fread(ftyp_atom, atom_size, 1, infile) != 1 fread(ftyp_atom, atom_size, 1, infile) != 1 ||
|| (start_offset = ftello(infile))<0) { (start_offset = ftello(infile)) < 0) {
perror(argv[1]); perror(argv[1]);
goto error_out; goto error_out;
} }
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
} else { } else {
ret = fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR); ret = fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR);
} }
if(ret) { if (ret) {
perror(argv[1]); perror(argv[1]);
goto error_out; goto error_out;
} }
@@ -203,6 +203,10 @@ int main(int argc, char *argv[])
goto error_out; goto error_out;
} }
last_offset = ftello(infile); last_offset = ftello(infile);
if (last_offset < 0) {
perror(argv[1]);
goto error_out;
}
moov_atom_size = atom_size; moov_atom_size = atom_size;
moov_atom = malloc(moov_atom_size); moov_atom = malloc(moov_atom_size);
if (!moov_atom) { if (!moov_atom) {
@@ -230,18 +234,18 @@ int main(int argc, char *argv[])
atom_type = BE_32(&moov_atom[i]); atom_type = BE_32(&moov_atom[i]);
if (atom_type == STCO_ATOM) { if (atom_type == STCO_ATOM) {
printf(" patching stco atom...\n"); printf(" patching stco atom...\n");
atom_size = (uint32_t)BE_32(&moov_atom[i - 4]); atom_size = BE_32(&moov_atom[i - 4]);
if (i + atom_size - 4 > moov_atom_size) { if (i + atom_size - 4 > moov_atom_size) {
printf(" bad atom size\n"); printf(" bad atom size\n");
goto error_out; goto error_out;
} }
offset_count = BE_32(&moov_atom[i + 8]); offset_count = BE_32(&moov_atom[i + 8]);
if (i + 12LL + offset_count * 4LL > moov_atom_size) { if (i + 12 + offset_count * UINT64_C(4) > moov_atom_size) {
printf(" bad atom size\n"); printf(" bad atom size/element count\n");
goto error_out; goto error_out;
} }
for (j = 0; j < offset_count; j++) { for (j = 0; j < offset_count; j++) {
current_offset = (uint32_t)BE_32(&moov_atom[i + 12 + j * 4]); current_offset = BE_32(&moov_atom[i + 12 + j * 4]);
current_offset += moov_atom_size; current_offset += moov_atom_size;
moov_atom[i + 12 + j * 4 + 0] = (current_offset >> 24) & 0xFF; moov_atom[i + 12 + j * 4 + 0] = (current_offset >> 24) & 0xFF;
moov_atom[i + 12 + j * 4 + 1] = (current_offset >> 16) & 0xFF; moov_atom[i + 12 + j * 4 + 1] = (current_offset >> 16) & 0xFF;
@@ -251,14 +255,14 @@ int main(int argc, char *argv[])
i += atom_size - 4; i += atom_size - 4;
} else if (atom_type == CO64_ATOM) { } else if (atom_type == CO64_ATOM) {
printf(" patching co64 atom...\n"); printf(" patching co64 atom...\n");
atom_size = (uint32_t)BE_32(&moov_atom[i - 4]); atom_size = BE_32(&moov_atom[i - 4]);
if (i + atom_size - 4 > moov_atom_size) { if (i + atom_size - 4 > moov_atom_size) {
printf(" bad atom size\n"); printf(" bad atom size\n");
goto error_out; goto error_out;
} }
offset_count = BE_32(&moov_atom[i + 8]); offset_count = BE_32(&moov_atom[i + 8]);
if (i + 12LL + offset_count * 8LL > moov_atom_size) { if (i + 12 + offset_count * UINT64_C(8) > moov_atom_size) {
printf(" bad atom size\n"); printf(" bad atom size/element count\n");
goto error_out; goto error_out;
} }
for (j = 0; j < offset_count; j++) { for (j = 0; j < offset_count; j++) {
@@ -316,7 +320,7 @@ int main(int argc, char *argv[])
} }
/* copy the remainder of the infile, from offset 0 -> last_offset - 1 */ /* copy the remainder of the infile, from offset 0 -> last_offset - 1 */
bytes_to_copy = FFMIN(COPY_BUFFER_SIZE, last_offset); bytes_to_copy = MIN(COPY_BUFFER_SIZE, last_offset);
copy_buffer = malloc(bytes_to_copy); copy_buffer = malloc(bytes_to_copy);
if (!copy_buffer) { if (!copy_buffer) {
printf("could not allocate %d bytes for copy_buffer\n", bytes_to_copy); printf("could not allocate %d bytes for copy_buffer\n", bytes_to_copy);
@@ -324,7 +328,7 @@ int main(int argc, char *argv[])
} }
printf(" copying rest of file...\n"); printf(" copying rest of file...\n");
while (last_offset) { while (last_offset) {
bytes_to_copy = FFMIN(bytes_to_copy, last_offset); bytes_to_copy = MIN(bytes_to_copy, last_offset);
if (fread(copy_buffer, bytes_to_copy, 1, infile) != 1) { if (fread(copy_buffer, bytes_to_copy, 1, infile) != 1) {
perror(argv[1]); perror(argv[1]);