Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'

Browse Source 
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/76/merge
Michael Niedermayer 11 years ago
parent d538dd824e 6bc4934b75
commit 0d35d5ab1b
1 changed files with 19 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      tools/ismindex.c

25
tools/ismindex.c
Unescape View File

@ -25,6 +25,10 @@
* This step creates foo.ism and foo.ismc that is required by IIS for * This step creates foo.ism and foo.ismc that is required by IIS for
* serving it. * 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 * 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: * any extra server support, create the ismv file as above, and split it:
* ismindex -split foo.ismv * ismindex -split foo.ismv
@ -44,7 +48,8 @@
static int usage(const char *argv0, int ret) 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; return ret;
} }
@ -384,7 +389,8 @@ fail:
} }
static void output_server_manifest(struct Tracks *tracks, 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]; char filename[1000];
FILE *out; 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, "<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\">\n");
fprintf(out, "\t<head>\n"); fprintf(out, "\t<head>\n");
fprintf(out, "\t\t<meta name=\"clientManifestRelativePath\" " 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</head>\n");
fprintf(out, "\t<body>\n"); fprintf(out, "\t<body>\n");
fprintf(out, "\t\t<switch>\n"); fprintf(out, "\t\t<switch>\n");
for (i = 0; i < tracks->nb_tracks; i++) { for (i = 0; i < tracks->nb_tracks; i++) {
struct Track *track = tracks->tracks[i]; struct Track *track = tracks->tracks[i];
const char *type = track->is_video ? "video" : "audio"; const char *type = track->is_video ? "video" : "audio";
fprintf(out, "\t\t\t<%s src=\"%s\" systemBitrate=\"%d\">\n", fprintf(out, "\t\t\t<%s src=\"%s%s\" systemBitrate=\"%d\">\n",
type, track->name, track->bitrate); type, path_prefix, track->name, track->bitrate);
fprintf(out, "\t\t\t\t<param name=\"trackID\" value=\"%d\" " fprintf(out, "\t\t\t\t<param name=\"trackID\" value=\"%d\" "
"valueType=\"data\" />\n", track->track_id); "valueType=\"data\" />\n", track->track_id);
fprintf(out, "\t\t\t</%s>\n", type); 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) int main(int argc, char **argv)
{ {
const char *basename = NULL; const char *basename = NULL;
const char *path_prefix = "", *ismc_prefix = "";
int split = 0, i; int split = 0, i;
struct Tracks tracks = { 0, .video_track = -1, .audio_track = -1 }; 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")) { if (!strcmp(argv[i], "-n")) {
basename = argv[i + 1]; basename = argv[i + 1];
i++; 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")) { } else if (!strcmp(argv[i], "-split")) {
split = 1; split = 1;
} else if (argv[i][0] == '-') { } else if (argv[i][0] == '-') {
@ -556,7 +569,7 @@ int main(int argc, char **argv)
return usage(argv[0], 1); return usage(argv[0], 1);
if (!split) if (!split)
output_server_manifest(&tracks, basename); output_server_manifest(&tracks, basename, path_prefix, ismc_prefix);
output_client_manifest(&tracks, basename, split); output_client_manifest(&tracks, basename, split);
clean_tracks(&tracks); clean_tracks(&tracks);

Write Preview
Loading…
Cancel
Save