July 2011 - ffmpeg-devel - lists.ffmpeg.org

[WIP] life source
by stefano.sabatini-lala＠poste.it 04 Dec '11

04 Dec '11

Hi, proof of concept life source based on Conway's game of life. I'm using the overlay filter to test it. Enjoy. -- FFmpeg = Foolish & Fast Minimalistic Picky Ecletic Guru

7 12

[PATCH] MXF index table based seeking
by Georg Lippitsch 12 Nov '11

12 Nov '11

Here is my first try to add image table based seeking to the MXF demuxer. What the patch basically does is: 1. Parse through the whole file in mxf_read_header (instead of breaking at the first essence container). If an index table is found, it is parsed and stored in an MXFIndexTableSegment. 2. In mxf_parse_structural_metadata, the MXFIndexTableSegments are parsed and an AVIndexEntry array is created from them Seeking is then done based on the AVIndexEntry array. What I didn't really understand is how to link between MXF tracks and the slices in the index table. Sometimes, there is a track for every slice in the index table, sometimes there is not. So this part of the code is probably wrong, but help on this is very appreciated! Regards, Georg

5 43

[PATCH] scale interlaced
by Mark Himsley 24 Oct '11

24 Oct '11

I'd like to send a patch, like the attached, to extend the documentation for scale to include the interlaced aware scaling flag. Only, I don't know what the -1 value actually does... I couldn't work it out from the source. -- Mark

3 6

[PATCH] Per-frame metadata
by Nicolas George 06 Oct '11

06 Oct '11

Hi. After the recent move of the metadata API to libavutil, I rebased and reworked my proposal for per-frame metadata decoding: 1/5: Introduce av_size_mult and av_realloc_f This is very similar to the original proposal. The chunk with av_size_mult was ok-ed, but was later changed to return an AVERROR code rather than -1. I also learned in the meantime that BSD has a reallocf function, which is similar to the proposed av_realloc_f: it frees the memory if it fails, but it does not check for integer overflow. 2/5: Replace av_realloc by av_realloc_f when relevant Unchanged except for merge conflicts. 3/5: Introduce a metadata field in AVFrame It also introduces CODEC_FLAG2_FRAME_METADATA: per-frame metadata is only decoded if this flag is set. This avoids memory leaks if release_buffer does not free the metadata. 4/5: PNG: decode textual data (tEXt and zTXt chunks) Almost identical to the original proposal. 5/5: ffmpeg: dump per-frame metadata For testing purposes; I am not sure if we want it or not. Regards, -- Nicolas George

3 6

[PATCH] lavf: inspect more frames when the time base is unreliable
by anssi.hannula＠iki.fi 06 Oct '11

06 Oct '11

23.976 fps H.264 Matroska files are usually detected as 24 fps (r_frame_rate) by av_find_stream_info(). Fix that by inspecting the timestamps of 30 frames instead of just 20 for video codecs with unreliable time base. --- This seems the most straight-forward and safe fix for this issue, with the unfortunate cost of the 10 additional frames that have to be demuxed. Another (or additional) option could be to improve the heuristics themselves, if someone more experienced with this timing stuff wants to give it a try (or to provide hints). I guess one such way would be to fall back to codec time base early if it looks accurate based on the first few timestamps, but indeed I have no idea if it would break something else. Input welcome. For the record, here you can see the progression of the cumulative error of the two competing rates when detecting the frame rate: 0.042000 for 24.000000, at 0.042000, error 0.000333, cumulative 0.000000111 for 23.976024, at 0.042000, error 0.000292, cumulative 0.000000085 0.041000 for 24.000000, at 0.041000, error -0.000667, cumulative 0.000000444 for 23.976024, at 0.041000, error -0.000708, cumulative 0.000000502 0.083000 for 24.000000, at 0.083000, error -0.000333, cumulative 0.000000556 for 23.976024, at 0.083000, error -0.000417, cumulative 0.000000675 0.125000 for 24.000000, at 0.125000, error 0.000000, cumulative 0.000000556 for 23.976024, at 0.125000, error -0.000125, cumulative 0.000000691 0.167000 for 24.000000, at 0.167000, error 0.000333, cumulative 0.000000667 for 23.976024, at 0.167000, error 0.000167, cumulative 0.000000719 0.208000 for 24.000000, at 0.208000, error -0.000333, cumulative 0.000000778 for 23.976024, at 0.208000, error -0.000542, cumulative 0.000001012 0.250000 for 24.000000, at 0.250000, error 0.000000, cumulative 0.000000778 for 23.976024, at 0.250000, error -0.000250, cumulative 0.000001075 0.292000 for 24.000000, at 0.292000, error 0.000333, cumulative 0.000000889 for 23.976024, at 0.292000, error 0.000042, cumulative 0.000001076 0.333000 for 24.000000, at 0.333000, error -0.000333, cumulative 0.000001000 for 23.976024, at 0.333000, error -0.000667, cumulative 0.000001521 0.375000 for 24.000000, at 0.375000, error 0.000000, cumulative 0.000001000 for 23.976024, at 0.375000, error -0.000375, cumulative 0.000001661 0.417000 for 24.000000, at 0.417000, error 0.000333, cumulative 0.000001111 for 23.976024, at 0.417000, error -0.000083, cumulative 0.000001668 0.459000 for 24.000000, at 0.459000, error 0.000667, cumulative 0.000001556 for 23.976024, at 0.459000, error 0.000208, cumulative 0.000001712 0.500000 for 24.000000, at 0.500000, error 0.000000, cumulative 0.000001556 for 23.976024, at 0.500000, error -0.000500, cumulative 0.000001962 0.542000 for 24.000000, at 0.542000, error 0.000333, cumulative 0.000001667 for 23.976024, at 0.542000, error -0.000208, cumulative 0.000002005 0.584000 for 24.000000, at 0.584000, error 0.000667, cumulative 0.000002111 for 23.976024, at 0.584000, error 0.000083, cumulative 0.000002012 0.625000 for 24.000000, at 0.625000, error 0.000000, cumulative 0.000002111 for 23.976024, at 0.625000, error -0.000625, cumulative 0.000002403 0.667000 for 24.000000, at 0.667000, error 0.000333, cumulative 0.000002222 for 23.976024, at 0.667000, error -0.000333, cumulative 0.000002514 0.709000 for 24.000000, at 0.709000, error 0.000667, cumulative 0.000002667 for 23.976024, at 0.709000, error -0.000042, cumulative 0.000002516 0.750000 for 24.000000, at 0.750000, error 0.000000, cumulative 0.000002667 for 23.976024, at 0.750000, error -0.000750, cumulative 0.000003078 0.792000 for 24.000000, at 0.792000, error 0.000333, cumulative 0.000002778 for 23.976024, at 0.792000, error -0.000458, cumulative 0.000003288 Without the patch the detection stops at this point. Error for 24.000 is still smaller and it is wrongly selected. Raising the frame count to 30 allows the cumulative error for 24.000 to raise significantly when compared to 23.976, therefore ensuring the correct selection: 0.834000 for 24.000000, at 0.834000, error 0.000667, cumulative 0.000003222 for 23.976024, at 0.834000, error -0.000167, cumulative 0.000003316 0.876000 for 24.000000, at 0.876000, error 0.001000, cumulative 0.000004222 for 23.976024, at 0.876000, error 0.000125, cumulative 0.000003332 0.917000 for 24.000000, at 0.917000, error 0.000333, cumulative 0.000004333 for 23.976024, at 0.917000, error -0.000583, cumulative 0.000003672 0.959000 for 24.000000, at 0.959000, error 0.000667, cumulative 0.000004778 for 23.976024, at 0.959000, error -0.000292, cumulative 0.000003757 1.001000 for 24.000000, at 1.001000, error 0.001000, cumulative 0.000005778 for 23.976024, at 1.001000, error 0.000000, cumulative 0.000003757 1.042000 for 24.000000, at 1.042000, error 0.000333, cumulative 0.000005889 for 23.976024, at 1.042000, error -0.000708, cumulative 0.000004259 1.084000 for 24.000000, at 1.084000, error 0.000667, cumulative 0.000006333 for 23.976024, at 1.084000, error -0.000417, cumulative 0.000004432 1.126000 for 24.000000, at 1.126000, error 0.001000, cumulative 0.000007333 for 23.976024, at 1.126000, error -0.000125, cumulative 0.000004448 1.168000 for 24.000000, at 1.168000, error 0.001333, cumulative 0.000009111 for 23.976024, at 1.168000, error 0.000167, cumulative 0.000004476 1.209000 for 24.000000, at 1.209000, error 0.000667, cumulative 0.000009556 for 23.976024, at 1.209000, error -0.000542, cumulative 0.000004769 libavformat/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 4f51c26..8227c91 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2257,7 +2257,7 @@ int av_find_stream_info(AVFormatContext *ic) break; /* variable fps and no guess at the real fps */ if( tb_unreliable(st->codec) && !(st->r_frame_rate.num && st->avg_frame_rate.num) - && st->info->duration_count<20 && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) + && st->info->duration_count<30 && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) break; if(st->parser && st->parser->parser->split && !st->codec->extradata) break; -- 1.7.3

9 36

[PATCH 1/5] Add a shift parameter to celp_lp_synthesis_filter for reuse by the G.723.1 decoder
by banan＠ludd.ltu.se 29 Sep '11

29 Sep '11

From: Mohamed Naufal Basheer <naufal11(a)gmail.com> --- libavcodec/celp_filters.c | 4 ++-- libavcodec/celp_filters.h | 3 ++- libavcodec/ra144.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c index 26a62ee..f9e65f4 100644 --- a/libavcodec/celp_filters.c +++ b/libavcodec/celp_filters.c @@ -58,7 +58,7 @@ void ff_celp_circ_addf(float *out, const float *in, int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs, const int16_t *in, int buffer_length, int filter_length, int stop_on_overflow, - int rounder) + int shift, int rounder) { int i,n; @@ -67,7 +67,7 @@ int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs, for (i = 1; i <= filter_length; i++) sum -= filter_coeffs[i-1] * out[n-i]; - sum = (sum >> 12) + in[n]; + sum = ((sum >> 12) + in[n]) >> shift; if (sum + 0x8000 > 0xFFFFU) { if (stop_on_overflow) diff --git a/libavcodec/celp_filters.h b/libavcodec/celp_filters.h index 145e3d3..e7eb02a 100644 --- a/libavcodec/celp_filters.h +++ b/libavcodec/celp_filters.h @@ -63,6 +63,7 @@ void ff_celp_circ_addf(float *out, const float *in, * @param filter_length filter length (10 for 10th order LP filter) * @param stop_on_overflow 1 - return immediately if overflow occurs * 0 - ignore overflows + * @param shift the result is shifted right by this value * @param rounder the amount to add for rounding (usually 0x800 or 0xfff) * * @return 1 if overflow occurred, 0 - otherwise @@ -75,7 +76,7 @@ void ff_celp_circ_addf(float *out, const float *in, int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs, const int16_t *in, int buffer_length, int filter_length, int stop_on_overflow, - int rounder); + int shift, int rounder); /** * LP synthesis filter. diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 9baa068..3f1e6f7 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -1715,6 +1715,6 @@ void ff_subblock_synthesis(RA144Context *ractx, const uint16_t *lpc_coefs, 10*sizeof(*ractx->curr_sblock)); if (ff_celp_lp_synthesis_filter(ractx->curr_sblock + 10, lpc_coefs, - block, BLOCKSIZE, 10, 1, 0xfff)) + block, BLOCKSIZE, 10, 1, 0, 0xfff)) memset(ractx->curr_sblock, 0, 50*sizeof(*ractx->curr_sblock)); } -- 1.7.1

3 17

[PATCH] Extract rotation in MOV metadata
by Dave Badia 27 Sep '11

27 Sep '11

Interrogate MOV metadata for orientation of video so that software can determine if the video needs to be rotated for proper display. --- libavformat/isom.h | 1 + libavformat/mov.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 1df666f..dde1ba1 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -123,6 +123,7 @@ typedef struct MOVStreamContext { int width; ///< tkhd width int height; ///< tkhd height int dts_shift; ///< dts shift when ctts is negative + int rotation; ///< rotation 0 if normal, 180 if inverted } MOVStreamContext; typedef struct MOVContext { diff --git a/libavformat/mov.c b/libavformat/mov.c index e9435a9..7faa225 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1907,6 +1907,11 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->width = width >> 16; sc->height = height >> 16; + if(display_matrix[0][0] == -65536 && display_matrix[1][1] == -65536) { + sc->rotation = 180; + } + + // transform the display width/height according to the matrix // skip this if the display matrix is the default identity matrix // or if it is rotating the picture, ex iPhone 3GS

9 28

[patch] libpostproc: mmx code uses stack below %esp
by yumkam＠mail.ru 23 Sep '11

23 Sep '11

Hello! While trying to catch unrelated bug (that finally was not bug, but misconfiguration [-lavdopts fast was too fragile for broken mpeg-2 stream]), I've run mplayer under valgrind, and got bunch of warnings: ==32414== ==32414== Invalid write of size 8 ==32414== at 0x874CF44: postProcess_MMX2 (in /path/to/mplayer) ==32414== Address 0xbeffa9d0 is just below the stack ptr. To suppress, use: --workaround-gcc296-bugs=yes I, of course, don't use gcc-2.96 ;-) I've looked into libpostproc/postprocess_template.c, and, indeed, it uses memory below %esp: === cut === static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext *c) { [...] __asm__ volatile( "pxor %%mm7, %%mm7 \n\t" "lea -40(%%"REG_SP"), %%"REG_c" \n\t" // make space for 4 8-byte vars "and "ALIGN_MASK", %%"REG_c" \n\t" // align ... } [...] static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) [...same...] static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){ [...same...] === cut === Not sure if this *must* be fixed, but it feels unsafe, so... Patch attached; doVertDefFilter and do_a_deblock changes should not affect speed, not sure about dering one.

3 9

WunderRadio changes
by diego＠biurrun.de 20 Sep '11

20 Sep '11

WunderRadio uses FFmpeg and even provides source: http://www.wunderradio.com/code.html I just had a 5 minute look, so I don't know any details, but there are some changes in there that we might wish to pick up: RTSP stuff and some ARM libswscale improvements. Diego

8 12

Re: [FFmpeg-devel] Delivery Status Notification (Failure)
by Michael Chinen 20 Sep '11

20 Sep '11

Hi, I know you guys are probably gearing up for GSoC. As a reminder I was doing the seeking api for GSoC 2010. This feature was not completed. Most of my energy went into getting the FLAC parser commited (and that took several months past GSoC.) I did submit some patches with the basic functionality over a few iterations, but they need a lot more work to pass review. This year I am not eligible as a student, but I'm planning to work on the seeking/index API more in may/june if no one else is doing this for GSoC (and you guys haven't already implemented it - I haven't been following so closely). Or if someone is, I would be happy to help out if they wished to continue my patches. Also please note that the most current patches are not the ones on the ml. I thought to tell you so you can plan GSoC accordingly if this info is any help, and to ask if I should in fact continue that work. I did some simple searches but found no references to indicate that someone is working on it. Michael

4 8