May 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r22997 - trunk/libavcodec/rawdec.c
by subversion＠mplayerhq.hu 01 May '10

01 May '10

Author: michael Date: Sat May 1 00:09:42 2010 New Revision: 22997 Log: avi bgr24 padding fix. Fixes issue1901 Modified: trunk/libavcodec/rawdec.c Modified: trunk/libavcodec/rawdec.c ============================================================================== --- trunk/libavcodec/rawdec.c Fri Apr 30 23:43:29 2010 (r22996) +++ trunk/libavcodec/rawdec.c Sat May 1 00:09:42 2010 (r22997) @@ -152,6 +152,8 @@ static int raw_decode(AVCodecContext *av memcpy(frame->data[1], avctx->palctrl->palette, AVPALETTE_SIZE); avctx->palctrl->palette_changed = 0; } + if(avctx->pix_fmt==PIX_FMT_BGR24 && ((frame->linesize[0]+3)&~3)*avctx->height <= buf_size) + frame->linesize[0] = (frame->linesize[0]+3)&~3; if(context->flip) flip(avctx, picture);

4 5

r23004 - trunk/libavformat/avformat.h
by subversion＠mplayerhq.hu 01 May '10

01 May '10

Author: reimar Date: Sat May 1 17:36:51 2010 New Revision: 23004 Log: Fix off-by-one errors in description of score_max argument for av_probe_input_format2 Modified: trunk/libavformat/avformat.h Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h Sat May 1 15:54:13 2010 (r23003) +++ trunk/libavformat/avformat.h Sat May 1 17:36:51 2010 (r23004) @@ -892,9 +892,10 @@ AVInputFormat *av_probe_input_format(AVP * * @param is_opened Whether the file is already opened; determines whether * demuxers with or without AVFMT_NOFILE are probed. - * @param score_max minimum score required to accept a detection, set to actual - * detection score afterwards. - * If the score is < AVPROBE_SCORE_MAX / 4 it is recommended + * @param score_max A probe score larger that this is required to accept a + * detection, the variable is set to the actual detection + * score afterwards. + * If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended * to retry with a larger probe buffer. */ AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);

1 0

r23002 - in trunk/libavformat: avformat.h utils.c
by subversion＠mplayerhq.hu 01 May '10

01 May '10

Author: reimar Date: Sat May 1 15:49:35 2010 New Revision: 23002 Log: Export av_probe_input_format2. Modified: trunk/libavformat/avformat.h trunk/libavformat/utils.c Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h Sat May 1 10:24:24 2010 (r23001) +++ trunk/libavformat/avformat.h Sat May 1 15:49:35 2010 (r23002) @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 61 +#define LIBAVFORMAT_VERSION_MINOR 62 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -888,6 +888,18 @@ AVInputFormat *av_find_input_format(cons AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened); /** + * Guesses the file format. + * + * @param is_opened Whether the file is already opened; determines whether + * demuxers with or without AVFMT_NOFILE are probed. + * @param score_max minimum score required to accept a detection, set to actual + * detection score afterwards. + * If the score is < AVPROBE_SCORE_MAX / 4 it is recommended + * to retry with a larger probe buffer. + */ +AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max); + +/** * Allocates all the structures needed to read an input stream. * This does not open the needed codecs for decoding the stream[s]. */ Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c Sat May 1 10:24:24 2010 (r23001) +++ trunk/libavformat/utils.c Sat May 1 15:49:35 2010 (r23002) @@ -310,7 +310,7 @@ int av_filename_number_test(const char * return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); } -static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max) +AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max) { AVInputFormat *fmt1, *fmt; int score;

2 1

r23003 - trunk/doc/APIchanges
by subversion＠mplayerhq.hu 01 May '10

01 May '10

Author: reimar Date: Sat May 1 15:54:13 2010 New Revision: 23003 Log: Document av_probe_input_format2 API addition. Modified: trunk/doc/APIchanges Modified: trunk/doc/APIchanges ============================================================================== --- trunk/doc/APIchanges Sat May 1 15:49:35 2010 (r23002) +++ trunk/doc/APIchanges Sat May 1 15:54:13 2010 (r23003) @@ -12,6 +12,10 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-05-01 - r23002 - lavf 52.62.0 - probe function + Add av_probe_input_format2 to API, it allows ignoring probe + results below given score and returns the actual probe score. + 2010-04-01 - r22806 - lavf 52.61.0 - metadata API Add a flag for av_metadata_set2() to disable overwriting of existing tags.

1 0

r22966 - trunk/libavdevice/v4l2.c
by subversion＠mplayerhq.hu 01 May '10

01 May '10

Author: stefano Date: Mon Apr 26 21:40:15 2010 New Revision: 22966 Log: Return meaningful error codes, rather than always -1. Modified: trunk/libavdevice/v4l2.c Modified: trunk/libavdevice/v4l2.c ============================================================================== --- trunk/libavdevice/v4l2.c Mon Apr 26 15:36:17 2010 (r22965) +++ trunk/libavdevice/v4l2.c Mon Apr 26 21:40:15 2010 (r22966) @@ -164,7 +164,7 @@ static int device_open(AVFormatContext * av_log(ctx, AV_LOG_ERROR, "Cannot open video device %s : %s\n", ctx->filename, strerror(errno)); - return -1; + return AVERROR(errno); } res = ioctl(fd, VIDIOC_QUERYCAP, &cap); @@ -174,20 +174,20 @@ static int device_open(AVFormatContext * av_log(ctx, AV_LOG_ERROR, "QUERYCAP not implemented, probably V4L device but not supporting V4L2\n"); close(fd); - return -1; + return AVERROR(errno); } if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYCAP): %s\n", strerror(errno)); close(fd); - return -1; + return AVERROR(errno); } if ((cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) == 0) { av_log(ctx, AV_LOG_ERROR, "Not a video capture device\n"); close(fd); - return -1; + return AVERROR(ENODEV); } *capabilities = cap.capabilities; @@ -299,27 +299,27 @@ static int mmap_init(AVFormatContext *ct av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_REQBUFS)\n"); } - return -1; + return AVERROR(errno); } if (req.count < 2) { av_log(ctx, AV_LOG_ERROR, "Insufficient buffer memory\n"); - return -1; + return AVERROR(ENOMEM); } s->buffers = req.count; s->buf_start = av_malloc(sizeof(void *) * s->buffers); if (s->buf_start == NULL) { av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer pointers\n"); - return -1; + return AVERROR(ENOMEM); } s->buf_len = av_malloc(sizeof(unsigned int) * s->buffers); if (s->buf_len == NULL) { av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer sizes\n"); av_free(s->buf_start); - return -1; + return AVERROR(ENOMEM); } for (i = 0; i < req.count; i++) { @@ -333,7 +333,7 @@ static int mmap_init(AVFormatContext *ct if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYBUF)\n"); - return -1; + return AVERROR(errno); } s->buf_len[i] = buf.length; @@ -347,7 +347,7 @@ static int mmap_init(AVFormatContext *ct if (s->buf_start[i] == MAP_FAILED) { av_log(ctx, AV_LOG_ERROR, "mmap: %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } } @@ -405,13 +405,13 @@ static int mmap_read_frame(AVFormatConte } av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_DQBUF): %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } assert (buf.index < s->buffers); if (s->frame_size > 0 && buf.bytesused != s->frame_size) { av_log(ctx, AV_LOG_ERROR, "The v4l2 frame is %d bytes, but %d bytes are expected\n", buf.bytesused, s->frame_size); - return -1; + return AVERROR_INVALIDDATA; } /* Image is at s->buff_start[buf.index] */ @@ -427,7 +427,7 @@ static int mmap_read_frame(AVFormatConte av_log(ctx, AV_LOG_ERROR, "Failed to allocate a buffer descriptor\n"); res = ioctl (s->fd, VIDIOC_QBUF, &buf); - return -1; + return AVERROR(ENOMEM); } buf_descriptor->fd = s->fd; buf_descriptor->index = buf.index; @@ -459,7 +459,7 @@ static int mmap_start(AVFormatContext *c if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } } @@ -468,7 +468,7 @@ static int mmap_start(AVFormatContext *c if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_STREAMON): %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } return 0; @@ -588,11 +588,11 @@ static int v4l2_read_header(AVFormatCont if (ap->width <= 0 || ap->height <= 0) { av_log(s1, AV_LOG_ERROR, "Wrong size (%dx%d)\n", ap->width, ap->height); - return -1; + return AVERROR(EINVAL); } if(avcodec_check_dimensions(s1, ap->width, ap->height) < 0) - return -1; + return AVERROR(EINVAL); st = av_new_stream(s1, 0); if (!st) {

4 6

r23001 - trunk/libavdevice/v4l2.c
by subversion＠mplayerhq.hu 01 May '10

01 May '10

Author: stefano Date: Sat May 1 10:24:24 2010 New Revision: 23001 Log: Make device_open() store the VIDIOC_QUERYCAP ioctl errno, and in case of failure return the stored value rather than the current errno, which may be overwritten by a following call to close(). Modified: trunk/libavdevice/v4l2.c Modified: trunk/libavdevice/v4l2.c ============================================================================== --- trunk/libavdevice/v4l2.c Sat May 1 01:32:42 2010 (r23000) +++ trunk/libavdevice/v4l2.c Sat May 1 10:24:24 2010 (r23001) @@ -153,7 +153,7 @@ static int device_open(AVFormatContext * { struct v4l2_capability cap; int fd; - int res; + int res, err; int flags = O_RDWR; if (ctx->flags & AVFMT_FLAG_NONBLOCK) { @@ -169,18 +169,18 @@ static int device_open(AVFormatContext * res = ioctl(fd, VIDIOC_QUERYCAP, &cap); // ENOIOCTLCMD definition only availble on __KERNEL__ - if (res < 0 && errno == 515) { + if (res < 0 && ((err = errno) == 515)) { av_log(ctx, AV_LOG_ERROR, "QUERYCAP not implemented, probably V4L device but not supporting V4L2\n"); close(fd); - return AVERROR(errno); + return AVERROR(515); } if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYCAP): %s\n", strerror(errno)); close(fd); - return AVERROR(errno); + return AVERROR(err); } if ((cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) == 0) { av_log(ctx, AV_LOG_ERROR, "Not a video capture device\n");

1 0