January 2015 - ffmpeg-cvslog - lists.ffmpeg.org

ffplay: remove unused no_background from videostate
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sat Nov 8 16:59:13 2014 +0100| [82928656b134b48599e1b7ee32fde1aaf81ea9f6] | committer: Marton Balint ffplay: remove unused no_background from videostate Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82928656b134b4859… --- ffplay.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index 507617e..bd156df 100644 --- a/ffplay.c +++ b/ffplay.c @@ -198,7 +198,6 @@ typedef struct VideoState { SDL_Thread *video_tid; SDL_Thread *audio_tid; AVInputFormat *iformat; - int no_background; int abort_request; int force_refresh; int paused;

1 0

avformat/flvdec: use named identifier instead of literal numbers as return values
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jan 1 19:14:06 2015 +0100| [efc4bfc195dab6efa77b444eac9313df4596a922] | committer: Michael Niedermayer avformat/flvdec: use named identifier instead of literal numbers as return values Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efc4bfc195dab6efa… --- libavformat/flvdec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index dc0edf2..c13c0e4 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -546,6 +546,9 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, return 0; } +#define TYPE_ONTEXTDATA 1 +#define TYPE_UNKNOWN 2 + static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { AMFDataType type; @@ -566,13 +569,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) type = avio_r8(ioc); if (type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0) - return 2; + return TYPE_UNKNOWN; if (!strcmp(buffer, "onTextData")) - return 1; + return TYPE_ONTEXTDATA; if (strcmp(buffer, "onMetaData") && strcmp(buffer, "onCuePoint")) - return 2; + return TYPE_UNKNOWN; // find the streams now so that amf_parse_object doesn't need to do // the lookup every time it is called.

1 0

avformat/flvdec: add several error messages to error conditions
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jan 1 18:03:54 2015 +0100| [5c37ffca59e7eb1b8768f237deb35a9936c1a0a5] | committer: Michael Niedermayer avformat/flvdec: add several error messages to error conditions Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c37ffca59e7eb1b8… --- libavformat/flvdec.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 54f2f56..8a4addb 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -405,8 +405,10 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, num_val = avio_r8(ioc); break; case AMF_DATA_TYPE_STRING: - if (amf_get_string(ioc, str_val, sizeof(str_val)) < 0) + if (amf_get_string(ioc, str_val, sizeof(str_val)) < 0) { + av_log(s, AV_LOG_ERROR, "AMF_DATA_TYPE_STRING parsing failed\n"); return -1; + } break; case AMF_DATA_TYPE_OBJECT: if ((vstream || astream) && key && @@ -421,8 +423,10 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, if (amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) return -1; // if we couldn't skip, bomb out. - if (avio_r8(ioc) != AMF_END_OF_OBJECT) + if (avio_r8(ioc) != AMF_END_OF_OBJECT) { + av_log(s, AV_LOG_ERROR, "Missing AMF_END_OF_OBJECT in AMF_DATA_TYPE_OBJECT\n"); return -1; + } break; case AMF_DATA_TYPE_NULL: case AMF_DATA_TYPE_UNDEFINED: @@ -438,7 +442,10 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, depth + 1) < 0) return -1; if (avio_r8(ioc) != AMF_END_OF_OBJECT) + if (avio_r8(ioc) != AMF_END_OF_OBJECT) { + av_log(s, AV_LOG_ERROR, "Missing AMF_END_OF_OBJECT in AMF_DATA_TYPE_MIXEDARRAY\n"); return -1; + } break; case AMF_DATA_TYPE_ARRAY: { @@ -455,6 +462,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, avio_skip(ioc, 8 + 2); // timestamp (double) and UTC offset (int16) break; default: // unsupported type, we couldn't skip + av_log(s, AV_LOG_ERROR, "unsupported amf type %d\n", amf_type); return -1; }

1 0

avformat/flvdec: do not inject dts= 0 metadata packets which failed to be parsed into a new data stream
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jan 1 18:07:24 2015 +0100| [322f0f5960a743cac47252d90a0f1ea7a025feff] | committer: Michael Niedermayer avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed into a new data stream Such data streams (which then contain no other packets except the faulty one) confuse some user applications, like VLC Works around vlcticket 12389 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=322f0f5960a743cac… --- libavformat/flvdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 8a4addb..993b5a2 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -566,13 +566,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) type = avio_r8(ioc); if (type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0) - return -1; + return 2; if (!strcmp(buffer, "onTextData")) return 1; if (strcmp(buffer, "onMetaData") && strcmp(buffer, "onCuePoint")) - return -1; + return 2; // find the streams now so that amf_parse_object doesn't need to do // the lookup every time it is called. @@ -830,7 +830,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) stream_type=FLV_STREAM_TYPE_DATA; if (size > 13 + 1 + 4 && dts == 0) { // Header-type metadata stuff meta_pos = avio_tell(s->pb); - if (flv_read_metabody(s, next) == 0) { + if (flv_read_metabody(s, next) <= 0) { goto skip; } avio_seek(s->pb, meta_pos, SEEK_SET);

1 0

avformat/flvdec: Increase string array size
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jan 1 18:15:16 2015 +0100| [eb767a276bfdb9a0493bdb0b38203638230b7ccb] | committer: Michael Niedermayer avformat/flvdec: Increase string array size Fixes parsing httphostheader of Scarlatti\,\ Pieter-Jan\ Belder\ -\ Sonata\ K113\ in\ A\ major\ -\ Alle.flv Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb767a276bfdb9a04… --- libavformat/flvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 993b5a2..dc0edf2 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -390,7 +390,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, FLVContext *flv = s->priv_data; AVIOContext *ioc; AMFDataType amf_type; - char str_val[256]; + char str_val[1024]; double num_val; num_val = 0;

1 0

avfilter/vf_idet: Add 9, 12 and 14 bit pixel formats
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jan 1 05:23:06 2015 +0100| [d25d9296003465d60a968147f7b722823f22272d] | committer: Michael Niedermayer avfilter/vf_idet: Add 9, 12 and 14 bit pixel formats Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d25d9296003465d60… --- libavfilter/vf_idet.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index 7227a40..56e6e76 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -332,9 +332,18 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GRAY16, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_YUV420P9, + AV_PIX_FMT_YUV422P9, + AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV420P12, + AV_PIX_FMT_YUV422P12, + AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_YUV420P14, + AV_PIX_FMT_YUV422P14, + AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16,

1 0

avfilter/vf_cropdetect: adjust Default threshold based on bit depth
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Dec 30 21:02:34 2014 +0100| [a288d08d84f66c74984ebc9cc9f2b9f930ef3fdd] | committer: Michael Niedermayer avfilter/vf_cropdetect: adjust Default threshold based on bit depth Also allow specifying thresholds that are bit depth independant Previous version reviewed by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a288d08d84f66c749… --- libavfilter/vf_cropdetect.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index dd237ef..e8492cd 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -35,7 +35,7 @@ typedef struct CropDetectContext { const AVClass *class; int x1, y1, x2, y2; - int limit; + float limit; int round; int reset_count; int frame_nb; @@ -127,7 +127,7 @@ static av_cold int init(AVFilterContext *ctx) s->frame_nb = -2; - av_log(ctx, AV_LOG_VERBOSE, "limit:%d round:%d reset_count:%d\n", + av_log(ctx, AV_LOG_VERBOSE, "limit:%f round:%d reset_count:%d\n", s->limit, s->round, s->reset_count); return 0; @@ -137,9 +137,12 @@ static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; CropDetectContext *s = ctx->priv; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); - av_image_fill_max_pixsteps(s->max_pixsteps, NULL, - av_pix_fmt_desc_get(inlink->format)); + av_image_fill_max_pixsteps(s->max_pixsteps, NULL, desc); + + if (s->limit < 1.0) + s->limit *= (1 << (desc->comp[0].depth_minus1 + 1)) - 1; s->x1 = inlink->w - 1; s->y1 = inlink->h - 1; @@ -160,6 +163,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) int w, h, x, y, shrink_by; AVDictionary **metadata; int outliers, last_y; + int limit = round(s->limit); // ignore first 2 frames - they may be empty if (++s->frame_nb > 0) { @@ -177,7 +181,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) #define FIND(DST, FROM, NOEND, INC, STEP0, STEP1, LEN) \ outliers = 0;\ for (last_y = y = FROM; NOEND; y = y INC) {\ - if (checkline(ctx, frame->data[0] + STEP0 * y, STEP1, LEN, bpp) > s->limit) {\ + if (checkline(ctx, frame->data[0] + STEP0 * y, STEP1, LEN, bpp) > limit) {\ if (++outliers > s->max_outliers) { \ DST = last_y;\ break;\ @@ -238,7 +242,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM static const AVOption cropdetect_options[] = { - { "limit", "Threshold below which the pixel is considered black", OFFSET(limit), AV_OPT_TYPE_INT, { .i64 = 24 }, 0, 65535, FLAGS }, + { "limit", "Threshold below which the pixel is considered black", OFFSET(limit), AV_OPT_TYPE_FLOAT, { .dbl = 24.0/255 }, 0, 65535, FLAGS }, { "round", "Value by which the width/height should be divisible", OFFSET(round), AV_OPT_TYPE_INT, { .i64 = 16 }, 0, INT_MAX, FLAGS }, { "reset", "Recalculate the crop area after this many frames", OFFSET(reset_count), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, { "reset_count", "Recalculate the crop area after this many frames",OFFSET(reset_count),AV_OPT_TYPE_INT,{ .i64 = 0 }, 0, INT_MAX, FLAGS },

3 2

avfilter/vf_idet: Use frame_requested instead of prev
by git＠videolan.org 01 Jan '15

01 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jan 1 02:30:16 2015 +0100| [18802bc81ce8f6fe667f33e680990676a3407609] | committer: Michael Niedermayer avfilter/vf_idet: Use frame_requested instead of prev This is more robust if the delay is not constant Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18802bc81ce8f6fe6… --- libavfilter/vf_idet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index 9a25042..7227a40 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -285,7 +285,7 @@ static int request_frame(AVFilterLink *link) } else if (ret < 0) { return ret; } - } while (!idet->prev); + } while (link->frame_requested); return 0; }

1 0