| Message ID | 20180223100017.27784-1-serhii.marchuk@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6d763ab58811e856517926353ee2920369cf20b4 |
| Headers | show |
On 2/23/18 3:30 PM, Serhii Marchuk wrote: > --- > libavformat/dashenc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c > index 0f6f4f22fa..28ff288fca 100644 > --- a/libavformat/dashenc.c > +++ b/libavformat/dashenc.c > @@ -105,6 +105,7 @@ typedef struct DASHContext { > const char *init_seg_name; > const char *media_seg_name; > const char *utc_timing_url; > + const char *method; > const char *user_agent; > int hls_playlist; > int http_persistent; > @@ -256,6 +257,8 @@ static int flush_dynbuf(OutputStream *os, int *range_length) > > static void set_http_options(AVDictionary **options, DASHContext *c) > { > + if (c->method) > + av_dict_set(options, "method", c->method, 0); > if (c->user_agent) > av_dict_set(options, "user_agent", c->user_agent, 0); > if (c->http_persistent) > @@ -1376,6 +1379,7 @@ static const AVOption options[] = { > { "init_seg_name", "DASH-templated name to used for the initialization segment", OFFSET(init_seg_name), AV_OPT_TYPE_STRING, {.str = "init-stream$RepresentationID$.m4s"}, 0, 0, E }, > { "media_seg_name", "DASH-templated name to used for the media segments", OFFSET(media_seg_name), AV_OPT_TYPE_STRING, {.str = "chunk-stream$RepresentationID$-$Number%05d$.m4s"}, 0, 0, E }, > { "utc_timing_url", "URL of the page that will return the UTC timestamp in ISO format", OFFSET(utc_timing_url), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, > + { "method", "set the HTTP method", OFFSET(method), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, > { "http_user_agent", "override User-Agent field in HTTP header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, > { "http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, > { "hls_playlist", "Generate HLS playlist files(master.m3u8, media_%d.m3u8)", OFFSET(hls_playlist), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, Thanks for sending the patch. The patch looks fine. But, please change the commit message’s prefix from “DASH muxer” to “avformat/dashenc”, in order to maintain the uniformity with other commit messages. Regards, Karthick
On 2/26/18 2:16 PM, Serhii Marchuk wrote: > Please have a look at the attached patch. Pushed. Thanks, Karthick > > 2018-02-24 7:31 GMT+02:00 Jeyapal, Karthick <kjeyapal@akamai.com>: > >> >> >> On 2/23/18 3:30 PM, Serhii Marchuk wrote: >>> --- >>> libavformat/dashenc.c | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c >>> index 0f6f4f22fa..28ff288fca 100644 >>> --- a/libavformat/dashenc.c >>> +++ b/libavformat/dashenc.c >>> @@ -105,6 +105,7 @@ typedef struct DASHContext { >>> const char *init_seg_name; >>> const char *media_seg_name; >>> const char *utc_timing_url; >>> + const char *method; >>> const char *user_agent; >>> int hls_playlist; >>> int http_persistent; >>> @@ -256,6 +257,8 @@ static int flush_dynbuf(OutputStream *os, int >> *range_length) >>> >>> static void set_http_options(AVDictionary **options, DASHContext *c) >>> { >>> + if (c->method) >>> + av_dict_set(options, "method", c->method, 0); >>> if (c->user_agent) >>> av_dict_set(options, "user_agent", c->user_agent, 0); >>> if (c->http_persistent) >>> @@ -1376,6 +1379,7 @@ static const AVOption options[] = { >>> { "init_seg_name", "DASH-templated name to used for the >> initialization segment", OFFSET(init_seg_name), AV_OPT_TYPE_STRING, {.str = >> "init-stream$RepresentationID$.m4s"}, 0, 0, E }, >>> { "media_seg_name", "DASH-templated name to used for the media >> segments", OFFSET(media_seg_name), AV_OPT_TYPE_STRING, {.str = >> "chunk-stream$RepresentationID$-$Number%05d$.m4s"}, 0, 0, E }, >>> { "utc_timing_url", "URL of the page that will return the UTC >> timestamp in ISO format", OFFSET(utc_timing_url), AV_OPT_TYPE_STRING, { 0 >> }, 0, 0, E }, >>> + { "method", "set the HTTP method", OFFSET(method), >> AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, >>> { "http_user_agent", "override User-Agent field in HTTP header", >> OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, >>> { "http_persistent", "Use persistent HTTP connections", >> OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, >>> { "hls_playlist", "Generate HLS playlist files(master.m3u8, >> media_%d.m3u8)", OFFSET(hls_playlist), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, >> 1, E }, >> >> Thanks for sending the patch. The patch looks fine. >> But, please change the commit message’s prefix from “DASH muxer” to >> “avformat/dashenc”, in order to maintain the uniformity with other commit >> messages. >> >> Regards, >> Karthick >> >> >> >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 0f6f4f22fa..28ff288fca 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -105,6 +105,7 @@ typedef struct DASHContext { const char *init_seg_name; const char *media_seg_name; const char *utc_timing_url; + const char *method; const char *user_agent; int hls_playlist; int http_persistent; @@ -256,6 +257,8 @@ static int flush_dynbuf(OutputStream *os, int *range_length) static void set_http_options(AVDictionary **options, DASHContext *c) { + if (c->method) + av_dict_set(options, "method", c->method, 0); if (c->user_agent) av_dict_set(options, "user_agent", c->user_agent, 0); if (c->http_persistent) @@ -1376,6 +1379,7 @@ static const AVOption options[] = { { "init_seg_name", "DASH-templated name to used for the initialization segment", OFFSET(init_seg_name), AV_OPT_TYPE_STRING, {.str = "init-stream$RepresentationID$.m4s"}, 0, 0, E }, { "media_seg_name", "DASH-templated name to used for the media segments", OFFSET(media_seg_name), AV_OPT_TYPE_STRING, {.str = "chunk-stream$RepresentationID$-$Number%05d$.m4s"}, 0, 0, E }, { "utc_timing_url", "URL of the page that will return the UTC timestamp in ISO format", OFFSET(utc_timing_url), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, + { "method", "set the HTTP method", OFFSET(method), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, { "http_user_agent", "override User-Agent field in HTTP header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, { "http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, { "hls_playlist", "Generate HLS playlist files(master.m3u8, media_%d.m3u8)", OFFSET(hls_playlist), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },