December 2011 - ffmpeg-cvslog

lavfi: add a new function av_buffersrc_buffer().
by git＠videolan.org 21 May '12

21 May '12

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Dec 21 20:39:18 2011 +0100| [e1d9dbf2d465448028bf396d7b37dbb642794678] | committer: Anton Khirnov lavfi: add a new function av_buffersrc_buffer(). It can be used to directly pass a AVFilterBufferRef to lavfi, avoiding a memcpy. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1d9dbf2d46544802… --- libavfilter/Makefile | 2 +- libavfilter/buffersrc.h | 38 ++++++++++++++++++++++++++ libavfilter/vsrc_buffer.c | 66 ++++++++++++++++++++++---------------------- 3 files changed, 72 insertions(+), 34 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c269db5..78c4692 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -3,7 +3,7 @@ FFLIBS = avutil FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec FFLIBS-$(CONFIG_SCALE_FILTER) += swscale -HEADERS = avfilter.h avfiltergraph.h vsrc_buffer.h +HEADERS = avfilter.h avfiltergraph.h buffersrc.h vsrc_buffer.h OBJS = allfilters.o \ avfilter.o \ diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h new file mode 100644 index 0000000..bd82c06 --- /dev/null +++ b/libavfilter/buffersrc.h @@ -0,0 +1,38 @@ +/* + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_BUFFERSRC_H +#define AVFILTER_BUFFERSRC_H + +/** + * @file + * Memory buffer source API. + */ + +#include "avfilter.h" + +/** + * Add a buffer to the filtergraph s. + * + * @param buf buffer containing frame data to be passed down the filtergraph. + * This function will take ownership of buf, the user must not free it. + */ +int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf); + +#endif /* AVFILTER_BUFFERSRC_H */ diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index 982fed5..7ef19a1 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -24,13 +24,12 @@ */ #include "avfilter.h" +#include "buffersrc.h" #include "vsrc_buffer.h" #include "libavutil/imgutils.h" typedef struct { - int64_t pts; - AVFrame frame; - int has_frame; + AVFilterBufferRef *buf; int h, w; enum PixelFormat pix_fmt; AVRational time_base; ///< time_base to set in the output link @@ -42,7 +41,7 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, { BufferSourceContext *c = buffer_filter->priv; - if (c->has_frame) { + if (c->buf) { av_log(buffer_filter, AV_LOG_ERROR, "Buffering several frames is not supported. " "Please consume all available frames before adding a new one.\n" @@ -50,15 +49,31 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, //return -1; } - memcpy(c->frame.data , frame->data , sizeof(frame->data)); - memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize)); - c->frame.interlaced_frame= frame->interlaced_frame; - c->frame.top_field_first = frame->top_field_first; - c->frame.key_frame = frame->key_frame; - c->frame.pict_type = frame->pict_type; - c->pts = pts; - c->pixel_aspect = pixel_aspect; - c->has_frame = 1; + c->buf = avfilter_get_video_buffer(buffer_filter->outputs[0], AV_PERM_WRITE, + c->w, c->h); + av_image_copy(c->buf->data, c->buf->linesize, frame->data, frame->linesize, + c->pix_fmt, c->w, c->h); + + avfilter_copy_frame_props(c->buf, frame); + c->buf->pts = pts; + c->buf->video->pixel_aspect = pixel_aspect; + + return 0; +} + +int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf) +{ + BufferSourceContext *c = s->priv; + + if (c->buf) { + av_log(s, AV_LOG_ERROR, + "Buffering several frames is not supported. " + "Please consume all available frames before adding a new one.\n" + ); + return AVERROR(EINVAL); + } + + c->buf = buf; return 0; } @@ -113,33 +128,18 @@ static int config_props(AVFilterLink *link) static int request_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; - AVFilterBufferRef *picref; - if (!c->has_frame) { + if (!c->buf) { av_log(link->src, AV_LOG_ERROR, "request_frame() called with no available frame!\n"); //return -1; } - /* This picture will be needed unmodified later for decoding the next - * frame */ - picref = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | - AV_PERM_REUSE2, - link->w, link->h); - - av_image_copy(picref->data, picref->linesize, - c->frame.data, c->frame.linesize, - picref->format, link->w, link->h); - - avfilter_copy_frame_props(picref, &c->frame); - picref->pts = c->pts; - picref->video->pixel_aspect = c->pixel_aspect; - avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0)); + avfilter_start_frame(link, avfilter_ref_buffer(c->buf, ~0)); avfilter_draw_slice(link, 0, link->h, 1); avfilter_end_frame(link); - avfilter_unref_buffer(picref); - - c->has_frame = 0; + avfilter_unref_buffer(c->buf); + c->buf = NULL; return 0; } @@ -147,7 +147,7 @@ static int request_frame(AVFilterLink *link) static int poll_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; - return !!(c->has_frame); + return !!(c->buf); } AVFilter avfilter_vsrc_buffer = {

3 3

avfiltergraph: change the syntax of avfilter_graph_parse()
by git＠videolan.org 18 May '12

18 May '12

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala(a)poste.it> | Sat Jun 11 15:16:02 2011 +0200| [6119b23a3662d1e106cdf69ef3171b2e7e1d495c] | committer: Stefano Sabatini avfiltergraph: change the syntax of avfilter_graph_parse() Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6119b23a3662d1e10… --- doc/APIchanges | 3 +++ ffmpeg.c | 2 +- ffplay.c | 2 +- libavfilter/avfilter.h | 4 ++-- libavfilter/avfiltergraph.h | 8 +++++--- libavfilter/graphparser.c | 20 ++++++++++---------- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 592c268..40efee8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2011-06-12 - xxxxxxx - lavfi 2.16.0 - avfilter_graph_parse() + Change avfilter_graph_parse() signature. + 2011-06-xx - xxxxxxx - lavu 51.6.0 - opt.h Add av_opt_flag_is_set(). diff --git a/ffmpeg.c b/ffmpeg.c index 35395a9..f69c054 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -418,7 +418,7 @@ static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) return ret; av_freep(&ost->avfilter); } else { diff --git a/ffplay.c b/ffplay.c index ebe9e05..c5f5f75 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1708,7 +1708,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0) goto the_end; av_freep(&vfilters); } else { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 64d76cc..fbd1dc4 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,8 +26,8 @@ #include "libavutil/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 15 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 16 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 23a7c51..538fd2c 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -112,12 +112,14 @@ typedef struct AVFilterInOut { * * @param graph the filter graph where to link the parsed graph context * @param filters string to be parsed - * @param inputs linked list to the inputs of the graph - * @param outputs linked list to the outputs of the graph + * @param inputs linked list to the inputs of the graph, may be NULL. + * It is updated to contain the list of open inputs after the parsing. + * @param outputs linked list to the outputs of the graph, may be NULL. + * It is updated to contain the list of open outputs after the parsing. * @return zero on success, a negative AVERROR code on error */ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *inputs, AVFilterInOut *outputs, + AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx); #endif /* AVFILTER_AVFILTERGRAPH_H */ diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index aa1f228..ea0c5dd 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -328,8 +328,8 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, } int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *open_inputs, - AVFilterInOut *open_outputs, void *log_ctx) + AVFilterInOut **open_inputs, AVFilterInOut **open_outputs, + void *log_ctx) { int index = 0, ret; char chr = 0; @@ -341,7 +341,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, const char *filterchain = filters; filters += strspn(filters, WHITESPACES); - if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&filters, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0) @@ -350,14 +350,14 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, if (filter->input_count == 1 && !curr_inputs && !index) { /* First input can be omitted if it is "[in]" */ const char *tmp = "[in]"; - if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&tmp, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; } - if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0) + if ((ret = link_filter_inouts(filter, &curr_inputs, open_inputs, log_ctx)) < 0) goto fail; - if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&filters, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; @@ -382,10 +382,10 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, goto fail; } - if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) { + if (*open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) { /* Last output can be omitted if it is "[out]" */ const char *tmp = "[out]"; - if ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&tmp, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; } @@ -396,8 +396,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, for (; graph->filter_count > 0; graph->filter_count--) avfilter_free(graph->filters[graph->filter_count - 1]); av_freep(&graph->filters); - free_inout(open_inputs); - free_inout(open_outputs); + free_inout(*open_inputs); + free_inout(*open_outputs); free_inout(curr_inputs); return ret; }

2 1

Do not map asf metadata key WM/Track to track.
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat Dec 31 22:33:58 2011 +0100| [2cba62bd84d15e84633b982f868fb1e50834c0d8] | committer: Carl Eugen Hoyos Do not map asf metadata key WM/Track to track. WM/Track is 0-based (and deprecated in favour of WM/TrackNumber), track is 1-based. Fixes ticket #825. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cba62bd84d15e846… --- libavformat/asf.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libavformat/asf.c b/libavformat/asf.c index 1f6af18..8e360d3 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -152,7 +152,6 @@ const AVMetadataConv ff_asf_metadata_conv[] = { { "WM/Publisher" , "publisher" }, { "WM/Tool" , "encoder" }, { "WM/TrackNumber" , "track" }, - { "WM/Track" , "track" }, { "WM/MediaStationCallSign", "service_provider" }, { "WM/MediaStationName", "service_name" }, // { "Year" , "date" }, TODO: conversion year<->date

1 0

Only expand raw and packed 1bpp tiff horizontally if it is palettised.
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat Dec 31 20:45:04 2011 +0100| [714d2f9796b56771b4fa587db6e674b950c15bd4] | committer: Carl Eugen Hoyos Only expand raw and packed 1bpp tiff horizontally if it is palettised. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=714d2f9796b56771b… --- libavcodec/tiff.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index b353677..b0ccbac 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -224,7 +224,8 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin if (ssrc + size - src < width) return AVERROR_INVALIDDATA; if (!s->fill_order) { - horizontal_fill(s->bpp, dst, 1, src, 0, width, 0); + horizontal_fill(s->bpp * (s->avctx->pix_fmt == PIX_FMT_PAL8), + dst, 1, src, 0, width, 0); } else { int i; for (i = 0; i < width; i++) @@ -241,7 +242,8 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin av_log(s->avctx, AV_LOG_ERROR, "Copy went out of bounds\n"); return -1; } - horizontal_fill(s->bpp, dst, 1, src, 0, code, pixels); + horizontal_fill(s->bpp * (s->avctx->pix_fmt == PIX_FMT_PAL8), + dst, 1, src, 0, code, pixels); src += code; pixels += code; }else if(code != -128){ // -127..-1 @@ -251,7 +253,8 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin return -1; } c = *src++; - horizontal_fill(s->bpp, dst, 0, NULL, c, code, pixels); + horizontal_fill(s->bpp * (s->avctx->pix_fmt == PIX_FMT_PAL8), + dst, 0, NULL, c, code, pixels); pixels += code; } }

1 0

h264: Fix seeking in 00017.MTS
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Dec 31 20:25:02 2011 +0100| [9d9316ae34ea2a5e481ac15f31d42c87a8ef4380] | committer: Michael Niedermayer h264: Fix seeking in 00017.MTS Fixes Ticket852 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d9316ae34ea2a5e4… --- libavcodec/h264_refs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index cdc1fca..d030fec 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -653,7 +653,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ print_short_term(h); print_long_term(h); - if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=1 && s->current_picture_ptr->f.pict_type == AV_PICTURE_TYPE_I){ + if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=1 + (s->picture_structure != PICT_FRAME) && s->current_picture_ptr->f.pict_type == AV_PICTURE_TYPE_I){ h->sync |= 1; s->current_picture_ptr->sync |= h->sync; }

1 0

mxg: fix compiler warning for uninitialized variables
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Dec 31 16:51:35 2011 +0100| [bd553d5ea940e987333dcdd9a554c3f2622fec8a] | committer: Michael Niedermayer mxg: fix compiler warning for uninitialized variables Based on work by: Jean First <jeanfirst(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd553d5ea940e9873… --- libavformat/mxg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/mxg.c b/libavformat/mxg.c index b249f67..3e0c421 100644 --- a/libavformat/mxg.c +++ b/libavformat/mxg.c @@ -104,7 +104,7 @@ static int mxg_update_cache(AVFormatContext *s, unsigned int cache_size) /* reallocate internal buffer */ if (current_pos > current_pos + cache_size) return AVERROR(ENOMEM); - if (mxg->soi_ptr) soi_pos = mxg->soi_ptr - mxg->buffer; + soi_pos = mxg->soi_ptr - mxg->buffer; mxg->buffer = av_fast_realloc(mxg->buffer, &mxg->buffer_size, current_pos + cache_size + FF_INPUT_BUFFER_PADDING_SIZE);

1 0

id3v2: fix compiler warning for uninitialized variables
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Jean First <jeanfirst(a)gmail.com> | Fri Dec 30 21:08:03 2011 +0100| [acc88f07d49fdc650eff880806a9f8387a9abbbf] | committer: Michael Niedermayer id3v2: fix compiler warning for uninitialized variables Signed-off-by: Jean First <jeanfirst(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acc88f07d49fdc650… --- libavformat/id3v2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9ee3271..250281c 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -437,7 +437,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t AVIOContext *pbx; unsigned char *buffer = NULL; int buffer_size = 0; - const ID3v2EMFunc *extra_func; + const ID3v2EMFunc *extra_func = NULL; unsigned char *compressed_buffer = NULL; int compressed_buffer_size = 0;

1 0

aacdec: Evaluate further PCE elements.
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Dec 30 20:36:11 2011 +0100| [810a14dbcc655c26abe49b690aabfe6c311bc769] | committer: Michael Niedermayer aacdec: Evaluate further PCE elements. Fixes Music\ Station\ Super\ Live\ -\ 2011.12.23.mkv Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=810a14dbcc655c26a… --- libavcodec/aacdec.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 030feb1..c079842 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2201,10 +2201,11 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, if ((err = decode_pce(avctx, &ac->m4ac, new_che_pos, gb))) break; if (ac->output_configured > OC_TRIAL_PCE) - av_log(avctx, AV_LOG_ERROR, - "Not evaluating a further program_config_element as this construct is dubious at best.\n"); - else - err = output_configure(ac, ac->che_pos, new_che_pos, 0, OC_TRIAL_PCE); + av_log(avctx, AV_LOG_INFO, + "Evaluating a further program_config_element.\n"); + err = output_configure(ac, ac->che_pos, new_che_pos, 0, OC_TRIAL_PCE); + if (!err) + ac->m4ac.chan_config = 0; break; }

1 0

Fix mono* pam encoding.
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat Dec 31 17:15:43 2011 +0100| [f69a766d11e60cb11b45cee5a397db96bb8cf66e] | committer: Carl Eugen Hoyos Fix mono* pam encoding. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f69a766d11e60cb11… --- libavcodec/pamenc.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index 28fe7e1..c19ea0e 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -50,7 +50,7 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, h = avctx->height; w = avctx->width; switch (avctx->pix_fmt) { - case PIX_FMT_MONOWHITE: + case PIX_FMT_MONOBLACK: n = (w + 7) >> 3; depth = 1; maxval = 1; @@ -97,6 +97,13 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, } ptr += linesize; } + } else if (avctx->pix_fmt == PIX_FMT_MONOBLACK){ + int j; + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) + *s->bytestream++ = ptr[j >> 3] >> (7 - j & 7) & 1; + ptr += linesize; + } } else { for (i = 0; i < h; i++) { memcpy(s->bytestream, ptr, n); @@ -115,6 +122,6 @@ AVCodec ff_pam_encoder = { .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, .encode = pam_encode_frame, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), };

1 0

libvorbis: proper error logging and return.
by git＠videolan.org 31 Dec '11

31 Dec '11

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Fri Dec 30 23:10:41 2011 +0100| [0098e79f8a88a5ec8f710940c6fd7628c9dab110] | committer: Nicolas George libvorbis: proper error logging and return. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0098e79f8a88a5ec8… --- libavcodec/libvorbis.c | 53 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 15 deletions(-) diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c index 62ec6ff..5c35b35 100644 --- a/libavcodec/libvorbis.c +++ b/libavcodec/libvorbis.c @@ -61,38 +61,59 @@ static const AVOption options[] = { }; static const AVClass class = { "libvorbis", av_default_item_name, options, LIBAVUTIL_VERSION_INT }; +static const char * error(int oggerr, int *averr) +{ + switch (oggerr) { + case OV_EFAULT: *averr = AVERROR(EFAULT); return "internal error"; + case OV_EIMPL: *averr = AVERROR(EINVAL); return "not supported"; + case OV_EINVAL: *averr = AVERROR(EINVAL); return "invalid request"; + default: *averr = AVERROR(EINVAL); return "unknown error"; + } +} + static av_cold int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) { OggVorbisContext *context = avccontext->priv_data; double cfreq; + int r; if (avccontext->flags & CODEC_FLAG_QSCALE) { /* variable bitrate */ - if (vorbis_encode_setup_vbr(vi, avccontext->channels, + float quality = avccontext->global_quality / (float)FF_QP2LAMBDA; + r = vorbis_encode_setup_vbr(vi, avccontext->channels, avccontext->sample_rate, - avccontext->global_quality / (float)FF_QP2LAMBDA / 10.0)) - return -1; + quality / 10.0); + if (r) { + av_log(avccontext, AV_LOG_ERROR, + "Unable to set quality to %g: %s\n", quality, error(r, &r)); + return r; + } } else { int minrate = avccontext->rc_min_rate > 0 ? avccontext->rc_min_rate : -1; int maxrate = avccontext->rc_min_rate > 0 ? avccontext->rc_max_rate : -1; /* constant bitrate */ - if (vorbis_encode_setup_managed(vi, avccontext->channels, + r = vorbis_encode_setup_managed(vi, avccontext->channels, avccontext->sample_rate, minrate, - avccontext->bit_rate, maxrate)) - return -1; + avccontext->bit_rate, maxrate); + if (r) { + av_log(avccontext, AV_LOG_ERROR, + "Unable to set CBR to %d: %s\n", avccontext->bit_rate, + error(r, &r)); + return r; + } /* variable bitrate by estimate, disable slow rate management */ if (minrate == -1 && maxrate == -1) if (vorbis_encode_ctl(vi, OV_ECTL_RATEMANAGE2_SET, NULL)) - return -1; + return AVERROR(EINVAL); /* should not happen */ } /* cutoff frequency */ if (avccontext->cutoff > 0) { cfreq = avccontext->cutoff / 1000.0; if (vorbis_encode_ctl(vi, OV_ECTL_LOWPASS_SET, &cfreq)) - return -1; + return AVERROR(EINVAL); /* should not happen */ } if (context->iblock) { @@ -143,11 +164,13 @@ static av_cold int oggvorbis_encode_init(AVCodecContext *avccontext) ogg_packet header, header_comm, header_code; uint8_t *p; unsigned int offset; + int r; vorbis_info_init(&context->vi); - if (oggvorbis_init_encoder(&context->vi, avccontext) < 0) { - av_log(avccontext, AV_LOG_ERROR, "oggvorbis_encode_init: init_encoder failed\n"); - return -1; + r = oggvorbis_init_encoder(&context->vi, avccontext); + if (r < 0) { + av_log(avccontext, AV_LOG_ERROR, "oggvorbis_encode_init failed\n"); + return r; } vorbis_analysis_init(&context->vd, &context->vi); vorbis_block_init(&context->vd, &context->vb); @@ -228,8 +251,8 @@ static int oggvorbis_encode_frame(AVCodecContext *avccontext, if (op.bytes == 1 && op.e_o_s) continue; if (context->buffer_index + sizeof(ogg_packet) + op.bytes > BUFFER_SIZE) { - av_log(avccontext, AV_LOG_ERROR, "libvorbis: buffer overflow."); - return -1; + av_log(avccontext, AV_LOG_ERROR, "libvorbis: buffer overflow.\n"); + return AVERROR(EINVAL); } memcpy(context->buffer + context->buffer_index, &op, sizeof(ogg_packet)); context->buffer_index += sizeof(ogg_packet); @@ -249,8 +272,8 @@ static int oggvorbis_encode_frame(AVCodecContext *avccontext, //FIXME we should reorder the user supplied pts and not assume that they are spaced by 1/sample_rate if (l > buf_size) { - av_log(avccontext, AV_LOG_ERROR, "libvorbis: buffer overflow."); - return -1; + av_log(avccontext, AV_LOG_ERROR, "libvorbis: buffer overflow.\n"); + return AVERROR(EINVAL); } memcpy(packets, op2->packet, l);

1 0