May 2015 - ffmpeg-devel - lists.ffmpeg.org

[PATCH]Mark experimental j2k decoder as experimental if libopenjpeg is available
by Carl Eugen Hoyos 08 Jun '15

08 Jun '15

Hi! Attached patch fixes ticket #3619. Please comment, Carl Eugen

5 14

[PATCH] configure: autodetect OpenCL headers and ICD loader
by Gupta, Maneesh 08 Jun '15

08 Jun '15

Attached is a patch that enables configure to autodetect the presence of OpenCL headers and ICD loader. If the necessary headers are found, the OpenCL infrastructure compilation is enabled as well. Note that this does not modify the runtime behavior in any way. Execution of the OpenCL code path still requires the user to explicitly enable it. Please review the patch and share your comments on the same. - Maneesh

4 5

Implementation of AAC decoder (fixed point)
by Nedeljko Babic 08 Jun '15

08 Jun '15

Changes to libavutil are moved and split in two new patches. Changes are made so the code is buildable after every patch is applied, so some patches became redundant. Most of the changes requested in last review implemented. The documentation about implementation of butterflies_fixed is not changed. I saw the comment later and I was not sure what was asked exactly since there is no shift in implementation of this function. I will make additional change in this patch if needed. Please have a look. -Nedeljko

5 40

ffserver jpg patch
by ill 08 Jun '15

08 Jun '15

I changed it to git and add the .write header to the last part. The first part compiled after I changed ffserver.c, so it is no longer corrupted. Muxer detection seems to work when I tried it for the middle part. It should be good to fix ffserver now? diff -Nrup ffmpeg-git--orig/ffserver.c ffmpeg-git/ffserver.c --- ffmpeg-git--orig/ffserver.c 2015-03-16 20:25:48.000000000 +0100 +++ ffmpeg-git/ffserver.c 2015-04-05 02:33:53.000000000 +0200 @@ -967,6 +967,10 @@ static int handle_connection(HTTPContext /* close connection if trailer sent */ if (c->state == HTTPSTATE_SEND_DATA_TRAILER) return -1; + /* Check if it is a single jpeg frame 123 */ + if (c->stream->single_frame && c->data_count > c->cur_frame_bytes && c->cur_frame_bytes > 0) { + close_connection(c); + } break; case HTTPSTATE_RECEIVE_DATA: /* no need to read if no events */ diff -Nrup ffmpeg-git--orig/ffserver_config.c ffmpeg-git/ffserver_config.c --- ffmpeg-git--orig/ffserver_config.c 2015-03-16 20:25:48.000000000 +0100 +++ ffmpeg-git/ffserver_config.c 2015-04-05 02:33:53.000000000 +0200 @@ -862,8 +862,10 @@ static int ffserver_parse_config_stream( } else { stream->stream_type = STREAM_TYPE_LIVE; /* JPEG cannot be used here, so use single frame MJPEG */ - if (!strcmp(arg, "jpeg")) - strcpy(arg, "mjpeg"); + if (!strcmp(arg, "jpeg")) { + strcpy(arg, "singlejpeg"); + stream->single_frame=1; + } stream->fmt = ffserver_guess_format(arg, NULL, NULL); if (!stream->fmt) ERROR("Unknown Format: '%s'\n", arg); diff -Nrup ffmpeg-git--orig/ffserver_config.h ffmpeg-git/ffserver_config.h --- ffmpeg-git--orig/ffserver_config.h 2015-03-16 20:25:48.000000000 +0100 +++ ffmpeg-git/ffserver_config.h 2015-04-05 02:33:53.000000000 +0200 @@ -79,6 +79,7 @@ typedef struct FFServerStream { int multicast_port; /* first port used for multicast */ int multicast_ttl; int loop; /* if true, send the stream in loops (only meaningful if file) */ + char single_frame; /* only single frame */ /* feed specific */ int feed_opened; /* true if someone is writing to the feed */ diff -Nrup ffmpeg-git--orig/libavformat/allformats.c ffmpeg-git/libavformat/allformats.c --- ffmpeg-git--orig/libavformat/allformats.c 2015-03-16 20:25:52.000000000 +0100 +++ ffmpeg-git/libavformat/allformats.c 2015-04-05 02:33:53.000000000 +0200 @@ -273,6 +273,7 @@ void av_register_all(void) REGISTER_MUXER (SEGMENT, stream_segment); REGISTER_DEMUXER (SHORTEN, shorten); REGISTER_DEMUXER (SIFF, siff); + REGISTER_MUXER (SINGLEJPEG, singlejpeg); REGISTER_DEMUXER (SLN, sln); REGISTER_DEMUXER (SMACKER, smacker); REGISTER_MUXDEMUX(SMJPEG, smjpeg); diff -Nrup ffmpeg-git--orig/libavformat/rawenc.c ffmpeg-git/libavformat/rawenc.c --- ffmpeg-git--orig/libavformat/rawenc.c 2015-03-16 20:25:54.000000000 +0100 +++ ffmpeg-git/libavformat/rawenc.c 2015-04-05 02:33:53.000000000 +0200 @@ -250,6 +250,17 @@ AVOutputFormat ff_mjpeg_muxer = { .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; + +AVOutputFormat ff_singlejpeg_muxer = { + .name = "singlejpeg", + .long_name = NULL_IF_CONFIG_SMALL("JPEG single image"), + .mime_type = "image/jpeg", + .extensions = "jpg,jpeg", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MJPEG, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, + .write_header = force_one_stream, +}; #endif #if CONFIG_MLP_MUXER

4 21

[PATCH 1/2] avformat/mxfenc: Add mxf muxer avclass
by Michael Niedermayer 06 Jun '15

06 Jun '15

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavformat/mxfenc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index adac69e..644ca56 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2615,6 +2615,17 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int mxf_interleave_get_packet, mxf_compare_timestamps); } +static const AVOption mxf_options[] = { + { NULL }, +}; + +static const AVClass mxf_muxer_class = { + .class_name = "MXF muxer", + .item_name = av_default_item_name, + .option = mxf_options, + .version = LIBAVUTIL_VERSION_INT, +}; + static const AVOption d10_options[] = { { "d10_channelcount", "Force/set channelcount in generic sound essence descriptor", offsetof(MXFContext, channel_count), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 8, AV_OPT_FLAG_ENCODING_PARAM}, @@ -2654,6 +2665,7 @@ AVOutputFormat ff_mxf_muxer = { .write_trailer = mxf_write_footer, .flags = AVFMT_NOTIMESTAMPS, .interleave_packet = mxf_interleave, + .priv_class = &mxf_muxer_class, }; AVOutputFormat ff_mxf_d10_muxer = { -- 1.7.9.5

1 2

[PATCH 0/3] Authentication callbacks
by Lukasz Marek 04 Jun '15

04 Jun '15

One of the most annoying things with ffmpeg is that password must be provided as a program param. It is visible while typing and on process list. (I'm talking about ffplay/ffmpeg/ffprobe here.) This patchset provides API that protocols may use to ask user for password interactively. I added implementation in ffplay, but I see it potentially useful for any user application. The question is: is this really required, application may just ask for password when connection fails. Assuming application knows it is matter of credentials (not wrong hostname, file permissions etc), it may be ineffective. It is almost sure connection has to be established at each try. API also allows to distinguish password for reqular user/pass authentication and password for private key (not included in this patchset, but libssh may benefit from this probably). I added callback as global variable with settter and as part of URLContext. Global variable is not nice, but it allows to avoid massive attack on avio API :) I don't see any reason it cannot be done this way. I also added it to URLContext to allow muxers, demuxers (like HLS, DASH, SmoothStreaming, image2) to add a wrapper and cache these credentials as they open many urls to store sequential data (images/chunks). Patchset available at https://github.com/lukaszmluki/ffmpeg branch: auth Lukasz Marek (3): [RFC]lavf/avio: add custom authentication API ffplay: add basic credentials handler lavf/ftp: support credentials callback ffplay.c | 63 ++++++++++++++++++++++++++++++++++- libavformat/avio.c | 46 ++++++++++++++++++++++++++ libavformat/avio.h | 28 ++++++++++++++++ libavformat/ftp.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-------- libavformat/url.h | 12 +++++++ 5 files changed, 231 insertions(+), 14 deletions(-) -- 1.9.1

2 4

[PATCH][GSoC] lavf/http: Parse and set HTTP method when listening on HTTP(S)
by Stephan Holljes 04 Jun '15

04 Jun '15

Signed-off-by: Stephan Holljes <klaxa1337(a)googlemail.com> --- libavformat/http.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index 4f6716a..3fad43d 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -556,6 +556,14 @@ static int process_line(URLContext *h, char *line, int line_count, p = line; if (line_count == 0) { + if (s->listen) { + while (!av_isspace(*p)) + p++; + s->method = av_malloc(p - line); + if (!s->method) + return AVERROR(ENOMEM); + av_strlcpy(s->method, line, p - line + 1); + } while (!av_isspace(*p) && *p != '\0') p++; while (av_isspace(*p)) -- 2.1.0

4 16

Test case for Closed caption decoder.
by Anshul 03 Jun '15

03 Jun '15

Hello, I am attaching patch for closed caption decoder. Thanks Anshul

5 25

[PATCH 2/2] avformat/mov: increase current_sample after reading, to avoid discontinuous sample
by Zhang Rui 03 Jun '15

03 Jun '15

--- libavformat/mov.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index bfbf599..a8f818f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4241,8 +4241,6 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) goto retry; } sc = st->priv_data; - /* must be done just before reading, to avoid infinite loop on sample */ - sc->current_sample++; if (mov->next_root_atom) { sample->pos = FFMIN(sample->pos, mov->next_root_atom); @@ -4281,6 +4279,9 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) #endif } + /* increase current_sample after reading, to avoid discontinuous sample */ + sc->current_sample++; + pkt->stream_index = sc->ffindex; pkt->dts = sample->timestamp; if (sc->ctts_data && sc->ctts_index < sc->ctts_count) { -- 2.0.0

2 6

[PATCH] ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow()
by Stefano Sabatini 03 Jun '15

03 Jun '15

This fixes compilation with latest MinGW32 and MSYS2/MinGW64. --- ffmpeg_dxva2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg_dxva2.c b/ffmpeg_dxva2.c index 741c55b..6b20195 100644 --- a/ffmpeg_dxva2.c +++ b/ffmpeg_dxva2.c @@ -364,7 +364,7 @@ static int dxva2_alloc(AVCodecContext *s) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Flags = D3DPRESENTFLAG_VIDEO; - hr = IDirect3D9_CreateDevice(ctx->d3d9, adapter, D3DDEVTYPE_HAL, GetShellWindow(), + hr = IDirect3D9_CreateDevice(ctx->d3d9, adapter, D3DDEVTYPE_HAL, GetDesktopWindow(), D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE, &d3dpp, &ctx->d3d9device); if (FAILED(hr)) { -- 1.9.1

4 9