comparison mov.c @ 3167:125b08d2ad59 libavformat

cosmetics, split or move too long lines
author bcoudurier
date Fri, 21 Mar 2008 11:16:16 +0000
parents c082ee7573b2
children 8ae50c221ae6
comparison
equal deleted inserted replaced
3166:c082ee7573b2 3167:125b08d2ad59
640 get_byte(pb); /* version */ 640 get_byte(pb); /* version */
641 get_be24(pb); /* flags */ 641 get_be24(pb); /* flags */
642 642
643 entries = get_be32(pb); 643 entries = get_be32(pb);
644 644
645 for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) { //Parsing Sample description table 645 for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) {
646 //Parsing Sample description table
646 enum CodecID id; 647 enum CodecID id;
647 int dref_id; 648 int dref_id;
648 MOV_atom_t a = { 0, 0, 0 }; 649 MOV_atom_t a = { 0, 0, 0 };
649 offset_t start_pos = url_ftell(pb); 650 offset_t start_pos = url_ftell(pb);
650 int size = get_be32(pb); /* size */ 651 int size = get_be32(pb); /* size */
1176 if (stts_index + 1 < sc->stts_count) 1177 if (stts_index + 1 < sc->stts_count)
1177 stts_index++; 1178 stts_index++;
1178 } 1179 }
1179 } 1180 }
1180 current_offset += sc->bytes_per_frame; 1181 current_offset += sc->bytes_per_frame;
1181 dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, " 1182 dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", "
1182 "duration %d\n", st->index, i, current_offset, current_dts, chunk_size, chunk_duration); 1183 "size %d, duration %d\n", st->index, i, current_offset, current_dts,
1184 chunk_size, chunk_duration);
1183 assert(chunk_duration % sc->time_rate == 0); 1185 assert(chunk_duration % sc->time_rate == 0);
1184 current_dts += chunk_duration / sc->time_rate; 1186 current_dts += chunk_duration / sc->time_rate;
1185 } 1187 }
1186 } 1188 }
1187 } 1189 }
1336 get_be32(pb); /* modification time */ 1338 get_be32(pb); /* modification time */
1337 } 1339 }
1338 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/ 1340 st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/
1339 get_be32(pb); /* reserved */ 1341 get_be32(pb); /* reserved */
1340 st->start_time = 0; /* check */ 1342 st->start_time = 0; /* check */
1341 (version == 1) ? get_be64(pb) : get_be32(pb); /* highlevel (considering edits) duration in movie timebase */ 1343 /* highlevel (considering edits) duration in movie timebase */
1344 (version == 1) ? get_be64(pb) : get_be32(pb);
1342 get_be32(pb); /* reserved */ 1345 get_be32(pb); /* reserved */
1343 get_be32(pb); /* reserved */ 1346 get_be32(pb); /* reserved */
1344 1347
1345 get_be16(pb); /* layer */ 1348 get_be16(pb); /* layer */
1346 get_be16(pb); /* alternate group */ 1349 get_be16(pb); /* alternate group */
1543 ByteIOContext *pb = s->pb; 1546 ByteIOContext *pb = s->pb;
1544 int err; 1547 int err;
1545 MOV_atom_t atom = { 0, 0, 0 }; 1548 MOV_atom_t atom = { 0, 0, 0 };
1546 1549
1547 mov->fc = s; 1550 mov->fc = s;
1548 1551 /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
1549 if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ 1552 if(!url_is_streamed(pb))
1550 atom.size = url_fsize(pb); 1553 atom.size = url_fsize(pb);
1551 else 1554 else
1552 atom.size = INT64_MAX; 1555 atom.size = INT64_MAX;
1553 1556
1554 /* check MOV header */ 1557 /* check MOV header */