January 2012 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] ffmpeg: fix -map_channel being ignored when resampling is not needed.
by Clément Bœsch 31 Jan '12

31 Jan '12

From: Clément Bœsch <clement.boesch(a)smartjog.com> --- ffmpeg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 3c29f32..a794dd3 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1245,7 +1245,7 @@ need_realloc: ost->sync_opts = lrintf(get_sync_ipts(ost) * enc->sample_rate) - av_fifo_size(ost->fifo) / (enc->channels * osize); // FIXME wrong - if (ost->audio_resample) { + if (ost->audio_resample || ost->audio_channels_mapped) { buftmp = audio_buf; size_out = swr_convert(ost->swr, ( uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize), (const uint8_t*[]){buf }, size / (dec->channels * isize)); -- 1.7.8.3

3 2

Re: [FFmpeg-devel] Fixing av_seek
by Don Moir 31 Jan '12

31 Jan '12

For the most part, I have seeking in my app working really well. I have flags for exact time seeking or key frame seeking. When doing exact time seeking, I have a seek slop factor that currently ranges from 0 to 1/2 second. I compute this depending on the file and it just governs how close you want it to the timestamp of interest. In the odd case where the actual seeked to time is far off from the requested timestamp, it could go back to keyframe seeking and this could be controlled with flags at a users degression. This is a pretty rare event though considering that large files generally have an adequate supply of keyframes and with low res or short files, it's quick enough to do it. Most of the work has been in over coming a few problems with avformat_seek_file and the related decoders. The problem is you cannot have avformat_seek_file failing when it should not and even if it succeeds it must be doing the right thing. Some cases when avformat_seek_file fails or fails to do the right thing: o - No frames are marked as keyframes. avformat_seek_file returns -1. I think I only have one file like this so we could say this is a rare case. I just make sure I at least seek to the first frame. In order to keep avformat_seek_file from failing, you have to mark the first frame as a key frame and I do this. The one file I have like this is filecopy.avi and it can be found here: https://ffmpeg.org/trac/ffmpeg/ticket/504 o - The ogg decoder read_seek function is weak. It does not make an attempt to create it's index_entries and without these seeking is going to be bad. This is outlined here: https://ffmpeg.org/trac/ffmpeg/ticket/941 o - The matroska decoder read_seek function has a couple bugs that effects at least one file I have and that is outlined here: https://ffmpeg.org/trac/ffmpeg/ticket/958 With the above changes, things work very well but there are a few odd cases still. These cases don't effect things too much. Mostly just a lag after seeking is done and before the next frame can be displayed. This happens only on a few ogg files and matroska files that I know of. It could be because of improper timestamps, improper index_entries, or even just a bad file. Not sure. I have a case with WMV2 where after seeking is done, audio is far behind. This was easy for me to deal with and I have not investigated it further at present. I tested about 200 files of varing sizes, formats, etc and it works pretty good when the above fixes are applied. For most file formats, I don't have to do much and they just work.

2 2

[PATCH] libopenjpeg GRAY16 decoding
by Michael Bradshaw 30 Jan '12

30 Jan '12

Hi, attached patch adds support for decoding GRAY16 video with libopenjpeg. While I've got your attention, I was adding support for GRAY8A and RGBA64 and I kept getting an error "impossible to convert between the formats supported by the filter 'auto-inserted scale 0' and the filter 'out'" when trying to encode a GRAY8A or RGBA64 sample. Is this a known issue or should I file it in the bug tracker? Thanks! Michael

3 12

[PATCH]64bit png decoding
by Carl Eugen Hoyos 30 Jan '12

30 Jan '12

Hi! Attached patch allows to reencode the sample from ticket #639 to tiff on BE. Please comment, Carl Eugen

2 3

[PATCH]Fix 48bit loco png
by Carl Eugen Hoyos 30 Jan '12

30 Jan '12

Hi! Attached patch fixes 48bit loco png and simplifies the code imo. Please review, Carl Eugen

2 2

[PATCH 1/2] lavf: make max_analyze_duration warning an information log.
by Clément Bœsch 30 Jan '12

30 Jan '12

This avoids the confusion of having a warning almost everytime we are probing a mp3. It may suppose the file is not muxed correctly while it is actually a normal behaviour. --- libavformat/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 005704c..08cadd1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2520,7 +2520,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) t = FFMAX(t, av_rescale_q(st->codec_info_nb_frames, (AVRational){st->avg_frame_rate.den, st->avg_frame_rate.num}, AV_TIME_BASE_Q)); if (t >= ic->max_analyze_duration) { - av_log(ic, AV_LOG_WARNING, "max_analyze_duration %d reached at %"PRId64"\n", ic->max_analyze_duration, t); + av_log(ic, AV_LOG_INFO, "max_analyze_duration %d reached at %"PRId64"\n", ic->max_analyze_duration, t); break; } st->info->codec_info_duration += pkt->duration; -- 1.7.8.4

2 14

[PATCH 1/2] ass: use av_asprintf() instead of a temporary stack buffer.
by Clément Bœsch 30 Jan '12

30 Jan '12

--- Note: subtitle_header is not supposed to be already allocated, right? --- libavcodec/ass.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index cb0babf..8c94d72 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -29,9 +29,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx, int bold, int italic, int underline, int alignment) { - char header[512]; - - snprintf(header, sizeof(header), + avctx->subtitle_header = av_asprintf( "[Script Info]\r\n" "ScriptType: v4.00+\r\n" "\r\n" @@ -44,7 +42,6 @@ int ff_ass_subtitle_header(AVCodecContext *avctx, font, font_size, color, color, back_color, back_color, -bold, -italic, -underline, alignment); - avctx->subtitle_header = av_strdup(header); if (!avctx->subtitle_header) return AVERROR(ENOMEM); avctx->subtitle_header_size = strlen(avctx->subtitle_header); -- 1.7.8.4

2 5

[PATCH] YUVA444 support for libopenjpeg encoder
by Michael Bradshaw 30 Jan '12

30 Jan '12

Hi, attached patch adds YUVA444 pixel format support for libopenjpeg encoder. I haven't pushed it to my repository, as I've borked it (experimenting with git :) ) and plan to recreate it someday. Thanks, Michael

2 1

[PATCH] diracdec: Fix integer overflow leading to out of global array read.
by Michael Niedermayer 30 Jan '12

30 Jan '12

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/diracdec.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 03e7d0a..c96b37a 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1172,7 +1172,7 @@ static void propagate_block_data(DiracBlock *block, int stride, int size) * Dirac Specification -> * 12. Block motion data syntax */ -static void dirac_unpack_block_motion_data(DiracContext *s) +static int dirac_unpack_block_motion_data(DiracContext *s) { GetBitContext *gb = &s->gb; uint8_t *sbsplit = s->sbsplit; @@ -1192,7 +1192,9 @@ static void dirac_unpack_block_motion_data(DiracContext *s) ff_dirac_init_arith_decoder(arith, gb, svq3_get_ue_golomb(gb)); /* svq3_get_ue_golomb(gb) is the length */ for (y = 0; y < s->sbheight; y++) { for (x = 0; x < s->sbwidth; x++) { - int split = dirac_get_arith_uint(arith, CTX_SB_F1, CTX_SB_DATA); + unsigned int split = dirac_get_arith_uint(arith, CTX_SB_F1, CTX_SB_DATA); + if (split > 2) + return -1; sbsplit[x] = (split + pred_sbsplit(sbsplit+x, s->sbwidth, x, y)) % 3; } sbsplit += s->sbwidth; @@ -1221,6 +1223,8 @@ static void dirac_unpack_block_motion_data(DiracContext *s) propagate_block_data(block, s->blwidth, step); } } + + return 0; } static int weight(int i, int blen, int offset) @@ -1675,7 +1679,8 @@ static int dirac_decode_picture_header(DiracContext *s) if (s->num_refs) { if (dirac_unpack_prediction_parameters(s)) /* [DIRAC_STD] 11.2 Picture Prediction Data. picture_prediction() */ return -1; - dirac_unpack_block_motion_data(s); /* [DIRAC_STD] 12. Block motion data syntax */ + if (dirac_unpack_block_motion_data(s)) /* [DIRAC_STD] 12. Block motion data syntax */ + return -1; } if (dirac_unpack_idwt_params(s)) /* [DIRAC_STD] 11.3 Wavelet transform data */ return -1; -- 1.7.5.4

2 2

[PATCH] fate: add support for specifying the shell used to run configure
by Michael Niedermayer 30 Jan '12

30 Jan '12

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- tests/fate.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/fate.sh b/tests/fate.sh index e04c871..a7b15cd 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -41,7 +41,7 @@ update()( configure()( cd ${build} || return - ${src}/configure \ + ${shell} ${src}/configure \ --prefix="${inst}" \ --samples="${samples}" \ --enable-gpl \ -- 1.7.5.4

2 2