Skip to content

Commit

Permalink
Merge pull request #2791 from gpac/buildbot-comment-clarifications
Browse files Browse the repository at this point in the history
Refactor comments and improve display consistency
  • Loading branch information
jeanlf committed Apr 8, 2024
2 parents 61146d5 + bdbf491 commit 16519df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/isomedia/isom_read.c
Expand Up @@ -3093,7 +3093,7 @@ GF_Err gf_isom_refresh_fragmented(GF_ISOFile *movie, u64 *MissingBytes, const ch
for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(movie->moov->trackList, i);
if (trak->Media->information->dataHandler == previous_movie_fileMap_address) {
//reaasign for later destruction
//reassign for later destruction
trak->Media->information->scalableDataHandler = movie->movieFileMap;
//reassign for Media_GetSample function
trak->Media->information->dataHandler = movie->movieFileMap;
Expand Down
6 changes: 3 additions & 3 deletions src/media_tools/route_dmx.c
Expand Up @@ -1002,7 +1002,7 @@ static GF_Err gf_route_service_gather_object(GF_ROUTEDmx *routedmx, GF_ROUTEServ
obj->frags[start_frag].size = end - obj->frags[start_frag].offset;

if(end_frag == start_frag + 1) {
// received extends fragment of index start_frag
// received data extends fragment of index start_frag
if(obj->frags[start_frag].size < old_size + size) {
GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("[ROUTE] Service %d Overlapping or already received LCT fragment [%u, %u]\n", s->service_id, start_offset, start_offset+size-1));
}
Expand Down Expand Up @@ -1047,7 +1047,7 @@ static GF_Err gf_route_service_gather_object(GF_ROUTEDmx *routedmx, GF_ROUTEServ
gf_assert(obj->alloc_size >= start_offset + size);

memcpy(obj->payload + start_offset, data, size);
GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u append LCT fragment, offset %d total size %d recv bytes %d - offset diff since last %d\n", s->service_id, obj->tsi, obj->toi, start_offset, obj->total_length, obj->nb_bytes, (s32) start_offset - (s32) obj->prev_start_offset));
GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u append LCT fragment, offset %u total size %u recv bytes %u - offset diff since last %ld\n", s->service_id, obj->tsi, obj->toi, start_offset, obj->total_length, obj->nb_bytes, (s32) start_offset - (s32) obj->prev_start_offset));

obj->prev_start_offset = start_offset;
gf_assert(obj->toi == toi);
Expand All @@ -1057,7 +1057,7 @@ static GF_Err gf_route_service_gather_object(GF_ROUTEDmx *routedmx, GF_ROUTEServ
if (do_push && !obj->rlct_file && obj->rlct) {
gf_route_dmx_push_object(routedmx, s, obj, GF_FALSE, GF_TRUE, GF_FALSE, obj->frags[0].size);
} else {
GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u: %d bytes inserted on non-first fragment (%d totals), cannot push\n", s->service_id, obj->tsi, obj->toi, size, obj->nb_frags));
GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("[ROUTE] Service %d TSI %u TOI %u: %u bytes inserted on non-first fragment (%u totals), cannot push\n", s->service_id, obj->tsi, obj->toi, size, obj->nb_frags));
}

check_done:
Expand Down

0 comments on commit 16519df

Please sign in to comment.