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

[PATCH] rtpdec: make the NTP time values unsigned.
by flameeyes＠gmail.com 09 May '14

09 May '14

As per RFC3550, section 4, the NTP time is provided as 64-bit unsigned integer, so follow the same logic here. --- libavformat/rtpdec.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 86af2b9..87fd419 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -148,8 +148,8 @@ struct RTPDemuxContext { RTPStatistics statistics; ///< Statistics for this stream (used by RTCP receiver reports) /* rtcp sender statistics receive */ - int64_t last_rtcp_ntp_time; // TODO: move into statistics - int64_t first_rtcp_ntp_time; // TODO: move into statistics + uint64_t last_rtcp_ntp_time; // TODO: move into statistics + uint64_t first_rtcp_ntp_time; // TODO: move into statistics uint32_t last_rtcp_timestamp; // TODO: move into statistics /* rtcp sender statistics */ -- 1.7.1.1

4 3

[PATCH] lavu: add av_get_color_string() and use it in -colors option
by stefano.sabatini-lala＠poste.it 27 Oct '13

27 Oct '13

--- cmdutils.c | 13 +++++++++++++ cmdutils.h | 6 ++++++ cmdutils_common_opts.h | 1 + doc/fftools-common-opts.texi | 3 +++ libavutil/parseutils.c | 18 ++++++++++++++++++ libavutil/parseutils.h | 14 ++++++++++++++ 6 files changed, 55 insertions(+), 0 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index 514ebad..549c673 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -713,6 +713,19 @@ void show_pix_fmts(void) } } +void show_colors(void) +{ + char buf[256]; + int i; + + /* print header */ + fprintf(stderr, av_get_color_string(buf, sizeof(buf), -1)); + + for (i = 0; av_get_color_string(buf, sizeof(buf), i); i++) { + printf("%s", buf); + } +} + int read_yesno(void) { int c = getchar(); diff --git a/cmdutils.h b/cmdutils.h index c3d8a42..191ee36 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -195,6 +195,12 @@ void show_formats(void); void show_codecs(void); /** + * Print a listing containing all the color names supported by the + * program. + */ +void show_colors(void); + +/** * Print a listing containing all the filters supported by the * program. */ diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h index da30997..1e3799a 100644 --- a/cmdutils_common_opts.h +++ b/cmdutils_common_opts.h @@ -6,6 +6,7 @@ { "version", OPT_EXIT, {(void*)show_version}, "show version" }, { "formats" , OPT_EXIT, {(void*)show_formats }, "show available formats" }, { "codecs" , OPT_EXIT, {(void*)show_codecs }, "show available codecs" }, + { "colors" , OPT_EXIT, {(void*)show_colors }, "show recognized color names" }, { "bsfs" , OPT_EXIT, {(void*)show_bsfs }, "show available bit stream filters" }, { "protocols", OPT_EXIT, {(void*)show_protocols}, "show available protocols" }, { "filters", OPT_EXIT, {(void*)show_filters }, "show available filters" }, diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d72ca5c..5b25971 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -59,6 +59,9 @@ Codec can handle input truncated at random locations instead of only at frame bo @item -bsfs Show available bitstream filters. + at item -colors +Show recognized color names. + @item -protocols Show available protocols. diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index d67d31b..e701620 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -373,6 +373,24 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, return 0; } +char *av_get_color_string(char *buf, int buf_size, int color_idx) +{ + /* print header */ + if (color_idx < 0) { + snprintf(buf, buf_size, "%-32s #RRGGBB\n", "name"); + } else { + ColorEntry *color; + if (color_idx >= FF_ARRAY_ELEMS(color_table)) + return NULL; + color = &color_table[color_idx]; + snprintf(buf, buf_size, "%-32s #%02X%02X%02X\n", + color->name, + color->rgb_color[0], color->rgb_color[1], color->rgb_color[2]); + } + + return buf; +} + /* get a positive number between n_min and n_max, for a maximum length of len_max. Return -1 if error. */ static int date_get_num(const char **pp, diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index c3986af..3e3a34b 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -73,6 +73,20 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, void *log_ctx); /** + * Print in buf the string corresponding to the color with + * number color_idx, or an header if color_idx is negative. + * + * @param buf the buffer where to write the string + * @param buf_size the size of buf + * @param color_idx the number of the pixel format to print the + * corresponding info string, or a negative value to print the + * corresponding header. + * @return the printed string or NULL if color_idx doesn't correspond to any + * color + */ +char *av_get_color_string(char *buf, int buf_size, int color_idx); + +/** * Parses timestr and returns in *time a corresponding number of * microseconds. * -- 1.7.2.3

5 18

[WIP] rotate filter(s)
by stefano.sabatini-lala＠poste.it 12 Jun '13

12 Jun '13

Hi, in attachment a first stub at the rotate filter. I don't know if it is a good idea to keep the float variant, while the rotate_ss may be useful (and the rotation angle could be made parametric). The integer-only rotating code is taken from tests/rotozoom.c, I don't know if we have a corresponding version in the libs. fill_line_with_color() and draw_rectangle() are duplicated from vf_pad.c, so maybe we should make them public (or at least ff_ them), drawutils.[ch] may be a good place where to put them. Note that ffplay/SDL doesn't work with odd width/height sizes, so you may need to rescale to an even wxh size (this could be done with a parametric scale as discussed some months ago). What this rotate filter still lacks, apart a resolution to the refactoring problems mentioned above, is a YUV planar version of the rotating function, and possibly the extension to other RGB variants, which should be pretty easy to add. Everyone feel free to continue to work on this and post an updated patch. Regards. -- FFmpeg = Fostering and Frightening Multimedia Portable Emblematic Guru

9 23

Yamaha SMAF 'CNTI' chunk is wrong.
by yoshihisa.uchida＠gmail.com 07 Jan '13

07 Jan '13

Hi, ffmpeg developers, For Yamaha SMAF, Contents Info chunk ('CNTI') includes only following members: - Contents Class - Contents Type - Contents Code Type - Copy Status - Copy Counts (see http://smaf-yamaha.com/what/s52.html) But, in the current ffmpeg, 'CNTI' includes metadata ("VN:libavcodec,"). According to SMAF Specifications Optional Data Chunk (http://smaf-yamaha.com/what/s52.html) I corrected that metadata include Optional Data Chunk ('OPDA'). Regards, uchan

5 5

webm streaming
by Dirk Griffioen 14 Jun '12

14 Jun '12

Hi, I hope this is posted at the right place. I would like to enquire if there is any interest for an ffmpeg patch to (I think) the matroska muxer so that it would allow for live webm streams. The Matroska spec mentions it is possible to have live streams, given the stream is a little altered. Gstreamer has such a patch in place. Any pointers would be greatly appreciated. Best, Dirk

5 11

[PATCH] OpenEXR decoder
by jimmy＠ghost.dk 06 Apr '12

06 Apr '12

Hi, Here is my stab at a OpenEXR decoder. It only supports 16-bit and 32-bit float. 8-bit integer is in theory supported aswell by the format, but I have yet to find software which supports writing it, but it should be quite straigthforward to implement aswell, but didn't want to touch it since I had nothing to test with. The 32-bit float path is very slow (about 60x slower than the 16-bit path) and not optimized in way yet. -- Best Regards Jimmy Christensen Developer Ghost A/S

9 77

[PATCH] ffplay: force refresh event when the SDL window is resized
by Stefano Sabatini 15 Mar '12

15 Mar '12

Address roundup issue #604, #1031, #1804. --- ffplay.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ffplay.c b/ffplay.c index 5032586..a6d2cd2 100644 --- a/ffplay.c +++ b/ffplay.c @@ -132,6 +132,7 @@ typedef struct VideoState { AVInputFormat *iformat; int no_background; int abort_request; + int force_refresh; int paused; int last_paused; int seek_req; @@ -1119,9 +1120,15 @@ static void video_refresh_timer(void *opaque) if (is->video_st) { retry: - if (is->pictq_size == 0) { - //nothing to do, no picture to display in the que - } else { + if (is->pictq_size == 0 && is->force_refresh) { + // display last picture in the queue + SDL_LockMutex(is->pictq_mutex); + is->pictq_size++; + is->pictq_rindex = (is->pictq_rindex + VIDEO_PICTURE_QUEUE_SIZE -1) % VIDEO_PICTURE_QUEUE_SIZE; + SDL_CondSignal(is->pictq_cond); + SDL_UnlockMutex(is->pictq_mutex); + } + if (is->pictq_size) { double time= av_gettime()/1000000.0; double next_target; /* dequeue the picture */ @@ -1140,7 +1147,7 @@ retry: }else{ next_target= vp->target_clock + is->video_clock - vp->pts; //FIXME pass durations cleanly } - if(framedrop && time > next_target){ + if (framedrop && !is->force_refresh && time > next_target) { is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR; if(is->pictq_size > 1 || time > next_target + 0.5){ /* update queue size and signal for next picture */ @@ -1211,6 +1218,7 @@ retry: is->pictq_size--; SDL_CondSignal(is->pictq_cond); SDL_UnlockMutex(is->pictq_mutex); + is->force_refresh = 0; } } else if (is->audio_st) { /* draw the next audio frame */ @@ -2759,6 +2767,8 @@ static void event_loop(void) break; case SDLK_f: toggle_full_screen(); + if (cur_stream) + cur_stream->force_refresh = 1; break; case SDLK_p: case SDLK_SPACE: @@ -2813,6 +2823,7 @@ static void event_loop(void) pos += incr; stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), (int64_t)(incr * AV_TIME_BASE), 0); } + cur_stream->force_refresh = 1; } break; default: @@ -2864,6 +2875,7 @@ static void event_loop(void) SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL); screen_width = cur_stream->width = event.resize.w; screen_height= cur_stream->height= event.resize.h; + cur_stream->force_refresh = 1; } break; case SDL_QUIT: @@ -2881,6 +2893,12 @@ static void event_loop(void) default: break; } + + if (cur_stream && cur_stream->force_refresh) { + event.type = FF_REFRESH_EVENT; + event.user.data1 = cur_stream; + SDL_PushEvent(&event); + } } } -- 1.7.2.3

3 7

dvd/vob "decoder" part 1: the system itself
by erik＠arawix.com 03 Feb '12

03 Feb '12

Hello; Included are the files, and patches needed for the dvd decoder. I threw away my original system on trying to insert packets into the main stream (as the "attachment/data" type stream). The reason for that is that the dvd data stream, that contains commands for the client can change/insert packets "in the past". Example; a user seeks back. The DVD ifo system will insert packets containing "change the subtitle color" so it works ok for the displayed cell/chapter. LibAV doesn't expect new packets inserted "backwards" in the stream, and the buffer system gets all messed up because packet sizes are off. Changing to a new system means my "hack" on decoding the packet header isn't needed any more, and except for stream flagging the mpegps demuxer should be unchanged. My attachment decoder is not needed anymore (for those who looked at it, only dvd_protocol.c/h are still needed). The new system uses a callback, that the user registers. This is, after much experimenting, the best way I could come up with. The callback though is registered per protocol, and thus changes are needed in "gasp" URLContext. Reason for keeping it per context? Well, a user can be reading from several dvd devices at the same time if he/she uses the avlibs. Or some end devices (like the ps3) send several request to open a file at the same time. If one callback is registered for the whole library, this messes up the system. Whats send in the callback? Basically AVDVDParseContext packets. They contain a type (the enum effdvd_Type ) that tells the end-user app what should be done, and a pts timestamp in dvd time (90000/tick). The packets should be handled at that time. There are some packets which are obvious (like: new subtitle palette) and some that are not. The most important one is effdvd_Reset_IFO. effdvd_Reset_IFO asks the end-user app: clear your streams, flag all streams you are using as invalid (more later on that), and be prepared to re-init all your codec decoders. Why does one need to do that? Because a vob file 1 might contain audio data in ac3 with 2 channels, while a vob 2 might have it in 6 channels. Or the resolution of the video stream might change (from dvd pal to dvd ntsc widescreen for example). First; DVD's may contain up to 64 streams. One of the patches changes the MAX_STREAMS constant to match that. Second; Stream re-init. I implemented this by adding a flag to AVStream (at the end, discard_flags). Set this to one in end-user app, and this will tell the demuxer that this stream has been discarded by user (user closed all codecs, etc). It works by telling the demuxer that once it dedects a certain packet type, and normally does a av_new_stream; don't re-add the stream to the end of the new list (pushing more and more streams on the list). Example; suppose the discard_flag is set to 1 for the video stream (and we only have one). When a new packet is received by the demuxer, its loop will not find a valid video stream anymore. It thus will create a new one, but will fill the slot for the "old" video stream with the new video stream. Don't know if this text makes sense, bit a quick look at the code should be helpful. Why not do this in the protocol reader? Basically 1) because the protocol doesn't and shouldn't know about the streams and 2) because the end-user needs to close and free his/her decoders. Once that's done, the demuxer doesn't even know. Next; chapter seeking. I added a new flag for that: #define AVSEEK_FLAG_DIRECT 8 ///< seek directly, skipping any stamps and translation #define AVSEEK_FLAG_CHAPTER 16 ///< seek to chapter, if supported Using that will basically use av_seek_frame() to override a search like it does for AVSEEK_FLAG_BYTE. The arguments timestamp will thus position chapters, instead of timestamps. Summary; whats the total change; 1) The whole setup adds a protocol handler called ffdvd. User inits his open file with av_open_input_file ("dvdread:e:/") or av_open_input_file("dvdread:/cdrom1/") 2) User registers a callback by using url_fset_protocol_callback(), a new function in avio.c. I tried to make it generic. 3) User polls streams as before for audio/video 4) User can get callback events from the protocol, with timestamps. 5) Events get examined for the timestamps on the protocol packet, and handled upon. 6) When needed, these events are executed, and for some functions a notify is send back (example, when user selects a button dvd_protocol_select_button() is called). 7) That's it. How well does this all work? I build a example app separate from ffmpeg, on which rather big changes are going to be needed. Note that these changes have almost nothing to do with the dvd protocol handler. They are mostly implementing the "we should look at this/this is wrong/etc" comments (example; discarding new streams). I have ffplay ok, but will need to work with someone on ffmpeg. Source is. Offcourse available. I am attaching the main files here, and the most important patches. Since I am not sure on how the continue on this, please tell me how this needs to be handled (ege do patches first, what order,. Etc. ) If the system is accepted, at least one patch needs a major version bump. I should probably split up some patches too. Note 2; I need to talk to the people for libdvdread, since I fixed a few problems in their code (and added one function to read attributes that its not available now dvdnav_get_video_attributes()). To have this working, we would offcourse also need to depend on libdvdread (if the user enabled it by ./configure, changes for makesfiles and that needed). Note 3: we will probably need some commandline extensions to specify seeking to a chapter, etc. for ffmpeg I have worked on and of on this for the better part of 2 months figuring out the best and least intrusive way. If this all gets rejected, I am fine with that. If it doesn't, also. Just let me know. Erik

6 10

[PATCH] Port tinterlace filter from MPlayer.
by stefano.sabatini-lala＠poste.it 01 Jan '12

01 Jan '12

--- configure | 1 + doc/filters.texi | 26 +++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/avfilter.c | 2 +- libavfilter/vf_tinterlace.c | 260 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 290 insertions(+), 1 deletions(-) create mode 100644 libavfilter/vf_tinterlace.c diff --git a/configure b/configure index 0538201..d3e2c14 100755 --- a/configure +++ b/configure @@ -1402,6 +1402,7 @@ udp_protocol_deps="network" # filters ocv_smooth_filter_deps="libopencv" +tinterlace_filter_deps="gpl" yadif_filter_deps="gpl" # libraries diff --git a/doc/filters.texi b/doc/filters.texi index d000276..3397989 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -390,6 +390,32 @@ not specified it will use the default value of 16. Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. + at section tinterlace + +Perform temporal field interlacing - merge pairs of frames into an +interlaced frame, halving the framerate. Even frames are moved into +the upper field, odd frames to the lower field. + +The frames are counted starting from 1, so the first input frame is +considered odd. + +Accepts a parameters specifying the mode. Available modes are: + +0 Move odd frames into the upper field of the new frame, even into the + lower field, generating a double height frame at half framerate. + +1 Only output odd frames, even frames are dropped; height + unchanged, half framerate + +2 Only output even frames, odd frames are dropped; height + unchanged, half framerate + +3 Expand each frame to full height, but pad alternate lines with + black; framerate unchanged and double height. + +4 Interleave even lines from even frames with odd lines from odd + frames. Height unchanged at half framerate. + @section unsharp Sharpen or blur the input video. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 174b83e..431fe33 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -34,6 +34,7 @@ OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o +OBJS-$(CONFIG_TINTERLACE_FILTER) += vf_tinterlace.o OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index ec7d933..5224fde 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -54,6 +54,7 @@ void avfilter_register_all(void) REGISTER_FILTER (PIXELASPECT, pixelaspect, vf); REGISTER_FILTER (SCALE, scale, vf); REGISTER_FILTER (SLICIFY, slicify, vf); + REGISTER_FILTER (TINTERLACE, tinterlace, vf); REGISTER_FILTER (UNSHARP, unsharp, vf); REGISTER_FILTER (VFLIP, vflip, vf); REGISTER_FILTER (YADIF, yadif, vf); diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 221dfaa..72566e5 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* #define DEBUG */ +#define DEBUG #include "libavcodec/audioconvert.c" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c new file mode 100644 index 0000000..771c6be --- /dev/null +++ b/libavfilter/vf_tinterlace.c @@ -0,0 +1,260 @@ +/* + * Copyright (C) 2010 Stefano Sabatini + * Copyright (C) 2003 Michael Zucchi <notzed at ximian.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "libavcore/imgutils.h" +#include "avfilter.h" + +typedef struct { + /** + * 0: Move odd frames into the upper field of the new image, even into the lower field, generating a double-height video at half framerate. + * 1: Only output odd frames, even frames are dropped; height unchanged, half framerate + * 2: Only output even frames, odd frames are dropped; height unchanged, half framerate + * 3: Expand each frame to double height, but pad alternate lines with black; framerate unchanged. + * 4: Interleave even lines from even frames with odd lines from odd frames. Height unchanged at half framerate. + */ + int mode; + + int vsub; ///< chroma vertical subsampling + int frame; ///< frame number + int frame_pending; ///< tell if there is a pending frame ready to be sent + AVFilterBufferRef *picref; ///< previously stored picref +} TInterlaceContext; + +static int query_formats(AVFilterContext *ctx) +{ + static const enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV410P, + PIX_FMT_YUV444P, PIX_FMT_GRAY8, PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + + return 0; +} + +static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + TInterlaceContext *tinterlace = ctx->priv; + tinterlace->mode = 0; + tinterlace->picref = NULL; + tinterlace->frame = 1; + tinterlace->frame_pending = 0; + + if (args) sscanf(args, "%d", &tinterlace->mode); + + if (tinterlace->mode < 0 || tinterlace->mode > 4) { + av_log(ctx, AV_LOG_ERROR, + "Unknown mode %d, use a value between 0 and 4\n", tinterlace->mode); + return AVERROR(EINVAL); + } + + return 0; +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + TInterlaceContext *tinterlace = ctx->priv; + + if (tinterlace->picref) avfilter_unref_buffer(tinterlace->picref); +} + +static int config_out_props(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + AVFilterLink *inlink = outlink->src->inputs[0]; + TInterlaceContext *tinterlace = ctx->priv; + + tinterlace->vsub = av_pix_fmt_descriptors[outlink->format].log2_chroma_h; + outlink->w = inlink->w; + outlink->h = (tinterlace->mode == 0 || tinterlace->mode == 3) ? inlink->h*2 : inlink->h; + + av_log(ctx, AV_LOG_INFO, "mode:%d in_h:%d out_h:%d\n", + tinterlace->mode, inlink->h, outlink->h); + + return 0; +} + +static void copy_picture_fields(uint8_t *dst[4], int dst_linesize[4], + const uint8_t *src[4], int src_linesize[4], + enum PixelFormat format, int w, int + src_h, int lower_fields, + int only_half_src_fields, int src_lower_fields) +{ + int i, k = 1, vsub = av_pix_fmt_descriptors[format].log2_chroma_h; + if (only_half_src_fields) { + src_h /= 2; + k = 2; + } + + for (i = 0; i < 3; i++) { + int h = i == 1 || i == 2 ? src_h >> vsub : src_h; + int linesize = av_image_get_linesize(format, w, i); + + if (lower_fields) + dst[i] += dst_linesize[i]; + if (only_half_src_fields && src_lower_fields) + src[i] += src_linesize[i]; + av_image_copy_plane(dst[i], dst_linesize[i]*2, + src[i], src_linesize[i]*k, linesize, h); + } +} + +static void end_frame(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + TInterlaceContext *tinterlace = ctx->priv; + AVFilterBufferRef *outpicref; + AVFilterBufferRef *picref = inlink->cur_buf; + + if (tinterlace->mode == 0) { + if (!tinterlace->picref) { + outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); + avfilter_copy_buffer_ref_props(outpicref, picref); + outpicref->video->w = outlink->w; + outpicref->video->h = outlink->h; + outpicref->video->interlaced = 1; + outpicref->video->top_field_first = 1; + + /* write odd frame fields into the upper fields of the new frame */ + copy_picture_fields(outpicref->data, outpicref->linesize, + picref ->data, picref ->linesize, + outlink->format, inlink->w, inlink->h, 0, 0, 0); + tinterlace->picref = outpicref; + } else { + outpicref = tinterlace->picref; + + /* write even frame fields into the lower fields of the new frame */ + copy_picture_fields(outpicref->data, outpicref->linesize, + picref ->data, picref ->linesize, + outlink->format, inlink->w, inlink->h, 1, 0, 0); + tinterlace->frame_pending = 1; + } + } else if ((tinterlace->mode == 1 && tinterlace->frame & 1) || /* send only odd frames */ + (tinterlace->mode == 2 && !(tinterlace->frame & 1))) { /* send only even frames */ + tinterlace->picref = avfilter_ref_buffer(picref, AV_PERM_READ); + tinterlace->frame_pending = 1; + } else if (tinterlace->mode == 3) { + outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); + avfilter_copy_buffer_ref_props(outpicref, picref); + outpicref->video->w = outlink->w; + outpicref->video->h = outlink->h; + outpicref->video->interlaced = 1; + outpicref->video->top_field_first = tinterlace->frame & 1; + + /* cleanup the destination picture */ + memset(outpicref->data[0], 0, outpicref->linesize[0] * outlink->h); + if (outpicref->data[1]) + memset(outpicref->data[1], 128, outpicref->linesize[1] * (outlink->h >> tinterlace->vsub)); + if (outpicref->data[2]) + memset(outpicref->data[2], 128, outpicref->linesize[2] * (outlink->h >> tinterlace->vsub)); + + /* copy fields */ + copy_picture_fields(outpicref->data, outpicref->linesize, + picref ->data, picref ->linesize, + outlink->format, inlink->w, inlink->h, tinterlace->frame & 1, 0, 0); + tinterlace->picref = outpicref; + tinterlace->frame_pending = 1; + } else if (tinterlace->mode == 4) { + /* Interleave even lines from even frames with odd lines from odd frames. Height unchanged at half framerate. */ + if (!tinterlace->picref) { + outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); + avfilter_copy_buffer_ref_props(outpicref, picref); + outpicref->video->w = outlink->w; + outpicref->video->h = outlink->h; + outpicref->video->interlaced = 1; + outpicref->video->top_field_first = 1; + + /* write odd frame odd fields into the upper fields of the new frame */ + copy_picture_fields(outpicref->data, outpicref->linesize, + picref ->data, picref ->linesize, + outlink->format, inlink->w, inlink->h, 0, 1, 0); + tinterlace->picref = outpicref; + } else { + outpicref = tinterlace->picref; + + /* write even frame even fields into the lower fields of the new frame */ + copy_picture_fields(outpicref->data, outpicref->linesize, + picref ->data, picref ->linesize, + outlink->format, inlink->w, inlink->h, 1, 1, 1); + tinterlace->frame_pending = 1; + } + } + + tinterlace->frame++; + avfilter_unref_buffer(inlink->cur_buf); +} + +static void null_start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) { } + +static int request_frame(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + TInterlaceContext *tinterlace = ctx->priv; + + while (!tinterlace->frame_pending) { + int ret; + + if ((ret = avfilter_request_frame(outlink->src->inputs[0]))) + return ret; + } + + avfilter_start_frame(outlink, tinterlace->picref); + avfilter_draw_slice(outlink, 0, outlink->h, 1); + avfilter_end_frame(outlink); + tinterlace->picref = NULL; + tinterlace->frame_pending = 0; + return 0; +} + +static int poll_frame(AVFilterLink *outlink) +{ + TInterlaceContext *tinterlace = outlink->src->priv; + + return tinterlace->frame_pending; +} + +static void null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { } + +AVFilter avfilter_vf_tinterlace = { + .name = "tinterlace", + .description = NULL_IF_CONFIG_SMALL("Perform temporal field interlacing."), + + .priv_size = sizeof(TInterlaceContext), + .init = init, + .uninit = uninit, + .query_formats = query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .start_frame = null_start_frame, + .draw_slice = null_draw_slice, + .end_frame = end_frame, }, + { .name = NULL}}, + + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_out_props, + .poll_frame = poll_frame, + .request_frame = request_frame, }, + + { .name = NULL}}, +}; -- 1.7.1

9 25

About H.264 SVC implementation in ffmpeg
by abiaozwz＠gmail.com 08 Dec '11

08 Dec '11

FFmpeg currently does not support SVC? am I right? Who have any information about the SVC implementation in ffmpeg.

5 4