On November 24, 2015 at 6:06:36 PM, Michael Niedermayer (michae...@gmx.at)
wrote:
On Tue, Nov 24, 2015 at 03:01:28PM -0500, Alex Agranovsky wrote:
[...]
> From 2c253d7978a6c9c2dc701d393eb5b9d68e831c98 Mon Sep 17 00:00:00 2001
> From: Alex Agranovsky <a...@sighthound.com>
> Date: Tue, 24 Nov 2015 00:07:34 -0500
> Subject: [PATCH 2/2] If available, use the actual boundary in HTTP response's
> Content-Type header, to separate MIME parts in mpjpeg stream
>
> This code is disabled by default so not to break some fragile endpoints
> sending invalid MIME, but can be enabled via AVOption 'strict_mime_boundary'
>
> Signed-off-by: Alex Agranovsky <a...@sighthound.com>
> ---
> libavformat/mpjpegdec.c | 75
> +++++++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 72 insertions(+), 3 deletions(-)
>
> diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
> index b9093ea..b89f128 100644
> --- a/libavformat/mpjpegdec.c
> +++ b/libavformat/mpjpegdec.c
> @@ -20,6 +20,7 @@
> */
>
> #include "libavutil/avstring.h"
> +#include "libavutil/opt.h"
>
> #include "avformat.h"
> #include "internal.h"
> @@ -28,9 +29,11 @@
>
>
> typedef struct MPJPEGDemuxContext {
> + const AVClass *class;
> char* boundary;
> char* searchstr;
> int searchstr_len;
> + int strict_mime_boundary;
> } MPJPEGDemuxContext;
>
>
> @@ -245,6 +248,43 @@ static int parse_multipart_header(AVIOContext *pb,
> }
>
>
> +static char* mpjpeg_get_boundary(AVIOContext* pb)
> +{
> + uint8_t *mime_type = NULL;
> + uint8_t *start;
> + uint8_t *end;
> + uint8_t *res = NULL;
> + int len;
> +
> + /* get MIME type, and skip to the first parameter */
> + av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type);
> + start = mime_type;
> + while (start != NULL && *start != '\0') {
> + start = strchr(start, ';');
> + if (start)
> + start = start+1;
> +
> + while (av_isspace(*start))
> + start++;
> +
> + if (!av_strncasecmp(start, "boundary=", 9)) {
> + start += 9;
> +
> + end = strchr(start, ';');
> + if (end)
> + len = end - start - 1;
> + else
> + len = strlen(start);
> + res = av_strndup(start, len);
> + break;
> + }
> + }
> +
> + av_freep(&mime_type);
> + return res;
> +}
> +
> +
> static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
> {
> int size;
> @@ -252,8 +292,18 @@ static int mpjpeg_read_packet(AVFormatContext *s,
> AVPacket *pkt)
>
> MPJPEGDemuxContext *mpjpeg = s->priv_data;
> if (mpjpeg->boundary == NULL) {
> - mpjpeg->boundary = av_strdup("--");
> - mpjpeg->searchstr = av_strdup("\r\n--");
> + uint8_t* boundary = NULL;
> + if (mpjpeg->strict_mime_boundary) {
> + boundary = mpjpeg_get_boundary(s->pb);
> + }
> + if (boundary != NULL) {
> + mpjpeg->boundary = boundary;
> + mpjpeg->searchstr = av_malloc(4+strlen(boundary)+1);
> + sprintf( mpjpeg->searchstr, "\r\n%s\r\n", boundary );
please use snprintf()
> + } else {
> + mpjpeg->boundary = av_strdup("--");
> + mpjpeg->searchstr = av_strdup("\r\n--");
> + }
> mpjpeg->searchstr_len = strlen(mpjpeg->searchstr);
> if (!mpjpeg->boundary || !mpjpeg->searchstr) {
> av_freep(&mpjpeg->boundary);
> @@ -315,6 +365,22 @@ static int mpjpeg_read_packet(AVFormatContext *s,
> AVPacket *pkt)
> return ret;
> }
>
> +#define OFFSET(x) offsetof(MPJPEGDemuxContext, x)
> +
> +#define DEC AV_OPT_FLAG_DECODING_PARAM
> +const AVOption mpjpeg_options[] = {
> + { "strict_mime_boundary", "require MIME boundaries match",
> OFFSET(strict_mime_boundary), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC },
> + { NULL }
> +};
> +
> +
> +static const AVClass ff_mpjpeg_demuxer_class = {
there should be no ff_ as its static
> + .class_name = "MPJPEG demuxer",
> + .item_name = av_default_item_name,
> + .option = mpjpeg_options,
> + .version = LIBAVUTIL_VERSION_INT,
> +};
> +
> AVInputFormat ff_mpjpeg_demuxer = {
> .name = "mpjpeg",
> .long_name = NULL_IF_CONFIG_SMALL("MIME multipart JPEG"),
> @@ -324,5 +390,8 @@ AVInputFormat ff_mpjpeg_demuxer = {
> .read_probe = mpjpeg_read_probe,
> .read_header = mpjpeg_read_header,
> .read_packet = mpjpeg_read_packet,
> - .read_close = mpjpeg_read_close
> + .read_close = mpjpeg_read_close,
> + .priv_class = &ff_mpjpeg_demuxer_class
> };
> +
> +
> --
> 2.4.9 (Apple Git-60)
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Please find the patches attached. First one is unchanged from the previous
submission, second one addresses your comments.
From 4797590e11267993c3883e5037619625e1f1dadf Mon Sep 17 00:00:00 2001
From: Alex Agranovsky <a...@sighthound.com>
Date: Tue, 24 Nov 2015 00:07:34 -0500
Subject: [PATCH 2/2] If available, use the actual boundary in HTTP response's
Content-Type header, to separate MIME parts in mpjpeg stream
This code is disabled by default so not to regress endpoints sending invalid
MIME, but can be enabled via AVOption 'strict_mime_boundary'
Signed-off-by: Alex Agranovsky <a...@sighthound.com>
---
libavformat/mpjpegdec.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 73 insertions(+), 3 deletions(-)
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index b9093ea..c0f011d 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -20,6 +20,7 @@
*/
#include "libavutil/avstring.h"
+#include "libavutil/opt.h"
#include "avformat.h"
#include "internal.h"
@@ -28,9 +29,11 @@
typedef struct MPJPEGDemuxContext {
+ const AVClass *class;
char* boundary;
char* searchstr;
int searchstr_len;
+ int strict_mime_boundary;
} MPJPEGDemuxContext;
@@ -245,6 +248,43 @@ static int parse_multipart_header(AVIOContext *pb,
}
+static char* mpjpeg_get_boundary(AVIOContext* pb)
+{
+ uint8_t *mime_type = NULL;
+ uint8_t *start;
+ uint8_t *end;
+ uint8_t *res = NULL;
+ int len;
+
+ /* get MIME type, and skip to the first parameter */
+ av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type);
+ start = mime_type;
+ while (start != NULL && *start != '\0') {
+ start = strchr(start, ';');
+ if (start)
+ start = start+1;
+
+ while (av_isspace(*start))
+ start++;
+
+ if (!av_strncasecmp(start, "boundary=", 9)) {
+ start += 9;
+
+ end = strchr(start, ';');
+ if (end)
+ len = end - start - 1;
+ else
+ len = strlen(start);
+ res = av_strndup(start, len);
+ break;
+ }
+ }
+
+ av_freep(&mime_type);
+ return res;
+}
+
+
static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
{
int size;
@@ -252,8 +292,19 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket
*pkt)
MPJPEGDemuxContext *mpjpeg = s->priv_data;
if (mpjpeg->boundary == NULL) {
- mpjpeg->boundary = av_strdup("--");
- mpjpeg->searchstr = av_strdup("\r\n--");
+ uint8_t* boundary = NULL;
+ if (mpjpeg->strict_mime_boundary) {
+ boundary = mpjpeg_get_boundary(s->pb);
+ }
+ if (boundary != NULL) {
+ size_t bufsize = 4+strlen(boundary)+1;
+ mpjpeg->boundary = boundary;
+ mpjpeg->searchstr = av_malloc(bufsize);
+ snprintf( mpjpeg->searchstr, bufsize, "\r\n%s\r\n", boundary );
+ } else {
+ mpjpeg->boundary = av_strdup("--");
+ mpjpeg->searchstr = av_strdup("\r\n--");
+ }
mpjpeg->searchstr_len = strlen(mpjpeg->searchstr);
if (!mpjpeg->boundary || !mpjpeg->searchstr) {
av_freep(&mpjpeg->boundary);
@@ -315,6 +366,22 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket
*pkt)
return ret;
}
+#define OFFSET(x) offsetof(MPJPEGDemuxContext, x)
+
+#define DEC AV_OPT_FLAG_DECODING_PARAM
+const AVOption mpjpeg_options[] = {
+ { "strict_mime_boundary", "require MIME boundaries match",
OFFSET(strict_mime_boundary), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC },
+ { NULL }
+};
+
+
+static const AVClass mpjpeg_demuxer_class = {
+ .class_name = "MPJPEG demuxer",
+ .item_name = av_default_item_name,
+ .option = mpjpeg_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
AVInputFormat ff_mpjpeg_demuxer = {
.name = "mpjpeg",
.long_name = NULL_IF_CONFIG_SMALL("MIME multipart JPEG"),
@@ -324,5 +391,8 @@ AVInputFormat ff_mpjpeg_demuxer = {
.read_probe = mpjpeg_read_probe,
.read_header = mpjpeg_read_header,
.read_packet = mpjpeg_read_packet,
- .read_close = mpjpeg_read_close
+ .read_close = mpjpeg_read_close,
+ .priv_class = &mpjpeg_demuxer_class
};
+
+
--
2.4.9 (Apple Git-60)
From 70a6e1b0f3d47698bf49c3c766d5472646bff71a Mon Sep 17 00:00:00 2001
From: Alex Agranovsky <a...@sighthound.com>
Date: Tue, 24 Nov 2015 00:06:14 -0500
Subject: [PATCH 1/2] Allow mpjpeg demuxer to process MIME parts which do not
include Content-Length header.
Fixes ticket 5023
Signed-off-by: Alex Agranovsky <a...@sighthound.com>
---
libavformat/mpjpegdec.c | 164 +++++++++++++++++++++++++++++++++++++-----------
1 file changed, 126 insertions(+), 38 deletions(-)
diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index 2749a48..b9093ea 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -23,22 +23,15 @@
#include "avformat.h"
#include "internal.h"
+#include "avio_internal.h"
-static int get_line(AVIOContext *pb, char *line, int line_size)
-{
- int i = ff_get_line(pb, line, line_size);
- if (i > 1 && line[i - 2] == '\r')
- line[i - 2] = '\0';
-
- if (pb->error)
- return pb->error;
-
- if (pb->eof_reached)
- return AVERROR_EOF;
- return 0;
-}
+typedef struct MPJPEGDemuxContext {
+ char* boundary;
+ char* searchstr;
+ int searchstr_len;
+} MPJPEGDemuxContext;
static void trim_right(char* p)
@@ -47,12 +40,28 @@ static void trim_right(char* p)
if (!p || !*p)
return;
end = p + strlen(p) - 1;
- while (end != p && av_isspace(*end)) {
+ while (end >= p && av_isspace(*end)) {
*end = '\0';
end--;
}
}
+static int get_line(AVIOContext *pb, char *line, int line_size)
+{
+ ff_get_line(pb, line, line_size);
+
+ if (pb->error)
+ return pb->error;
+
+ if (pb->eof_reached)
+ return AVERROR_EOF;
+
+ trim_right(line);
+ return 0;
+}
+
+
+
static int split_tag_value(char **tag, char **value, char *line)
{
char *p = line;
@@ -86,12 +95,24 @@ static int split_tag_value(char **tag, char **value, char
*line)
return 0;
}
-static int parse_multipart_header(AVIOContext *pb, void *log_ctx);
+static int parse_multipart_header(AVIOContext *pb,
+ int* size,
+ const char* expected_boundary,
+ void *log_ctx);
+
+static int mpjpeg_read_close(AVFormatContext *s)
+{
+ MPJPEGDemuxContext *mpjpeg = s->priv_data;
+ av_freep(&mpjpeg->boundary);
+ av_freep(&mpjpeg->searchstr);
+ return 0;
+}
static int mpjpeg_read_probe(AVProbeData *p)
{
AVIOContext *pb;
int ret = 0;
+ int size = 0;
if (p->buf_size < 2 || p->buf[0] != '-' || p->buf[1] != '-')
return 0;
@@ -100,7 +121,7 @@ static int mpjpeg_read_probe(AVProbeData *p)
if (!pb)
return 0;
- ret = (parse_multipart_header(pb, NULL)>0)?AVPROBE_SCORE_MAX:0;
+ ret = (parse_multipart_header(pb, &size, "--", NULL) > 0) ?
AVPROBE_SCORE_MAX : 0;
av_free(pb);
@@ -110,14 +131,15 @@ static int mpjpeg_read_probe(AVProbeData *p)
static int mpjpeg_read_header(AVFormatContext *s)
{
AVStream *st;
- char boundary[70 + 2 + 1];
+ char boundary[70 + 2 + 1] = {0};
int64_t pos = avio_tell(s->pb);
int ret;
-
- ret = get_line(s->pb, boundary, sizeof(boundary));
- if (ret < 0)
- return ret;
+ do {
+ ret = get_line(s->pb, boundary, sizeof(boundary));
+ if (ret < 0)
+ return ret;
+ } while (!boundary[0]);
if (strncmp(boundary, "--", 2))
return AVERROR_INVALIDDATA;
@@ -147,11 +169,16 @@ static int parse_content_length(const char *value)
return val;
}
-static int parse_multipart_header(AVIOContext *pb, void *log_ctx)
+static int parse_multipart_header(AVIOContext *pb,
+ int* size,
+ const char* expected_boundary,
+ void *log_ctx)
{
char line[128];
int found_content_type = 0;
- int ret, size = -1;
+ int ret;
+
+ *size = -1;
// get the CRLF as empty string
ret = get_line(pb, line, sizeof(line));
@@ -161,14 +188,23 @@ static int parse_multipart_header(AVIOContext *pb, void
*log_ctx)
/* some implementation do not provide the required
* initial CRLF (see rfc1341 7.2.1)
*/
- if (!line[0]) {
+ while (!line[0]) {
ret = get_line(pb, line, sizeof(line));
if (ret < 0)
return ret;
}
- if (strncmp(line, "--", 2))
+ if (!av_strstart(line, expected_boundary, NULL)) {
+ if (log_ctx) {
+ av_log(log_ctx,
+ AV_LOG_ERROR,
+ "Expected boundary '%s' not found, instead found a line of %lu
bytes\n",
+ expected_boundary,
+ strlen(line));
+ }
+
return AVERROR_INVALIDDATA;
+ }
while (!pb->eof_reached) {
char *tag, *value;
@@ -201,32 +237,82 @@ static int parse_multipart_header(AVIOContext *pb, void
*log_ctx)
} else
found_content_type = 1;
} else if (!av_strcasecmp(tag, "Content-Length")) {
- size = parse_content_length(value);
- if (size < 0)
- return size;
+ *size = parse_content_length(value);
}
}
- if (!found_content_type || size < 0) {
- return AVERROR_INVALIDDATA;
- }
-
- return size;
+ return (found_content_type) ? 0 : AVERROR_INVALIDDATA;
}
+
static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
{
+ int size;
int ret;
- int size = parse_multipart_header(s->pb, s);
- if (size < 0)
- return size;
+ MPJPEGDemuxContext *mpjpeg = s->priv_data;
+ if (mpjpeg->boundary == NULL) {
+ mpjpeg->boundary = av_strdup("--");
+ mpjpeg->searchstr = av_strdup("\r\n--");
+ mpjpeg->searchstr_len = strlen(mpjpeg->searchstr);
+ if (!mpjpeg->boundary || !mpjpeg->searchstr) {
+ av_freep(&mpjpeg->boundary);
+ av_freep(&mpjpeg->searchstr);
+ return AVERROR(ENOMEM);
+ }
+ mpjpeg->searchstr_len = strlen(mpjpeg->searchstr);
+ }
+
+ ret = parse_multipart_header(s->pb, &size, mpjpeg->boundary, s);
+
- ret = av_get_packet(s->pb, pkt, size);
if (ret < 0)
return ret;
- return 0;
+ if (size > 0) {
+ /* size has been provided to us in MIME header */
+ ret = av_get_packet(s->pb, pkt, size);
+ } else {
+ /* no size was given -- we read until the next boundary or end-of-file
*/
+
+ const int read_chunk = 2048;
+ av_init_packet(pkt);
+ pkt->data = NULL;
+ pkt->size = 0;
+ pkt->pos = avio_tell(s->pb);
+
+ /* we may need to return as much as all we've read back to the buffer
*/
+ ffio_ensure_seekback(s->pb, read_chunk);
+
+
+ int remaining = 0, len;
+
+ while ((ret = av_append_packet(s->pb, pkt, read_chunk - remaining)) >=
0) {
+ /* scan the new data */
+ len = ret + remaining;
+ char* start = pkt->data + pkt->size - len;
+ do {
+ if (!memcmp(start, mpjpeg->searchstr, mpjpeg->searchstr_len)) {
+ // got the boundary! rewind the stream
+ avio_seek(s->pb, -(len-2), SEEK_CUR);
+ pkt->size -= (len-2);
+ return pkt->size;
+ }
+ len--;
+ start++;
+ } while (len >= mpjpeg->searchstr_len);
+ remaining = len;
+ }
+
+ /* error or EOF occurred */
+ if (ret == AVERROR_EOF) {
+ ret = pkt->size > 0 ? pkt->size : AVERROR_EOF;
+ } else {
+ av_packet_unref(pkt);
+ }
+ }
+
+ return ret;
}
AVInputFormat ff_mpjpeg_demuxer = {
@@ -234,7 +320,9 @@ AVInputFormat ff_mpjpeg_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("MIME multipart JPEG"),
.mime_type = "multipart/x-mixed-replace",
.extensions = "mjpg",
+ .priv_data_size = sizeof(MPJPEGDemuxContext),
.read_probe = mpjpeg_read_probe,
.read_header = mpjpeg_read_header,
.read_packet = mpjpeg_read_packet,
+ .read_close = mpjpeg_read_close
};
--
2.4.9 (Apple Git-60)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
