diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 20:37:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 20:37:06 +0200 |
| commit | 0d35d5ab1b73a91a3ccb20bf6a7415f6845905ad (patch) | |
| tree | 81f0e4d80c900b2706aa7ef6e72b73bf4df38b68 | |
| parent | d538dd824ee7abf9f3bb6459485f3e804fcc4777 (diff) | |
| parent | 6bc4934b75dde9354ee16a6e700ebe6775abf69e (diff) | |
| download | ffmpeg-0d35d5ab1b73a91a3ccb20bf6a7415f6845905ad.tar.gz | |
Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
ismindex: Allow adding a path prefix to the generated .ism file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tools/ismindex.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c index 759bc0f5a4..64dc268d54 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -25,6 +25,10 @@ * This step creates foo.ism and foo.ismc that is required by IIS for * serving it. * + * By adding -path-prefix path/, the produced foo.ism will refer to the + * files foo.ismv as "path/foo.ismv" - the prefix for the generated ismc + * file can be set with the -ismc-prefix option similarly. + * * To pre-split files for serving as static files by a web server without * any extra server support, create the ismv file as above, and split it: * ismindex -split foo.ismv @@ -44,7 +48,8 @@ static int usage(const char *argv0, int ret) { - fprintf(stderr, "%s [-split] [-n basename] file1 [file2] ...\n", argv0); + fprintf(stderr, "%s [-split] [-n basename] [-path-prefix prefix] " + "[-ismc-prefix prefix] file1 [file2] ...\n", argv0); return ret; } @@ -384,7 +389,8 @@ fail: } static void output_server_manifest(struct Tracks *tracks, - const char *basename) + const char *basename, const char *path_prefix, + const char *ismc_prefix) { char filename[1000]; FILE *out; @@ -400,15 +406,15 @@ static void output_server_manifest(struct Tracks *tracks, fprintf(out, "<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\">\n"); fprintf(out, "\t<head>\n"); fprintf(out, "\t\t<meta name=\"clientManifestRelativePath\" " - "content=\"%s.ismc\" />\n", basename); + "content=\"%s%s.ismc\" />\n", ismc_prefix, basename); fprintf(out, "\t</head>\n"); fprintf(out, "\t<body>\n"); fprintf(out, "\t\t<switch>\n"); for (i = 0; i < tracks->nb_tracks; i++) { struct Track *track = tracks->tracks[i]; const char *type = track->is_video ? "video" : "audio"; - fprintf(out, "\t\t\t<%s src=\"%s\" systemBitrate=\"%d\">\n", - type, track->name, track->bitrate); + fprintf(out, "\t\t\t<%s src=\"%s%s\" systemBitrate=\"%d\">\n", + type, path_prefix, track->name, track->bitrate); fprintf(out, "\t\t\t\t<param name=\"trackID\" value=\"%d\" " "valueType=\"data\" />\n", track->track_id); fprintf(out, "\t\t\t</%s>\n", type); @@ -534,6 +540,7 @@ static void clean_tracks(struct Tracks *tracks) int main(int argc, char **argv) { const char *basename = NULL; + const char *path_prefix = "", *ismc_prefix = ""; int split = 0, i; struct Tracks tracks = { 0, .video_track = -1, .audio_track = -1 }; @@ -543,6 +550,12 @@ int main(int argc, char **argv) if (!strcmp(argv[i], "-n")) { basename = argv[i + 1]; i++; + } else if (!strcmp(argv[i], "-path-prefix")) { + path_prefix = argv[i + 1]; + i++; + } else if (!strcmp(argv[i], "-ismc-prefix")) { + ismc_prefix = argv[i + 1]; + i++; } else if (!strcmp(argv[i], "-split")) { split = 1; } else if (argv[i][0] == '-') { @@ -556,7 +569,7 @@ int main(int argc, char **argv) return usage(argv[0], 1); if (!split) - output_server_manifest(&tracks, basename); + output_server_manifest(&tracks, basename, path_prefix, ismc_prefix); output_client_manifest(&tracks, basename, split); clean_tracks(&tracks); |