RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '7c147900b86c0f1cf030b7b844c670649c80c191' 

* commit '7c147900b86c0f1cf030b7b844c670649c80c191':
  ismindex: Factorize code for printing chunk duration lists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-14 11:58:11 +01:00
parent 33ecf7ab59 7c147900b8
commit 360d71707f
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/ismindex.c
View File

@ -410,6 +410,23 @@ static void output_server_manifest(struct Tracks *tracks,
fclose(out);
}
static void print_track_chunks(FILE *out, struct Tracks *tracks, int main,
const char *type)
{
int i, j;
struct Track *track = tracks->tracks[main];
for (i = 0; i < track->chunks; i++) {
for (j = main + 1; j < tracks->nb_tracks; j++) {
if (tracks->tracks[j]->is_audio == track->is_audio &&
track->offsets[i].duration != tracks->tracks[j]->offsets[i].duration)
fprintf(stderr, "Mismatched duration of %s chunk %d in %s and %s\n",
type, i, track->name, tracks->tracks[j]->name);
}
fprintf(out, "\t\t<c n=\"%d\" d=\"%d\" />\n",
i, track->offsets[i].duration);
}
}
static void output_client_manifest(struct Tracks *tracks,
const char *basename, int split)
{
@ -455,17 +472,7 @@ static void output_client_manifest(struct Tracks *tracks,
fprintf(stderr, "Mismatched number of video chunks in %s and %s\n",
track->name, first_track->name);
}
track = first_track;
for (i = 0; i < track->chunks; i++) {
for (j = tracks->video_track + 1; j < tracks->nb_tracks; j++) {
if (tracks->tracks[j]->is_video &&
track->offsets[i].duration != tracks->tracks[j]->offsets[i].duration)
fprintf(stderr, "Mismatched duration of video chunk %d in %s and %s\n",
i, track->name, tracks->tracks[j]->name);
}
fprintf(out, "\t\t<c n=\"%d\" d=\"%d\" />\n", i,
track->offsets[i].duration);
}
print_track_chunks(out, tracks, tracks->video_track, "video");
fprintf(out, "\t</StreamIndex>\n");
}
if (tracks->audio_track >= 0) {
@ -496,17 +503,7 @@ static void output_client_manifest(struct Tracks *tracks,
fprintf(stderr, "Mismatched number of audio chunks in %s and %s\n",
track->name, first_track->name);
}
track = first_track;
for (i = 0; i < track->chunks; i++) {
for (j = tracks->audio_track + 1; j < tracks->nb_tracks; j++) {
if (tracks->tracks[j]->is_audio &&
track->offsets[i].duration != tracks->tracks[j]->offsets[i].duration)
fprintf(stderr, "Mismatched duration of audio chunk %d in %s and %s\n",
i, track->name, tracks->tracks[j]->name);
}
fprintf(out, "\t\t<c n=\"%d\" d=\"%d\" />\n",
i, track->offsets[i].duration);
}
print_track_chunks(out, tracks, tracks->audio_track, "audio");
fprintf(out, "\t</StreamIndex>\n");
}
fprintf(out, "</SmoothStreamingMedia>\n");