August 2013 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] lavu/log: do not skip overwritten lines.
by Nicolas George 07 Aug '13

07 Aug '13

If the line ends with \r, it will not flood the tty, and the "Last message repeated" line would overwrite it. Fix bug introduced by c25d1ba. Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavutil/log.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/log.c b/libavutil/log.c index 29ad2d0..cde7c12 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -224,7 +224,8 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) is_atty = isatty(2) ? 1 : -1; #endif - if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && *line){ + if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && + *line && line[strlen(line) - 1] != '\r'){ count++; if (is_atty == 1) fprintf(stderr, " Last message repeated %d times\r", count); -- 1.7.10.4

2 3

[PATCH] configure: Add -lstdc++ to the requirements for linking with libgme.
by Stephen Hutchinson 07 Aug '13

07 Aug '13

--- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 57078ce..6cbceb2 100755 --- a/configure +++ b/configure @@ -4146,7 +4146,7 @@ enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType -enabled libgme && require libgme gme/gme.h gme_new_emu -lgme +enabled libgme && require libgme gme/gme.h gme_new_emu -lgme -lstdc++ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do check_lib "${gsm_hdr}" gsm_create -lgsm && break; done || die "ERROR: libgsm not found"; } -- 1.8.1.2

3 5

[PATCH 1/2] avisynth: Cosmetics
by Stephen Hutchinson 07 Aug '13

07 Aug '13

--- libavformat/avisynth.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index ef54b9b..03f1688 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -62,19 +62,19 @@ typedef struct { void *library; #define AVSC_DECLARE_FUNC(name) name##_func name + AVSC_DECLARE_FUNC(avs_bit_blt); + AVSC_DECLARE_FUNC(avs_clip_get_error); AVSC_DECLARE_FUNC(avs_create_script_environment); AVSC_DECLARE_FUNC(avs_delete_script_environment); + AVSC_DECLARE_FUNC(avs_get_audio); AVSC_DECLARE_FUNC(avs_get_error); - AVSC_DECLARE_FUNC(avs_clip_get_error); - AVSC_DECLARE_FUNC(avs_invoke); - AVSC_DECLARE_FUNC(avs_release_value); + AVSC_DECLARE_FUNC(avs_get_frame); AVSC_DECLARE_FUNC(avs_get_video_info); - AVSC_DECLARE_FUNC(avs_take_clip); + AVSC_DECLARE_FUNC(avs_invoke); AVSC_DECLARE_FUNC(avs_release_clip); - AVSC_DECLARE_FUNC(avs_bit_blt); - AVSC_DECLARE_FUNC(avs_get_audio); - AVSC_DECLARE_FUNC(avs_get_frame); + AVSC_DECLARE_FUNC(avs_release_value); AVSC_DECLARE_FUNC(avs_release_video_frame); + AVSC_DECLARE_FUNC(avs_take_clip); #undef AVSC_DECLARE_FUNC } AviSynthLibrary; @@ -127,19 +127,19 @@ static av_cold int avisynth_load_library(void) { if(!continue_on_fail && !avs_library->name) \ goto fail; \ } + LOAD_AVS_FUNC(avs_bit_blt, 0); + LOAD_AVS_FUNC(avs_clip_get_error, 0); LOAD_AVS_FUNC(avs_create_script_environment, 0); LOAD_AVS_FUNC(avs_delete_script_environment, 0); + LOAD_AVS_FUNC(avs_get_audio, 0); LOAD_AVS_FUNC(avs_get_error, 1); // New to AviSynth 2.6 - LOAD_AVS_FUNC(avs_clip_get_error, 0); - LOAD_AVS_FUNC(avs_invoke, 0); - LOAD_AVS_FUNC(avs_release_value, 0); + LOAD_AVS_FUNC(avs_get_frame, 0); LOAD_AVS_FUNC(avs_get_video_info, 0); - LOAD_AVS_FUNC(avs_take_clip, 0); + LOAD_AVS_FUNC(avs_invoke, 0); LOAD_AVS_FUNC(avs_release_clip, 0); - LOAD_AVS_FUNC(avs_bit_blt, 0); - LOAD_AVS_FUNC(avs_get_audio, 0); - LOAD_AVS_FUNC(avs_get_frame, 0); + LOAD_AVS_FUNC(avs_release_value, 0); LOAD_AVS_FUNC(avs_release_video_frame, 0); + LOAD_AVS_FUNC(avs_take_clip, 0); #undef LOAD_AVS_FUNC atexit(avisynth_atexit_handler); -- 1.8.1.2

2 3

[PATCH] MAINTAINERS: Add some maintainers for parts of libavutil
by Michael Niedermayer 06 Aug '13

06 Aug '13

Developers added are active and in the copyright of the specified files I will only add developers who reply and state that they are ok with this that is if you dont want to maintain a part you dont have to reply, i will remove everyone who did not reply before i push this. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6f40fea..07c9545 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -62,13 +62,22 @@ Internal Interfaces: libavutil/common.h Michael Niedermayer Other: + atomic Ronald S. Bultje + bprint Nicolas George bswap.h + des Reimar Doeffinger + float_dsp Loren Merritt + hash Reimar Döffinger + hmac Martin Storsjo intfloat* Michael Niedermayer integer.c, integer.h Michael Niedermayer + lzo Reimar Doeffinger mathematics.c, mathematics.h Michael Niedermayer opencl.c, opencl.h Wei Gao rational.c, rational.h Michael Niedermayer + rc4 Reimar Doeffinger ripemd.c, ripemd.h James Almer + timecode Clément Bœsch libavcodec -- 1.7.9.5

4 6

[PATCH] flacenc: Support attaching pictures
by James Almer 06 Aug '13

06 Aug '13

This is based on the implementation from the mp3 muxer, so certain chunks of code were copied and adapted where needed. Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavformat/flacenc.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 187 insertions(+), 10 deletions(-) diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 87e9362..ca97de5 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -23,9 +23,20 @@ #include "avformat.h" #include "avio_internal.h" #include "flacenc.h" +#include "id3v2.h" #include "vorbiscomment.h" #include "libavcodec/bytestream.h" +#include "libavutil/pixdesc.h" +typedef struct FLACContext { + /* index of the audio stream */ + int audio_stream_idx; + /* number of attached pictures we still need to write */ + int pics_to_write; + /* audio packets are queued here until we get all the attached pictures */ + AVPacketList *queue, *queue_end; + int type; +} FLACContext; static int flac_write_block_padding(AVIOContext *pb, unsigned int n_padding_bytes, int last_block) @@ -62,19 +73,113 @@ static int flac_write_block_comment(AVIOContext *pb, AVDictionary **m, return 0; } +static int flac_write_block_picture(AVFormatContext *s, AVPacket *pkt, + int last_block) +{ + AVDictionaryEntry *m; + AVIOContext *pb = s->pb; + FLACContext *flac = s->priv_data; + AVStream *st = s->streams[pkt->stream_index]; + const CodecMime *mime = ff_id3v2_mime_tags; + const char *mimetype = NULL, *desc = ""; + int i, mimelen, desclen, type = 3; + + if (st->codec->codec_id == AV_CODEC_ID_GIF) { + avpriv_report_missing_feature(s, "GIF picture"); + return AVERROR_PATCHWELCOME; + } else if (st->codec->codec_id != AV_CODEC_ID_MJPEG && + st->codec->codec_id != AV_CODEC_ID_PNG) { + av_log(s, AV_LOG_ERROR, "Unsupported picture format"); + return AVERROR(EINVAL); + } + + /* get the mimetype*/ + while (mime->id != AV_CODEC_ID_NONE) { + if (mime->id == st->codec->codec_id) { + mimetype = mime->str; + break; + } + mime++; + } + if (!mimetype) { + av_log(s, AV_LOG_ERROR, "No mimetype is known for stream %d, cannot " + "write an attached picture.\n", st->index); + return AVERROR(EINVAL); + } + mimelen = strlen(mimetype); + + /* get the picture type */ + m = av_dict_get(st->metadata, "comment", NULL, 0); + for (i = 0; m && i < FF_ARRAY_ELEMS(ff_id3v2_picture_types); i++) { + if (strstr(ff_id3v2_picture_types[i], m->value) == ff_id3v2_picture_types[i]) { + type = i; + break; + } + } + if (type == 1 || type == 2) { + if (flac->type & type) { + av_log(s, AV_LOG_ERROR, "Only one picture of type \"%s\" can be muxed.\n", + ff_id3v2_picture_types[type]); + return AVERROR(EINVAL); + } + if (type == 1 && st->codec->codec_id != AV_CODEC_ID_PNG) { + av_log(s, AV_LOG_ERROR, "Picture of type \"%s\" must be PNG.\n", + ff_id3v2_picture_types[type]); + return AVERROR(EINVAL); + } + flac->type |= type; + } + + /* get the description */ + if ((m = av_dict_get(st->metadata, "title", NULL, 0))) + desc = m->value; + desclen = strlen(desc); + + /* start writing */ + avio_w8 (pb, last_block ? 0x86 : 0x06); + avio_wb24 (pb, mimelen + desclen + 32 + pkt->size); + avio_wb32 (pb, type); + avio_wb32 (pb, mimelen); + avio_write(pb, mimetype, mimelen); + avio_wb32 (pb, desclen); + avio_write(pb, desc, desclen); + avio_wb32 (pb, st->codec->width); + avio_wb32 (pb, st->codec->height); + avio_wb32 (pb, av_get_bits_per_pixel(av_pix_fmt_desc_get(st->codec->pix_fmt))); + avio_wb32 (pb, 0); // TODO: Number of colors for indexed pics (GIF) + avio_wb32 (pb, pkt->size); + avio_write(pb, pkt->data, pkt->size); + + return 0; +} + static int flac_write_header(struct AVFormatContext *s) { int ret; - AVCodecContext *codec = s->streams[0]->codec; + AVCodecContext *codec; + FLACContext *flac = s->priv_data; - if (s->nb_streams > 1) { - av_log(s, AV_LOG_ERROR, "only one stream is supported\n"); - return AVERROR(EINVAL); + flac->audio_stream_idx = -1; + for (ret = 0; ret < s->nb_streams; ret++) { + AVStream *st = s->streams[ret]; + if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + if (flac->audio_stream_idx >= 0 || st->codec->codec_id != AV_CODEC_ID_FLAC) { + av_log(s, AV_LOG_ERROR, "Invalid audio stream. Exactly one FLAC " + "audio stream is required.\n"); + return AVERROR(EINVAL); + } + flac->audio_stream_idx = ret; + } else if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO) { + av_log(s, AV_LOG_ERROR, "Only audio streams and pictures are allowed in FLAC.\n"); + return AVERROR(EINVAL); + } } - if (codec->codec_id != AV_CODEC_ID_FLAC) { - av_log(s, AV_LOG_ERROR, "unsupported codec\n"); + if (flac->audio_stream_idx < 0) { + av_log(s, AV_LOG_ERROR, "No audio stream present.\n"); return AVERROR(EINVAL); } + flac->pics_to_write = s->nb_streams - 1; + codec = s->streams[flac->audio_stream_idx]->codec; ret = ff_flac_write_header(s->pb, codec, 0); if (ret) @@ -89,19 +194,45 @@ static int flac_write_header(struct AVFormatContext *s) * every 10s. So one might add padding to allow that later * but there seems to be no simple way to get the duration here. * So let's try the flac default of 8192 bytes */ - flac_write_block_padding(s->pb, 8192, 1); + if (!flac->pics_to_write) + flac_write_block_padding(s->pb, 8192, 1); return ret; } +static int flac_queue_flush(AVFormatContext *s) +{ + FLACContext *flac = s->priv_data; + AVPacketList *pktl; + + flac_write_block_padding(s->pb, 8192, 1); + while ((pktl = flac->queue)) { + avio_write(s->pb, pktl->pkt.data, pktl->pkt.size); + av_free_packet(&pktl->pkt); + flac->queue = pktl->next; + av_freep(&pktl); + } + flac->queue_end = NULL; + + return 0; +} + static int flac_write_trailer(struct AVFormatContext *s) { AVIOContext *pb = s->pb; + FLACContext *flac = s->priv_data; + AVCodecContext *codec = s->streams[flac->audio_stream_idx]->codec; uint8_t *streaminfo; enum FLACExtradataFormat format; int64_t file_size; - if (!avpriv_flac_is_extradata_valid(s->streams[0]->codec, &format, &streaminfo)) + if (flac->pics_to_write) { + av_log(s, AV_LOG_WARNING, "No packets were sent for some of the " + "attached pictures.\n"); + flac_queue_flush(s); + } + + if (!avpriv_flac_is_extradata_valid(codec, &format, &streaminfo)) return -1; if (pb->seekable) { @@ -119,7 +250,52 @@ static int flac_write_trailer(struct AVFormatContext *s) static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt) { - avio_write(s->pb, pkt->data, pkt->size); + FLACContext *flac = s->priv_data; + + if (pkt->stream_index == flac->audio_stream_idx) { + if (flac->pics_to_write) { + /* buffer audio packets until we get all the pictures */ + AVPacketList *pktl = av_mallocz(sizeof(*pktl)); + if (!pktl) + return AVERROR(ENOMEM); + + pktl->pkt = *pkt; + pktl->pkt.buf = av_buffer_ref(pkt->buf); + if (!pktl->pkt.buf) { + av_freep(&pktl); + return AVERROR(ENOMEM); + } + + if (flac->queue_end) + flac->queue_end->next = pktl; + else + flac->queue = pktl; + flac->queue_end = pktl; + } else { + avio_write(s->pb, pkt->data, pkt->size); + return 0; + } + } else { + AVStream *st = s->streams[pkt->stream_index]; + int ret; + + /* warn only once for each stream */ + if (st->nb_frames == 1) { + av_log(s, AV_LOG_WARNING, "Got more than one picture in stream %d," + " ignoring.\n", pkt->stream_index); + } + if (!flac->pics_to_write || st->nb_frames >= 1) + return 0; + + if ((ret = flac_write_block_picture(s, pkt, 0)) < 0) + return ret; + flac->pics_to_write--; + + /* flush the buffered audio packets */ + if (!flac->pics_to_write) + return flac_queue_flush(s); + } + return 0; } @@ -128,8 +304,9 @@ AVOutputFormat ff_flac_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw FLAC"), .mime_type = "audio/x-flac", .extensions = "flac", + .priv_data_size = sizeof(FLACContext), .audio_codec = AV_CODEC_ID_FLAC, - .video_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_PNG, .write_header = flac_write_header, .write_packet = flac_write_packet, .write_trailer = flac_write_trailer, -- 1.8.1.5

2 4

[LOGO] Font for "FFmpeg" wordmark
by Timothy Gu 06 Aug '13

06 Aug '13

Hi all, I am making the FFmpeg logo in SVG, and I need to know the font of "FFmpeg" text (or the results will be very ugly). I tried to use some of the online font identifying services, but they didn't work. Please point me to the original font designer if needed. Thank you. Timothy

2 5

[PATCH 1/2] lavf/url: add ffurl_disconnect().
by Nicolas George 06 Aug '13

06 Aug '13

Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavformat/avio.c | 14 ++++++++++++-- libavformat/url.h | 7 +++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 2c7a35e..067964b 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -337,14 +337,24 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence) return ret; } -int ffurl_closep(URLContext **hh) +int ffurl_disconnect(URLContext *h) { - URLContext *h= *hh; int ret = 0; if (!h) return 0; /* can happen when ffurl_open fails */ if (h->is_connected && h->prot->url_close) ret = h->prot->url_close(h); + h->is_connected = 0; + return ret; +} + +int ffurl_closep(URLContext **hh) +{ + URLContext *h= *hh; + int ret = 0; + if (!h) return 0; /* can happen when ffurl_open fails */ + + ret = ffurl_disconnect(h); #if CONFIG_NETWORK if (h->prot->flags & URL_PROTOCOL_FLAG_NETWORK) ff_network_close(); diff --git a/libavformat/url.h b/libavformat/url.h index 06dfda1..84d6527 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -181,6 +181,13 @@ int ffurl_write(URLContext *h, const unsigned char *buf, int size); int64_t ffurl_seek(URLContext *h, int64_t pos, int whence); /** + * Disconnect from the resource accessed by the URLContext h. + * + * @return 0 for success or a negative error code + */ +int ffurl_disconnect(URLContext *h); + +/** * Close the resource accessed by the URLContext h, and free the * memory used by it. Also set the URLContext pointer to NULL. * -- 1.7.10.4

3 7

should ff_rtp_codec_id() be case insensitive?
by Wei-Cheng Pan 06 Aug '13

06 Aug '13

Hi, I had an rtsp stream like this: SDP: v=0 o=RTSP 1375702538 771 IN IP4 0.0.0.0 s=RTSP server c=IN IP4 0.0.0.0 t=0 0 a=charset:Shift_JIS a=range:npt=0- a=control:* a=etag:1234567890 m=video 0 RTP/AVP 98 b=AS:0 a=rtpmap:98 H264/90000 a=control:trackID=1 a=fmtp:98 packetization-mode=1; profile-level-id=644014; sprop-parameter- sets=J2RAFKwsagUG3lhAAAD6QAA6mAE=,KO4CGLA= m=audio 0 RTP/AVP 0 a=control:trackID=4 a=rtpmap:0 pcmu/8000 because pcmu (see the last line) is in lower case, ff_rtp_codec_id() in libavformat/rtp.c can not match the right codec. This patch is base on tag n2.0.

4 4

[PATCH] lavfilter/vf_unsharp: add the OPENCL share buffer for the unsharp video filter
by weixuan wang 06 Aug '13

06 Aug '13

* * *Hi,* * *** *I found that there are two video filters having the OPENCL supports in the latest trunk. The two video filters are deshake video filter and unsharp video filter. when I used all of the two filters with the OPENCL, i find out a idea to get a better performance of them.*** *In these OPENCL filters, they first copy the input frame buffer into the input OPENCL buffer like this:*** *av_opencl_buffer_write_image(unsharp->opencl_ctx.cl_inbuf,*** *unsharp->opencl_ctx.cl_inbuf_size,0, in->data, unsharp->opencl_ctx.in_plane_size,*** *unsharp->opencl_ctx.plane_num);*** *the in->data is the input frame buffer and the unsharp->opencl_ctx.cl_inbuf is the input OPENCL buffer.*** *They use the input OPENCL buffer to run the kernel and get the output OPENCL buffer. They then copy the output OPENCL buffer into the output frame buffer like this:*** *av_opencl_buffer_read_image(out->data, unsharp->opencl_ctx.out_plane_size,* ** *unsharp->opencl_ctx.plane_num, unsharp->opencl_ctx.cl_outbuf,*** *unsharp->opencl_ctx.cl_outbuf_size);*** *the out->data is the output frame buffer and the unsharp->opencl_ctx.cl_ outbuf is the output OPENCL buffer.*** *if I use two or more video filters with the OPENCL, the time of the data copying will be very long. So I have a idea:*** *if the first video filter is using the OPENCL and the next video filter is using the OPENCL too, we can remove the output data copying of the first video filter and the input data copying of the next video filter. we can directly use the output OPENCL buffer of the first video filter as the input OPENCL buffer of the next video filter.*** *I implement a patch for my idea. This patch is implemented for the unsharp video filter. you can run the command:” **ffmpeg -i test.mp4 -vf "unsharp=opencl=1,unsharp=opencl=1" -y out.mpg” to test the improvement of the performance. * *If this patch can be accepted by community, I will continue to implement the patch for the deshake video filter.*

2 2

[PATCH]Support DVD-A files containing LPCM
by Carl Eugen Hoyos 05 Aug '13

05 Aug '13

Hi! Attached patch fixes the sample from ticket #2758 for me, I cannot implement >16bit or multichannel without samples. Please review, Carl Eugen

4 8