February 2013 - ffmpeg-cvslog

ff_gen_search: Fix finding the maximum timestamp in a really small file
by git＠videolan.org 30 May '13

30 May '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Feb 18 20:18:19 2013 +0100| [6cd650dbd2bea006e1c4b70456f6d9eb7f638922] | committer: Michael Niedermayer ff_gen_search: Fix finding the maximum timestamp in a really small file Fixes Assertion failure Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cd650dbd2bea006e… --- libavformat/utils.c | 4 ++-- tests/ref/seek/lavf-ogg | 54 +++++++++++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d59a02d..a4218db 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1863,10 +1863,10 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts, filesize = avio_size(s->pb); pos_max = filesize - 1; do{ - pos_max -= step; + pos_max = FFMAX(0, pos_max - step); ts_max = ff_read_timestamp(s, stream_index, &pos_max, pos_max + step, read_timestamp); step += step; - }while(ts_max == AV_NOPTS_VALUE && pos_max >= step); + }while(ts_max == AV_NOPTS_VALUE && pos_max > 0); if (ts_max == AV_NOPTS_VALUE) return -1; diff --git a/tests/ref/seek/lavf-ogg b/tests/ref/seek/lavf-ogg index 2898d10..583526e 100644 --- a/tests/ref/seek/lavf-ogg +++ b/tests/ref/seek/lavf-ogg @@ -1,35 +1,53 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:1 ts: 1.894167 -ret:-1 st: 0 flags:0 ts: 0.788345 +ret: 0 st:-1 flags:1 ts: 1.894167 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:0 ts: 0.788345 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:0 ts: 2.576668 -ret:-1 st:-1 flags:1 ts: 1.470835 -ret:-1 st: 0 flags:0 ts: 0.365011 +ret: 0 st:-1 flags:0 ts: 2.576668 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 1.470835 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:0 ts: 0.365011 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st:-1 flags:0 ts: 2.153336 -ret:-1 st:-1 flags:1 ts: 1.047503 +ret: 0 st:-1 flags:0 ts: 2.153336 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 1.047503 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 2.835828 -ret:-1 st:-1 flags:0 ts: 1.730004 -ret:-1 st:-1 flags:1 ts: 0.624171 +ret: 0 st: 0 flags:1 ts: 2.835828 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 1.730004 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 0.624171 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 2.412494 -ret:-1 st:-1 flags:0 ts: 1.306672 -ret:-1 st:-1 flags:1 ts: 0.200839 +ret: 0 st: 0 flags:1 ts: 2.412494 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 1.306672 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:1 ts: 0.200839 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:1 ts: 1.989184 -ret:-1 st:-1 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 ts: 1.989184 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 0.883340 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 -ret:-1 st: 0 flags:0 ts: 2.671678 -ret:-1 st: 0 flags:1 ts: 1.565850 -ret:-1 st:-1 flags:0 ts: 0.460008 +ret: 0 st: 0 flags:0 ts: 2.671678 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st: 0 flags:1 ts: 1.565850 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 +ret: 0 st:-1 flags:0 ts: 0.460008 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 143 size: 1364

2 1

ffmpeg: fix variable name in psnr printing code
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Mar 1 00:25:03 2013 +0100| [e20f2dc048fd1fccda7ab56fbadd53054439f452] | committer: Michael Niedermayer ffmpeg: fix variable name in psnr printing code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e20f2dc048fd1fccd… --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 65f252b..f1e6834 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1215,7 +1215,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti p = psnr(error / scale); snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%c:%2.2f ", type[j], p); av_bprintf(&buf_script, "stream_%d_%d_psnr_%c=%2.2f\n", - ost->file_index, ost->index, type[i] | 32, p); + ost->file_index, ost->index, type[j] | 32, p); } p = psnr(error_sum / scale_sum); snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "*:%2.2f ", psnr(error_sum / scale_sum));

1 0

libvpxenc: dont redundantly zero fields, the whole context is zeroed on init
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Mar 1 00:11:53 2013 +0100| [1d178710b429cedaa98bf971c16c8e32a94223f4] | committer: Michael Niedermayer libvpxenc: dont redundantly zero fields, the whole context is zeroed on init Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d178710b429cedaa… --- libavcodec/libvpxenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index bbd566d..4f1adb8 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -404,9 +404,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, vpx_img_wrap(&ctx->rawimg, VPX_IMG_FMT_I420, avctx->width, avctx->height, 1, (unsigned char*)1); - ctx->have_sse = 0; - ctx->frame_number = 0; - avctx->coded_frame = avcodec_alloc_frame(); if (!avctx->coded_frame) { av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n");

1 0

libvpxenc: add psnr support
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Pascal Massimino <pascal.massimino(a)gmail.com> | Thu Feb 28 14:14:46 2013 -0800| [3c3a8c14897978240ad6ab7762547878d5fb24cd] | committer: Michael Niedermayer libvpxenc: add psnr support Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c3a8c14897978240… --- libavcodec/libvpxenc.c | 57 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 04ea031..bbd566d 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -48,6 +48,9 @@ struct FrameListData { unsigned long duration; /**< duration to show frame (in timebase units) */ uint32_t flags; /**< flags for this frame */ + uint64_t sse[4]; + int have_sse; /**< true if we have pending sse[] */ + uint64_t frame_number; struct FrameListData *next; }; @@ -57,6 +60,9 @@ typedef struct VP8EncoderContext { struct vpx_image rawimg; struct vpx_fixed_buf twopass_stats; int deadline; //i.e., RT/GOOD/BEST + uint64_t sse[4]; + int have_sse; /**< true if we have pending sse[] */ + uint64_t frame_number; struct FrameListData *coded_frame_list; int cpu_used; @@ -232,6 +238,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, { VP8Context *ctx = avctx->priv_data; struct vpx_codec_enc_cfg enccfg; + vpx_codec_flags_t flags = (avctx->flags & CODEC_FLAG_PSNR) ? VPX_CODEC_USE_PSNR : 0; int res; av_log(avctx, AV_LOG_INFO, "%s\n", vpx_codec_version_str()); @@ -364,7 +371,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, dump_enc_cfg(avctx, &enccfg); /* Construct Encoder Context */ - res = vpx_codec_enc_init(&ctx->encoder, iface, &enccfg, 0); + res = vpx_codec_enc_init(&ctx->encoder, iface, &enccfg, flags); if (res != VPX_CODEC_OK) { log_encoder_error(avctx, "Failed to initialize encoder"); return AVERROR(EINVAL); @@ -397,6 +404,9 @@ static av_cold int vpx_init(AVCodecContext *avctx, vpx_img_wrap(&ctx->rawimg, VPX_IMG_FMT_I420, avctx->width, avctx->height, 1, (unsigned char*)1); + ctx->have_sse = 0; + ctx->frame_number = 0; + avctx->coded_frame = avcodec_alloc_frame(); if (!avctx->coded_frame) { av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n"); @@ -407,13 +417,30 @@ static av_cold int vpx_init(AVCodecContext *avctx, } static inline void cx_pktcpy(struct FrameListData *dst, - const struct vpx_codec_cx_pkt *src) + const struct vpx_codec_cx_pkt *src, + VP8Context *ctx) { dst->pts = src->data.frame.pts; dst->duration = src->data.frame.duration; dst->flags = src->data.frame.flags; dst->sz = src->data.frame.sz; dst->buf = src->data.frame.buf; + dst->have_sse = 0; + /* For alt-ref frame, don't store PSNR or increment frame_number */ + if (!(dst->flags & VPX_FRAME_IS_INVISIBLE)) { + dst->frame_number = ++ctx->frame_number; + dst->have_sse = ctx->have_sse; + if (ctx->have_sse) { + /* associate last-seen SSE to the frame. */ + /* Transfers ownership from ctx to dst. */ + /* WARNING! This makes the assumption that PSNR_PKT comes + just before the frame it refers to! */ + memcpy(dst->sse, ctx->sse, sizeof(dst->sse)); + ctx->have_sse = 0; + } + } else { + dst->frame_number = -1; /* sanity marker */ + } } /** @@ -438,6 +465,19 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, pkt->flags |= AV_PKT_FLAG_KEY; } else coded_frame->pict_type = AV_PICTURE_TYPE_P; + + if (cx_frame->have_sse) { + int i; + /* Beware of the Y/U/V/all order! */ + coded_frame->error[0] = cx_frame->sse[1]; + coded_frame->error[1] = cx_frame->sse[2]; + coded_frame->error[2] = cx_frame->sse[3]; + coded_frame->error[3] = 0; // alpha + for (i = 0; i < 4; ++i) { + avctx->error[i] += coded_frame->error[i]; + } + cx_frame->have_sse = 0; + } } else { return ret; } @@ -481,7 +521,7 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out, /* avoid storing the frame when the list is empty and we haven't yet provided a frame for output */ av_assert0(!ctx->coded_frame_list); - cx_pktcpy(&cx_frame, pkt); + cx_pktcpy(&cx_frame, pkt, ctx); size = storeframe(avctx, &cx_frame, pkt_out, coded_frame); if (size < 0) return size; @@ -494,7 +534,7 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out, "Frame queue element alloc failed\n"); return AVERROR(ENOMEM); } - cx_pktcpy(cx_frame, pkt); + cx_pktcpy(cx_frame, pkt, ctx); cx_frame->buf = av_malloc(cx_frame->sz); if (!cx_frame->buf) { @@ -521,7 +561,14 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out, stats->sz += pkt->data.twopass_stats.sz; break; } - case VPX_CODEC_PSNR_PKT: //FIXME add support for CODEC_FLAG_PSNR + case VPX_CODEC_PSNR_PKT: + av_assert0(!ctx->have_sse); + ctx->sse[0] = pkt->data.psnr.sse[0]; + ctx->sse[1] = pkt->data.psnr.sse[1]; + ctx->sse[2] = pkt->data.psnr.sse[2]; + ctx->sse[3] = pkt->data.psnr.sse[3]; + ctx->have_sse = 1; + break; case VPX_CODEC_CUSTOM_PKT: //ignore unsupported/unrecognized packet types break;

1 0

avformat/lavfi: force probesize to cover at least 30 frames
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Feb 28 20:24:05 2013 +0100| [b56e029bdc9a68ed9decc7d3ad77e15aa5f4071d] | committer: Michael Niedermayer avformat/lavfi: force probesize to cover at least 30 frames This ensures that fps and other values are estimated correctly, the probesize also is intended to limit disk/protocol reads which does not apply to lavfi inputs at all. Fixes Ticket1051 Something similar could be usefull to other input devices Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b56e029bdc9a68ed9… --- libavdevice/lavfi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index e4cacb6..3b6f0c3 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -282,6 +282,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) st->codec->height = link->h; st ->sample_aspect_ratio = st->codec->sample_aspect_ratio = link->sample_aspect_ratio; + avctx->probesize = FFMAX(avctx->probesize, + link->w * link->h * + av_get_padded_bits_per_pixel(av_pix_fmt_desc_get(link->format)) * + 30); } else if (link->type == AVMEDIA_TYPE_AUDIO) { st->codec->codec_id = av_get_pcm_codec(link->format, -1); st->codec->channels = av_get_channel_layout_nb_channels(link->channel_layout);

1 0

exr: pxr24 decompression
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Feb 27 19:29:39 2013 +0000| [33240dfa9acad976ed60dbddaf08e441d029b53b] | committer: Paul B Mahol exr: pxr24 decompression Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33240dfa9acad976e… --- libavcodec/exr.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 53c8f2b..8c1cca4 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -37,6 +37,7 @@ #include "mathops.h" #include "thread.h" #include "libavutil/imgutils.h" +#include "libavutil/avassert.h" enum ExrCompr { EXR_RAW = 0, @@ -44,6 +45,7 @@ enum ExrCompr { EXR_ZIP1 = 2, EXR_ZIP16 = 3, EXR_PIZ = 4, + EXR_PXR24 = 5, EXR_B44 = 6, EXR_B44A = 7, }; @@ -78,6 +80,8 @@ typedef struct EXRContext { uint32_t ymax, ymin; uint32_t xdelta, ydelta; + int ysize; + uint64_t scan_line_size; int scan_lines_per_block; @@ -273,6 +277,61 @@ static int rle_uncompress(const uint8_t *src, int compressed_size, return 0; } +static int pxr24_uncompress(EXRContext *s, const uint8_t *src, + int compressed_size, int uncompressed_size, + EXRThreadData *td) +{ + unsigned long dest_len = uncompressed_size; + const uint8_t *in = td->tmp; + uint8_t *out; + int c, i, j; + + if (uncompress(td->tmp, &dest_len, src, compressed_size) != Z_OK || + dest_len != uncompressed_size) + return AVERROR(EINVAL); + + out = td->uncompressed_data; + for (i = 0; i < s->ysize; i++) { + for (c = 0; c < s->nb_channels; c++) { + EXRChannel *channel = &s->channels[c]; + const uint8_t *ptr[4]; + uint32_t pixel = 0; + + switch (channel->pixel_type) { + case EXR_FLOAT: + ptr[0] = in; + ptr[1] = ptr[0] + s->xdelta; + ptr[2] = ptr[1] + s->xdelta; + in = ptr[2] + s->xdelta; + + for (j = 0; j < s->xdelta; ++j) { + uint32_t diff = (*(ptr[0]++) << 24) | + (*(ptr[1]++) << 16) | + (*(ptr[2]++) << 8); + pixel += diff; + AV_WL32(out, pixel); + } + break; + case EXR_HALF: + ptr[0] = in; + ptr[1] = ptr[0] + s->xdelta; + in = ptr[1] + s->xdelta; + for (j = 0; j < s->xdelta; j++, out += 2) { + uint32_t diff = (*(ptr[0]++) << 8) | *(ptr[1]++); + + pixel += diff; + AV_WL16(out, pixel); + } + break; + default: + av_assert1(0); + } + } + } + + return 0; +} + static int decode_block(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr) { @@ -305,7 +364,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata, if (data_size <= 0 || data_size > buf_size) return AVERROR_INVALIDDATA; - uncompressed_size = s->scan_line_size * FFMIN(s->scan_lines_per_block, s->ymax - line + 1); + s->ysize = FFMIN(s->scan_lines_per_block, s->ymax - line + 1); + uncompressed_size = s->scan_line_size * s->ysize; if ((s->compr == EXR_RAW && (data_size != uncompressed_size || line_offset > buf_size - uncompressed_size)) || (s->compr != EXR_RAW && (data_size > uncompressed_size || @@ -324,6 +384,9 @@ static int decode_block(AVCodecContext *avctx, void *tdata, case EXR_ZIP16: ret = zip_uncompress(src, data_size, uncompressed_size, td); break; + case EXR_PXR24: + ret = pxr24_uncompress(s, src, data_size, uncompressed_size, td); + break; case EXR_RLE: ret = rle_uncompress(src, data_size, uncompressed_size, td); } @@ -646,6 +709,7 @@ static int decode_frame(AVCodecContext *avctx, case EXR_ZIP1: s->scan_lines_per_block = 1; break; + case EXR_PXR24: case EXR_ZIP16: s->scan_lines_per_block = 16; break;

1 0

exr: fix error message when pixel type is not set
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Feb 28 17:37:40 2013 +0000| [9f3c90a36688f44080d344a9353afc7ee3a08cfe] | committer: Paul B Mahol exr: fix error message when pixel type is not set This only happens with missing chlist attribute from header. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f3c90a36688f4408… --- libavcodec/exr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 5d716a6..53c8f2b 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -636,7 +636,7 @@ static int decode_frame(AVCodecContext *avctx, av_log_missing_feature(avctx, "32-bit unsigned int", 1); return AVERROR_PATCHWELCOME; default: - av_log(avctx, AV_LOG_ERROR, "Unknown pixel type : %d\n", s->pixel_type); + av_log(avctx, AV_LOG_ERROR, "Missing channel list\n"); return AVERROR_INVALIDDATA; }

1 0

exr: s/bits_per_color_id/pixel_type
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Feb 28 17:27:22 2013 +0000| [4751c6c270dfce432dea0a5751c344723bf1d51e] | committer: Paul B Mahol exr: s/bits_per_color_id/pixel_type Previous naming was misleading. Also fix wrong message about missing support for 32-bit unsigned int pixel type. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4751c6c270dfce432… --- libavcodec/exr.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index d8b5f7a..5d716a6 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -70,7 +70,7 @@ typedef struct EXRThreadData { typedef struct EXRContext { AVFrame picture; int compr; - int bits_per_color_id; + enum ExrPixelType pixel_type; int channel_offsets[4]; // 0 = red, 1 = green, 2 = blue and 3 = alpha const AVPixFmtDescriptor *desc; @@ -352,7 +352,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata, // Zero out the start if xmin is not 0 memset(ptr_x, 0, bxmin); ptr_x += s->xmin * s->desc->nb_components; - if (s->bits_per_color_id == 2) { + if (s->pixel_type == EXR_FLOAT) { // 32-bit for (x = 0; x < xdelta; x++) { *ptr_x++ = exr_flt2uint(bytestream_get_le32(&r)); @@ -418,7 +418,7 @@ static int decode_frame(AVCodecContext *avctx, s->channel_offsets[1] = -1; s->channel_offsets[2] = -1; s->channel_offsets[3] = -1; - s->bits_per_color_id = -1; + s->pixel_type = -1; s->nb_channels = 0; s->compr = -1; s->buf = buf; @@ -459,7 +459,7 @@ static int decode_frame(AVCodecContext *avctx, channel_list_end = buf + variable_buffer_data_size; while (channel_list_end - buf >= 19) { EXRChannel *channel; - int current_bits_per_color_id = -1; + int current_pixel_type = -1; int channel_index = -1; int xsub, ysub; @@ -482,9 +482,9 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - current_bits_per_color_id = bytestream_get_le32(&buf); - if (current_bits_per_color_id > 2) { - av_log(avctx, AV_LOG_ERROR, "Unknown color format\n"); + current_pixel_type = bytestream_get_le32(&buf); + if (current_pixel_type > 2) { + av_log(avctx, AV_LOG_ERROR, "Unknown pixel type\n"); return AVERROR_INVALIDDATA; } @@ -497,11 +497,11 @@ static int decode_frame(AVCodecContext *avctx, } if (channel_index >= 0) { - if (s->bits_per_color_id != -1 && s->bits_per_color_id != current_bits_per_color_id) { + if (s->pixel_type != -1 && s->pixel_type != current_pixel_type) { av_log(avctx, AV_LOG_ERROR, "RGB channels not of the same depth\n"); return AVERROR_INVALIDDATA; } - s->bits_per_color_id = current_bits_per_color_id; + s->pixel_type = current_pixel_type; s->channel_offsets[channel_index] = current_channel_offset; } @@ -509,11 +509,11 @@ static int decode_frame(AVCodecContext *avctx, if (!s->channels) return AVERROR(ENOMEM); channel = &s->channels[s->nb_channels - 1]; - channel->pixel_type = current_bits_per_color_id; + channel->pixel_type = current_pixel_type; channel->xsub = xsub; channel->ysub = ysub; - current_channel_offset += 1 << current_bits_per_color_id; + current_channel_offset += 1 << current_pixel_type; } /* Check if all channels are set with an offset or if the channels @@ -624,20 +624,19 @@ static int decode_frame(AVCodecContext *avctx, } buf++; - switch (s->bits_per_color_id) { - case 2: // 32-bit - case 1: // 16-bit + switch (s->pixel_type) { + case EXR_FLOAT: + case EXR_HALF: if (s->channel_offsets[3] >= 0) avctx->pix_fmt = AV_PIX_FMT_RGBA64; else avctx->pix_fmt = AV_PIX_FMT_RGB48; break; - // 8-bit - case 0: - av_log_missing_feature(avctx, "8-bit OpenEXR", 1); + case EXR_UINT: + av_log_missing_feature(avctx, "32-bit unsigned int", 1); return AVERROR_PATCHWELCOME; default: - av_log(avctx, AV_LOG_ERROR, "Unknown color format : %d\n", s->bits_per_color_id); + av_log(avctx, AV_LOG_ERROR, "Unknown pixel type : %d\n", s->pixel_type); return AVERROR_INVALIDDATA; }

1 0

exr: track channels properties
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Feb 28 16:50:33 2013 +0000| [a71926a548af7e7923b5fcaf6b057c319947415f] | committer: Paul B Mahol exr: track channels properties Needed for proper decoding of channels with subsampling and also for remaining compression methods. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a71926a548af7e792… --- libavcodec/exr.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 2850790..d8b5f7a 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -48,6 +48,17 @@ enum ExrCompr { EXR_B44A = 7, }; +enum ExrPixelType { + EXR_UINT, + EXR_HALF, + EXR_FLOAT +}; + +typedef struct EXRChannel { + int xsub, ysub; + enum ExrPixelType pixel_type; +} EXRChannel; + typedef struct EXRThreadData { uint8_t *uncompressed_data; int uncompressed_size; @@ -73,6 +84,9 @@ typedef struct EXRContext { const uint8_t *buf, *table; int buf_size; + EXRChannel *channels; + int nb_channels; + EXRThreadData *thread_data; int thread_data_size; } EXRContext; @@ -405,6 +419,7 @@ static int decode_frame(AVCodecContext *avctx, s->channel_offsets[2] = -1; s->channel_offsets[3] = -1; s->bits_per_color_id = -1; + s->nb_channels = 0; s->compr = -1; s->buf = buf; s->buf_size = buf_size; @@ -443,6 +458,7 @@ static int decode_frame(AVCodecContext *avctx, channel_list_end = buf + variable_buffer_data_size; while (channel_list_end - buf >= 19) { + EXRChannel *channel; int current_bits_per_color_id = -1; int channel_index = -1; int xsub, ysub; @@ -489,6 +505,14 @@ static int decode_frame(AVCodecContext *avctx, s->channel_offsets[channel_index] = current_channel_offset; } + s->channels = av_realloc_f(s->channels, ++s->nb_channels, sizeof(EXRChannel)); + if (!s->channels) + return AVERROR(ENOMEM); + channel = &s->channels[s->nb_channels - 1]; + channel->pixel_type = current_bits_per_color_id; + channel->xsub = xsub; + channel->ysub = ysub; + current_channel_offset += 1 << current_bits_per_color_id; } @@ -725,6 +749,7 @@ static av_cold int decode_end(AVCodecContext *avctx) av_freep(&s->thread_data); s->thread_data_size = 0; + av_freep(&s->channels); return 0; }

1 0

lavf/avio: check for : in filenames for protocols.
by git＠videolan.org 28 Feb '13

28 Feb '13

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Wed Feb 27 19:19:15 2013 +0100| [d9fad53f4b447db1e436dcf3fc4a57e604616e6c] | committer: Nicolas George lavf/avio: check for : in filenames for protocols. If the first "special" character in a filename is a comma, it can introduce protocol options, but only if there is a colon at the end. Otherwise, it is just a filename with a comma. Fix trac ticket #2303. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9fad53f4b447db1e… --- libavformat/avio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index b00cc9d..f6af0cb 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -220,7 +220,9 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, "Missing call to av_register_all()?\n"); } - if (filename[proto_len] != ':' && filename[proto_len] != ',' || is_dos_path(filename)) + if (filename[proto_len] != ':' && + (filename[proto_len] != ',' || !strchr(filename + proto_len + 1, ':')) || + is_dos_path(filename)) strcpy(proto_str, "file"); else av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str)));

1 0