October 2011 - ffmpeg-cvslog - lists.ffmpeg.org

vf_overlay: add support to alpha pre-multiplication in the RGBA path
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sat Oct 29 00:29:25 2011 +0200| [2f7c8aefa82ce4cb929f7c6ce9ff072abfa8826b] | committer: Stefano Sabatini vf_overlay: add support to alpha pre-multiplication in the RGBA path Based on the work of Mark Himsley <mark(a)mdsh.com>. See thread: Subject: [FFmpeg-devel] libavfilter: extending overlay filter Date: Sun, 13 Mar 2011 14:18:42 +0000 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f7c8aefa82ce4cb9… --- libavfilter/vf_overlay.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index db53985..06967c2 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -360,18 +360,35 @@ static void blend_slice(AVFilterContext *ctx, const int dr = over->main_rgba_map[R]; const int dg = over->main_rgba_map[G]; const int db = over->main_rgba_map[B]; + const int da = over->main_rgba_map[A]; const int dstep = over->main_pix_step[0]; const int sr = over->overlay_rgba_map[R]; const int sg = over->overlay_rgba_map[G]; const int sb = over->overlay_rgba_map[B]; const int sa = over->overlay_rgba_map[A]; const int sstep = over->overlay_pix_step[0]; + const int main_has_alpha = over->main_has_alpha; if (slice_y > y) sp += (slice_y - y) * src->linesize[0]; for (i = 0; i < height; i++) { uint8_t *d = dp, *s = sp; for (j = 0; j < width; j++) { alpha = s[sa]; + + // if the main channel has an alpha channel, alpha has to be calculated + // to create an un-premultiplied (straight) alpha value + if (main_has_alpha && alpha != 0 && alpha != 255) { + // apply the general equation: + // alpha = alpha_overlay / ( (alpha_main + alpha_overlay) - (alpha_main * alpha_overlay) ) + alpha = + // the next line is a faster version of: 255 * 255 * alpha + ( (alpha << 16) - (alpha << 9) + alpha ) + / + // the next line is a faster version of: 255 * (alpha + d[da]) + ( ((alpha + d[da]) << 8 ) - (alpha + d[da]) + - d[da] * alpha ); + } + switch (alpha) { case 0: break; @@ -387,6 +404,18 @@ static void blend_slice(AVFilterContext *ctx, d[dg] = FAST_DIV255(d[dg] * (255 - alpha) + s[sg] * alpha); d[db] = FAST_DIV255(d[db] * (255 - alpha) + s[sb] * alpha); } + if (main_has_alpha) { + switch (alpha) { + case 0: + break; + case 255: + d[da] = s[sa]; + break; + default: + // apply alpha compositing: main_alpha += (1-main_alpha) * overlay_alpha + d[da] += FAST_DIV255((255 - d[da]) * s[sa]); + } + } d += dstep; s += sstep; }

1 0

vf_overlay: enable RGB path
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sat Oct 29 00:10:43 2011 +0200| [3013bfa81ef17153a07970a8a5961e350992fdf0] | committer: Stefano Sabatini vf_overlay: enable RGB path Add option rgb which forces the RGB path. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3013bfa81ef17153a… --- doc/filters.texi | 15 +++++- libavfilter/vf_overlay.c | 121 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 116 insertions(+), 20 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 9530112..0da5702 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1631,10 +1631,10 @@ Overlay one video on top of another. It takes two inputs and one output, the first input is the "main" video on which the second input is overlayed. -It accepts the parameters: @var{x}:@var{y}. +It accepts the parameters: @var{x}:@var{y}[:@var{options}]. @var{x} is the x coordinate of the overlayed video on the main video, -@var{y} is the y coordinate. The parameters are expressions containing +@var{y} is the y coordinate. @var{x} and @var{y} are expressions containing the following parameters: @table @option @@ -1651,6 +1651,17 @@ overlay input width and height same as @var{overlay_w} and @var{overlay_h} @end table +@var{options} is an optional list of @var{key}=@var{value} pairs, +separated by ":". + +The description of the accepted options follows. + +@table @option +@item rgb +If set to 1, force the filter to accept inputs in the RGB +colorspace. Default value is 0. +@end table + Be aware that frames are taken from each input video in timestamp order, hence, if their initial timestamps differ, it is a a good idea to pass the two inputs through a @var{setpts=PTS-STARTPTS} filter to diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 57c9fe9..db53985 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -33,6 +33,7 @@ #include "libavutil/imgutils.h" #include "libavutil/mathematics.h" #include "internal.h" +#include "drawutils.h" static const char *var_names[] = { "main_w", "W", ///< width of the main video @@ -53,13 +54,31 @@ enum var_name { #define MAIN 0 #define OVERLAY 1 +#define R 0 +#define G 1 +#define B 2 +#define A 3 + +#define Y 0 +#define U 1 +#define V 2 + typedef struct { const AVClass *class; int x, y; ///< position of overlayed picture + int allow_packed_rgb; + uint8_t main_is_packed_rgb; + uint8_t main_rgba_map[4]; + uint8_t main_has_alpha; + uint8_t overlay_is_packed_rgb; + uint8_t overlay_rgba_map[4]; + uint8_t overlay_has_alpha; + AVFilterBufferRef *overpicref; - int max_plane_step[4]; ///< steps per pixel for each plane + int main_pix_step[4]; ///< steps per pixel for each plane of the main output + int overlay_pix_step[4]; ///< steps per pixel for each plane of the overlay int hsub, vsub; ///< chroma subsampling values char *x_expr, *y_expr; @@ -70,6 +89,7 @@ typedef struct { static const AVOption overlay_options[] = { { "x", "set the x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX }, { "y", "set the y expression", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX }, + {"rgb", "force packed RGB in input and output", OFFSET(allow_packed_rgb), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1 }, {NULL}, }; @@ -128,27 +148,59 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - const enum PixelFormat inout_pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE }; - const enum PixelFormat blend_pix_fmts[] = { PIX_FMT_YUVA420P, PIX_FMT_NONE }; - AVFilterFormats *inout_formats = avfilter_make_format_list(inout_pix_fmts); - AVFilterFormats *blend_formats = avfilter_make_format_list(blend_pix_fmts); + OverlayContext *over = ctx->priv; - avfilter_formats_ref(inout_formats, &ctx->inputs [MAIN ]->out_formats); - avfilter_formats_ref(blend_formats, &ctx->inputs [OVERLAY]->out_formats); - avfilter_formats_ref(inout_formats, &ctx->outputs[MAIN ]->in_formats ); + /* overlay formats contains alpha, for avoiding conversion with alpha information loss */ + const enum PixelFormat main_pix_fmts_yuv[] = { PIX_FMT_YUV420P, PIX_FMT_NONE }; + const enum PixelFormat overlay_pix_fmts_yuv[] = { PIX_FMT_YUVA420P, PIX_FMT_NONE }; + const enum PixelFormat main_pix_fmts_rgb[] = { + PIX_FMT_ARGB, PIX_FMT_RGBA, + PIX_FMT_ABGR, PIX_FMT_BGRA, + PIX_FMT_RGB24, PIX_FMT_BGR24, + PIX_FMT_NONE + }; + const enum PixelFormat overlay_pix_fmts_rgb[] = { + PIX_FMT_ARGB, PIX_FMT_RGBA, + PIX_FMT_ABGR, PIX_FMT_BGRA, + PIX_FMT_NONE + }; + + AVFilterFormats *main_formats; + AVFilterFormats *overlay_formats; + + if (over->allow_packed_rgb) { + main_formats = avfilter_make_format_list(main_pix_fmts_rgb); + overlay_formats = avfilter_make_format_list(overlay_pix_fmts_rgb); + } else { + main_formats = avfilter_make_format_list(main_pix_fmts_yuv); + overlay_formats = avfilter_make_format_list(overlay_pix_fmts_yuv); + } + + avfilter_formats_ref(main_formats, &ctx->inputs [MAIN ]->out_formats); + avfilter_formats_ref(overlay_formats, &ctx->inputs [OVERLAY]->out_formats); + avfilter_formats_ref(main_formats, &ctx->outputs[MAIN ]->in_formats ); return 0; } +static enum PixelFormat alpha_pix_fmts[] = { + PIX_FMT_YUVA420P, PIX_FMT_ARGB, PIX_FMT_ABGR, PIX_FMT_RGBA, + PIX_FMT_BGRA, PIX_FMT_NONE +}; + static int config_input_main(AVFilterLink *inlink) { OverlayContext *over = inlink->dst->priv; const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format]; - av_image_fill_max_pixsteps(over->max_plane_step, NULL, pix_desc); + av_image_fill_max_pixsteps(over->main_pix_step, NULL, pix_desc); + over->hsub = pix_desc->log2_chroma_w; over->vsub = pix_desc->log2_chroma_h; + over->main_is_packed_rgb = + ff_fill_rgba_map(over->main_rgba_map, inlink->format) >= 0; + over->main_has_alpha = ff_fmt_is_in(inlink->format, alpha_pix_fmts); return 0; } @@ -159,6 +211,9 @@ static int config_input_overlay(AVFilterLink *inlink) char *expr; double var_values[VAR_VARS_NB], res; int ret; + const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format]; + + av_image_fill_max_pixsteps(over->overlay_pix_step, NULL, pix_desc); /* Finish the configuration by evaluating the expressions now when both inputs are configured. */ @@ -181,6 +236,10 @@ static int config_input_overlay(AVFilterLink *inlink) goto fail; over->x = res; + over->overlay_is_packed_rgb = + ff_fill_rgba_map(over->overlay_rgba_map, inlink->format) >= 0; + over->overlay_has_alpha = ff_fmt_is_in(inlink->format, alpha_pix_fmts); + av_log(ctx, AV_LOG_INFO, "main w:%d h:%d fmt:%s overlay x:%d y:%d w:%d h:%d fmt:%s\n", ctx->inputs[MAIN]->w, ctx->inputs[MAIN]->h, @@ -272,6 +331,10 @@ static void start_frame_overlay(AVFilterLink *inlink, AVFilterBufferRef *inpicre ctx->outputs[0]->time_base); } +// divide by 255 and round to nearest +// apply a fast variant: (X+127)/255 = ((X+127)*257+257)>>16 = ((X+128)*257)>>16 +#define FAST_DIV255(x) ((((x) + 128) * 257) >> 16) + static void blend_slice(AVFilterContext *ctx, AVFilterBufferRef *dst, AVFilterBufferRef *src, int x, int y, int w, int h, @@ -289,21 +352,43 @@ static void blend_slice(AVFilterContext *ctx, start_y = FFMAX(y, slice_y); height = end_y - start_y; - if (dst->format == PIX_FMT_BGR24 || dst->format == PIX_FMT_RGB24) { - uint8_t *dp = dst->data[0] + x * 3 + start_y * dst->linesize[0]; + if (over->main_is_packed_rgb) { + uint8_t *dp = dst->data[0] + x * over->main_pix_step[0] + + start_y * dst->linesize[0]; uint8_t *sp = src->data[0]; - int b = dst->format == PIX_FMT_BGR24 ? 2 : 0; - int r = dst->format == PIX_FMT_BGR24 ? 0 : 2; + uint8_t alpha; ///< the amount of overlay to blend on to main + const int dr = over->main_rgba_map[R]; + const int dg = over->main_rgba_map[G]; + const int db = over->main_rgba_map[B]; + const int dstep = over->main_pix_step[0]; + const int sr = over->overlay_rgba_map[R]; + const int sg = over->overlay_rgba_map[G]; + const int sb = over->overlay_rgba_map[B]; + const int sa = over->overlay_rgba_map[A]; + const int sstep = over->overlay_pix_step[0]; if (slice_y > y) sp += (slice_y - y) * src->linesize[0]; for (i = 0; i < height; i++) { uint8_t *d = dp, *s = sp; for (j = 0; j < width; j++) { - d[r] = (d[r] * (0xff - s[3]) + s[0] * s[3] + 128) >> 8; - d[1] = (d[1] * (0xff - s[3]) + s[1] * s[3] + 128) >> 8; - d[b] = (d[b] * (0xff - s[3]) + s[2] * s[3] + 128) >> 8; - d += 3; - s += 4; + alpha = s[sa]; + switch (alpha) { + case 0: + break; + case 255: + d[dr] = s[sr]; + d[dg] = s[sg]; + d[db] = s[sb]; + break; + default: + // main_value = main_value * (1 - alpha) + overlay_value * alpha + // since alpha is in the range 0-255, the result must divided by 255 + d[dr] = FAST_DIV255(d[dr] * (255 - alpha) + s[sr] * alpha); + d[dg] = FAST_DIV255(d[dg] * (255 - alpha) + s[sg] * alpha); + d[db] = FAST_DIV255(d[db] * (255 - alpha) + s[sb] * alpha); + } + d += dstep; + s += sstep; } dp += dst->linesize[0]; sp += src->linesize[0];

1 0

dirac: ff_diracdsp_init_mmx() is only compiled when yasm is available
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 02:47:23 2011 +0100| [c0dbab964d0669ad549a289c39fd9852b5f7d136] | committer: Michael Niedermayer dirac: ff_diracdsp_init_mmx() is only compiled when yasm is available Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0dbab964d0669ad5… --- libavcodec/diracdsp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/diracdsp.c b/libavcodec/diracdsp.c index 872faae..6cf75d8 100644 --- a/libavcodec/diracdsp.c +++ b/libavcodec/diracdsp.c @@ -197,5 +197,5 @@ void ff_diracdsp_init(DiracDSPContext *c) PIXFUNC(avg, 16); PIXFUNC(avg, 32); - if (HAVE_MMX) ff_diracdsp_init_mmx(c); + if (HAVE_MMX && HAVE_YASM) ff_diracdsp_init_mmx(c); }

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 02:26:37 2011 +0100| [0489af478e5f490aee2d96daa29043b590c8d280] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: libdirac/libschroedinger: Drop unnecessary symbol prefixes. cmdutils: check fread() return value Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0489af478e5f490ae… ---

1 0

libdirac/libschroedinger: Drop unnecessary symbol prefixes.
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Sun Oct 30 13:19:50 2011 +0100| [45235d69c271966409cdd3eaa022258c22e04fdb] | committer: Diego Biurrun libdirac/libschroedinger: Drop unnecessary symbol prefixes. The names used in the libdirac/libschroedinger wrappers are long enough as-is. Bloating them with unnecessary prefixes makes them even more unwieldy. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45235d69c27196640… --- libavcodec/libdirac.h | 2 +- libavcodec/libdirac_libschro.c | 16 ++++++------ libavcodec/libdirac_libschro.h | 28 +++++++++++----------- libavcodec/libdiracdec.c | 24 ++++++++++---------- libavcodec/libdiracenc.c | 30 ++++++++++++------------ libavcodec/libschroedinger.c | 8 +++--- libavcodec/libschroedinger.h | 2 +- libavcodec/libschroedingerdec.c | 46 +++++++++++++++++++------------------- libavcodec/libschroedingerenc.c | 33 +++++++++++++-------------- 9 files changed, 94 insertions(+), 95 deletions(-) diff --git a/libavcodec/libdirac.h b/libavcodec/libdirac.h index 7f79122..e054f61 100644 --- a/libavcodec/libdirac.h +++ b/libavcodec/libdirac.h @@ -35,7 +35,7 @@ static const struct { enum PixelFormat ff_pix_fmt; dirac_chroma_t dirac_pix_fmt; -} ffmpeg_dirac_pixel_format_map[] = { +} dirac_pixel_format_map[] = { { PIX_FMT_YUV420P, format420 }, { PIX_FMT_YUV422P, format422 }, { PIX_FMT_YUV444P, format444 }, diff --git a/libavcodec/libdirac_libschro.c b/libavcodec/libdirac_libschro.c index 525d866..45b5b83 100644 --- a/libavcodec/libdirac_libschro.c +++ b/libavcodec/libdirac_libschro.c @@ -25,7 +25,7 @@ #include "libdirac_libschro.h" -static const FfmpegDiracSchroVideoFormatInfo ff_dirac_schro_video_format_info[] = { +static const DiracSchroVideoFormatInfo ff_dirac_schro_video_format_info[] = { { 640, 480, 24000, 1001}, { 176, 120, 15000, 1001}, { 176, 144, 25, 2 }, @@ -53,7 +53,7 @@ unsigned int ff_dirac_schro_get_video_format_idx(AVCodecContext *avccontext) sizeof(ff_dirac_schro_video_format_info[0]); for (idx = 1; idx < num_formats; ++idx) { - const FfmpegDiracSchroVideoFormatInfo *vf = &ff_dirac_schro_video_format_info[idx]; + const DiracSchroVideoFormatInfo *vf = &ff_dirac_schro_video_format_info[idx]; if (avccontext->width == vf->width && avccontext->height == vf->height) { ret_idx = idx; @@ -65,22 +65,22 @@ unsigned int ff_dirac_schro_get_video_format_idx(AVCodecContext *avccontext) return ret_idx; } -void ff_dirac_schro_queue_init(FfmpegDiracSchroQueue *queue) +void ff_dirac_schro_queue_init(DiracSchroQueue *queue) { queue->p_head = queue->p_tail = NULL; queue->size = 0; } -void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue, +void ff_dirac_schro_queue_free(DiracSchroQueue *queue, void (*free_func)(void *)) { while (queue->p_head) free_func(ff_dirac_schro_queue_pop(queue)); } -int ff_dirac_schro_queue_push_back(FfmpegDiracSchroQueue *queue, void *p_data) +int ff_dirac_schro_queue_push_back(DiracSchroQueue *queue, void *p_data) { - FfmpegDiracSchroQueueElement *p_new = av_mallocz(sizeof(FfmpegDiracSchroQueueElement)); + DiracSchroQueueElement *p_new = av_mallocz(sizeof(DiracSchroQueueElement)); if (!p_new) return -1; @@ -97,9 +97,9 @@ int ff_dirac_schro_queue_push_back(FfmpegDiracSchroQueue *queue, void *p_data) return 0; } -void *ff_dirac_schro_queue_pop(FfmpegDiracSchroQueue *queue) +void *ff_dirac_schro_queue_pop(DiracSchroQueue *queue) { - FfmpegDiracSchroQueueElement *top = queue->p_head; + DiracSchroQueueElement *top = queue->p_head; if (top) { void *data = top->data; diff --git a/libavcodec/libdirac_libschro.h b/libavcodec/libdirac_libschro.h index 9c2e9e7..a80558f 100644 --- a/libavcodec/libdirac_libschro.h +++ b/libavcodec/libdirac_libschro.h @@ -33,7 +33,7 @@ typedef struct { uint16_t height; uint16_t frame_rate_num; uint16_t frame_rate_denom; -} FfmpegDiracSchroVideoFormatInfo; +} DiracSchroVideoFormatInfo; /** * Returns the index into the Dirac Schro common video format info table @@ -43,7 +43,7 @@ unsigned int ff_dirac_schro_get_video_format_idx(AVCodecContext *avccontext); /** * contains a single encoded frame returned from Dirac or Schroedinger */ -typedef struct FfmpegDiracSchroEncodedFrame { +typedef struct DiracSchroEncodedFrame { /** encoded frame data */ uint8_t *p_encbuf; @@ -55,51 +55,51 @@ typedef struct FfmpegDiracSchroEncodedFrame { /** key frame flag. 1 : is key frame , 0 : in not key frame */ uint16_t key_frame; -} FfmpegDiracSchroEncodedFrame; +} DiracSchroEncodedFrame; /** * queue element */ -typedef struct FfmpegDiracSchroQueueElement { +typedef struct DiracSchroQueueElement { /** Data to be stored in queue*/ void *data; /** Pointer to next element queue */ - struct FfmpegDiracSchroQueueElement *next; -} FfmpegDiracSchroQueueElement; + struct DiracSchroQueueElement *next; +} DiracSchroQueueElement; /** * A simple queue implementation used in libdirac and libschroedinger */ -typedef struct FfmpegDiracSchroQueue { +typedef struct DiracSchroQueue { /** Pointer to head of queue */ - FfmpegDiracSchroQueueElement *p_head; + DiracSchroQueueElement *p_head; /** Pointer to tail of queue */ - FfmpegDiracSchroQueueElement *p_tail; + DiracSchroQueueElement *p_tail; /** Queue size*/ int size; -} FfmpegDiracSchroQueue; +} DiracSchroQueue; /** * Initialise the queue */ -void ff_dirac_schro_queue_init(FfmpegDiracSchroQueue *queue); +void ff_dirac_schro_queue_init(DiracSchroQueue *queue); /** * Add an element to the end of the queue */ -int ff_dirac_schro_queue_push_back(FfmpegDiracSchroQueue *queue, void *p_data); +int ff_dirac_schro_queue_push_back(DiracSchroQueue *queue, void *p_data); /** * Return the first element in the queue */ -void *ff_dirac_schro_queue_pop(FfmpegDiracSchroQueue *queue); +void *ff_dirac_schro_queue_pop(DiracSchroQueue *queue); /** * Free the queue resources. free_func is a function supplied by the caller to * free any resources allocated by the caller. The data field of the queue * element is passed to it. */ -void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue, +void ff_dirac_schro_queue_free(DiracSchroQueue *queue, void (*free_func)(void *)); #endif /* AVCODEC_LIBDIRAC_LIBSCHRO_H */ diff --git a/libavcodec/libdiracdec.c b/libavcodec/libdiracdec.c index 5b3ad23..6565171 100644 --- a/libavcodec/libdiracdec.c +++ b/libavcodec/libdiracdec.c @@ -37,34 +37,34 @@ #include <libdirac_decoder/dirac_parser.h> /** contains a single frame returned from Dirac */ -typedef struct FfmpegDiracDecoderParams { +typedef struct DiracDecoderParams { /** decoder handle */ dirac_decoder_t* p_decoder; /** buffer to hold decoded frame */ unsigned char* p_out_frame_buf; -} FfmpegDiracDecoderParams; +} DiracDecoderParams; /** * returns Libav chroma format */ -static enum PixelFormat GetFfmpegChromaFormat(dirac_chroma_t dirac_pix_fmt) +static enum PixelFormat get_chroma_format(dirac_chroma_t dirac_pix_fmt) { - int num_formats = sizeof(ffmpeg_dirac_pixel_format_map) / - sizeof(ffmpeg_dirac_pixel_format_map[0]); + int num_formats = sizeof(dirac_pixel_format_map) / + sizeof(dirac_pixel_format_map[0]); int idx; for (idx = 0; idx < num_formats; ++idx) - if (ffmpeg_dirac_pixel_format_map[idx].dirac_pix_fmt == dirac_pix_fmt) - return ffmpeg_dirac_pixel_format_map[idx].ff_pix_fmt; + if (dirac_pixel_format_map[idx].dirac_pix_fmt == dirac_pix_fmt) + return dirac_pixel_format_map[idx].ff_pix_fmt; return PIX_FMT_NONE; } static av_cold int libdirac_decode_init(AVCodecContext *avccontext) { - FfmpegDiracDecoderParams *p_dirac_params = avccontext->priv_data; + DiracDecoderParams *p_dirac_params = avccontext->priv_data; p_dirac_params->p_decoder = dirac_decoder_init(avccontext->debug); if (!p_dirac_params->p_decoder) @@ -80,7 +80,7 @@ static int libdirac_decode_frame(AVCodecContext *avccontext, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - FfmpegDiracDecoderParams *p_dirac_params = avccontext->priv_data; + DiracDecoderParams *p_dirac_params = avccontext->priv_data; AVPicture *picture = data; AVPicture pic; int pict_size; @@ -117,7 +117,7 @@ static int libdirac_decode_frame(AVCodecContext *avccontext, avccontext->height = src_params->height; avccontext->width = src_params->width; - avccontext->pix_fmt = GetFfmpegChromaFormat(src_params->chroma); + avccontext->pix_fmt = get_chroma_format(src_params->chroma); if (avccontext->pix_fmt == PIX_FMT_NONE) { av_log(avccontext, AV_LOG_ERROR, "Dirac chroma format %d not supported currently\n", @@ -174,7 +174,7 @@ static int libdirac_decode_frame(AVCodecContext *avccontext, static av_cold int libdirac_decode_close(AVCodecContext *avccontext) { - FfmpegDiracDecoderParams *p_dirac_params = avccontext->priv_data; + DiracDecoderParams *p_dirac_params = avccontext->priv_data; dirac_decoder_close(p_dirac_params->p_decoder); av_freep(&p_dirac_params->p_out_frame_buf); @@ -198,7 +198,7 @@ AVCodec ff_libdirac_decoder = { .name = "libdirac", .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_DIRAC, - .priv_data_size = sizeof(FfmpegDiracDecoderParams), + .priv_data_size = sizeof(DiracDecoderParams), .init = libdirac_decode_init, .close = libdirac_decode_close, .decode = libdirac_decode_frame, diff --git a/libavcodec/libdiracenc.c b/libavcodec/libdiracenc.c index 9d02db9..33dba22 100644 --- a/libavcodec/libdiracenc.c +++ b/libavcodec/libdiracenc.c @@ -38,7 +38,7 @@ #include <libdirac_encoder/dirac_encoder.h> /** Dirac encoder private data */ -typedef struct FfmpegDiracEncoderParams { +typedef struct DiracEncoderParams { /** Dirac encoder context */ dirac_encoder_context_t enc_ctx; @@ -61,27 +61,27 @@ typedef struct FfmpegDiracEncoderParams { int enc_buf_size; /** queue storing encoded frames */ - FfmpegDiracSchroQueue enc_frame_queue; + DiracSchroQueue enc_frame_queue; /** end of sequence signalled by user, 0 - false, 1 - true */ int eos_signalled; /** end of sequence returned by encoder, 0 - false, 1 - true */ int eos_pulled; -} FfmpegDiracEncoderParams; +} DiracEncoderParams; /** * Works out Dirac-compatible chroma format. */ static dirac_chroma_t GetDiracChromaFormat(enum PixelFormat ff_pix_fmt) { - int num_formats = sizeof(ffmpeg_dirac_pixel_format_map) / - sizeof(ffmpeg_dirac_pixel_format_map[0]); + int num_formats = sizeof(dirac_pixel_format_map) / + sizeof(dirac_pixel_format_map[0]); int idx; for (idx = 0; idx < num_formats; ++idx) - if (ffmpeg_dirac_pixel_format_map[idx].ff_pix_fmt == ff_pix_fmt) - return ffmpeg_dirac_pixel_format_map[idx].dirac_pix_fmt; + if (dirac_pixel_format_map[idx].ff_pix_fmt == ff_pix_fmt) + return dirac_pixel_format_map[idx].dirac_pix_fmt; return formatNK; } @@ -127,7 +127,7 @@ static VideoFormat GetDiracVideoFormatPreset(AVCodecContext *avccontext) static av_cold int libdirac_encode_init(AVCodecContext *avccontext) { - FfmpegDiracEncoderParams* p_dirac_params = avccontext->priv_data; + DiracEncoderParams* p_dirac_params = avccontext->priv_data; int no_local = 1; int verbose = avccontext->debug; VideoFormat preset; @@ -219,7 +219,7 @@ static av_cold int libdirac_encode_init(AVCodecContext *avccontext) static void DiracFreeFrame(void *data) { - FfmpegDiracSchroEncodedFrame *enc_frame = data; + DiracSchroEncodedFrame *enc_frame = data; av_freep(&(enc_frame->p_encbuf)); av_free(enc_frame); @@ -231,9 +231,9 @@ static int libdirac_encode_frame(AVCodecContext *avccontext, { int enc_size = 0; dirac_encoder_state_t state; - FfmpegDiracEncoderParams* p_dirac_params = avccontext->priv_data; - FfmpegDiracSchroEncodedFrame* p_frame_output = NULL; - FfmpegDiracSchroEncodedFrame* p_next_output_frame = NULL; + DiracEncoderParams *p_dirac_params = avccontext->priv_data; + DiracSchroEncodedFrame *p_frame_output = NULL; + DiracSchroEncodedFrame *p_next_output_frame = NULL; int go = 1; int last_frame_in_sequence = 0; @@ -303,7 +303,7 @@ static int libdirac_encode_frame(AVCodecContext *avccontext, break; /* create output frame */ - p_frame_output = av_mallocz(sizeof(FfmpegDiracSchroEncodedFrame)); + p_frame_output = av_mallocz(sizeof(DiracSchroEncodedFrame)); /* set output data */ p_frame_output->size = p_dirac_params->enc_buf_size; p_frame_output->p_encbuf = p_dirac_params->enc_buf; @@ -371,7 +371,7 @@ static int libdirac_encode_frame(AVCodecContext *avccontext, static av_cold int libdirac_encode_close(AVCodecContext *avccontext) { - FfmpegDiracEncoderParams* p_dirac_params = avccontext->priv_data; + DiracEncoderParams *p_dirac_params = avccontext->priv_data; /* close the encoder */ dirac_encoder_close(p_dirac_params->p_encoder); @@ -395,7 +395,7 @@ AVCodec ff_libdirac_encoder = { .name = "libdirac", .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_DIRAC, - .priv_data_size = sizeof(FfmpegDiracEncoderParams), + .priv_data_size = sizeof(DiracEncoderParams), .init = libdirac_encode_init, .encode = libdirac_encode_frame, .close = libdirac_encode_close, diff --git a/libavcodec/libschroedinger.c b/libavcodec/libschroedinger.c index 804d652..1d31712 100644 --- a/libavcodec/libschroedinger.c +++ b/libavcodec/libschroedinger.c @@ -64,14 +64,14 @@ SchroVideoFormatEnum ff_get_schro_video_format_preset(AVCodecContext *avccontext int ff_get_schro_frame_format (SchroChromaFormat schro_pix_fmt, SchroFrameFormat *schro_frame_fmt) { - unsigned int num_formats = sizeof(ffmpeg_schro_pixel_format_map) / - sizeof(ffmpeg_schro_pixel_format_map[0]); + unsigned int num_formats = sizeof(schro_pixel_format_map) / + sizeof(schro_pixel_format_map[0]); int idx; for (idx = 0; idx < num_formats; ++idx) { - if (ffmpeg_schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt) { - *schro_frame_fmt = ffmpeg_schro_pixel_format_map[idx].schro_frame_fmt; + if (schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt) { + *schro_frame_fmt = schro_pixel_format_map[idx].schro_frame_fmt; return 0; } } diff --git a/libavcodec/libschroedinger.h b/libavcodec/libschroedinger.h index c9e2a5e..c6ae5ea 100644 --- a/libavcodec/libschroedinger.h +++ b/libavcodec/libschroedinger.h @@ -34,7 +34,7 @@ static const struct { enum PixelFormat ff_pix_fmt; SchroChromaFormat schro_pix_fmt; SchroFrameFormat schro_frame_fmt; -} ffmpeg_schro_pixel_format_map[] = { +} schro_pixel_format_map[] = { { PIX_FMT_YUV420P, SCHRO_CHROMA_420, SCHRO_FRAME_FORMAT_U8_420 }, { PIX_FMT_YUV422P, SCHRO_CHROMA_422, SCHRO_FRAME_FORMAT_U8_422 }, { PIX_FMT_YUV444P, SCHRO_CHROMA_444, SCHRO_FRAME_FORMAT_U8_444 }, diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index a9c1ca4..184e8cb 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -41,7 +41,7 @@ #include <schroedinger/schrovideoformat.h> /** libschroedinger decoder private data */ -typedef struct FfmpegSchroDecoderParams { +typedef struct SchroDecoderParams { /** Schroedinger video format */ SchroVideoFormat *format; @@ -52,7 +52,7 @@ typedef struct FfmpegSchroDecoderParams { SchroDecoder* decoder; /** queue storing decoded frames */ - FfmpegDiracSchroQueue dec_frame_queue; + DiracSchroQueue dec_frame_queue; /** end of sequence signalled */ int eos_signalled; @@ -62,25 +62,25 @@ typedef struct FfmpegSchroDecoderParams { /** decoded picture */ AVPicture dec_pic; -} FfmpegSchroDecoderParams; +} SchroDecoderParams; -typedef struct FfmpegSchroParseUnitContext { +typedef struct SchroParseUnitContext { const uint8_t *buf; int buf_size; -} FfmpegSchroParseUnitContext; +} SchroParseUnitContext; static void libschroedinger_decode_buffer_free(SchroBuffer *schro_buf, void *priv); -static void FfmpegSchroParseContextInit(FfmpegSchroParseUnitContext *parse_ctx, - const uint8_t *buf, int buf_size) +static void SchroParseContextInit(SchroParseUnitContext *parse_ctx, + const uint8_t *buf, int buf_size) { parse_ctx->buf = buf; parse_ctx->buf_size = buf_size; } -static SchroBuffer* FfmpegFindNextSchroParseUnit(FfmpegSchroParseUnitContext *parse_ctx) +static SchroBuffer *FindNextSchroParseUnit(SchroParseUnitContext *parse_ctx) { SchroBuffer *enc_buf = NULL; int next_pu_offset = 0; @@ -120,22 +120,22 @@ static SchroBuffer* FfmpegFindNextSchroParseUnit(FfmpegSchroParseUnitContext *pa /** * Returns Libav chroma format. */ -static enum PixelFormat GetFfmpegChromaFormat(SchroChromaFormat schro_pix_fmt) +static enum PixelFormat get_chroma_format(SchroChromaFormat schro_pix_fmt) { - int num_formats = sizeof(ffmpeg_schro_pixel_format_map) / - sizeof(ffmpeg_schro_pixel_format_map[0]); + int num_formats = sizeof(schro_pixel_format_map) / + sizeof(schro_pixel_format_map[0]); int idx; for (idx = 0; idx < num_formats; ++idx) - if (ffmpeg_schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt) - return ffmpeg_schro_pixel_format_map[idx].ff_pix_fmt; + if (schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt) + return schro_pixel_format_map[idx].ff_pix_fmt; return PIX_FMT_NONE; } static av_cold int libschroedinger_decode_init(AVCodecContext *avccontext) { - FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avccontext->priv_data; /* First of all, initialize our supporting libraries. */ schro_init(); @@ -164,7 +164,7 @@ static void libschroedinger_decode_frame_free(void *frame) static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext) { - FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avccontext->priv_data; SchroDecoder *decoder = p_schro_params->decoder; p_schro_params->format = schro_decoder_get_video_format(decoder); @@ -179,7 +179,7 @@ static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext) } avccontext->height = p_schro_params->format->height; avccontext->width = p_schro_params->format->width; - avccontext->pix_fmt = GetFfmpegChromaFormat(p_schro_params->format->chroma_format); + avccontext->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format); if (ff_get_schro_frame_format(p_schro_params->format->chroma_format, &p_schro_params->frame_format) == -1) { @@ -206,7 +206,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avccontext->priv_data; SchroDecoder *decoder = p_schro_params->decoder; AVPicture *picture = data; SchroBuffer *enc_buf; @@ -214,11 +214,11 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, int state; int go = 1; int outer = 1; - FfmpegSchroParseUnitContext parse_ctx; + SchroParseUnitContext parse_ctx; *data_size = 0; - FfmpegSchroParseContextInit(&parse_ctx, buf, buf_size); + SchroParseContextInit(&parse_ctx, buf, buf_size); if (!buf_size) { if (!p_schro_params->eos_signalled) { state = schro_decoder_push_end_of_stream(decoder); @@ -228,7 +228,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, /* Loop through all the individual parse units in the input buffer */ do { - if ((enc_buf = FfmpegFindNextSchroParseUnit(&parse_ctx))) { + if ((enc_buf = FindNextSchroParseUnit(&parse_ctx))) { /* Push buffer into decoder. */ if (SCHRO_PARSE_CODE_IS_PICTURE(enc_buf->data[4]) && SCHRO_PARSE_CODE_NUM_REFS(enc_buf->data[4]) > 0) @@ -314,7 +314,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, static av_cold int libschroedinger_decode_close(AVCodecContext *avccontext) { - FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avccontext->priv_data; /* Free the decoder. */ schro_decoder_free(p_schro_params->decoder); av_freep(&p_schro_params->format); @@ -332,7 +332,7 @@ static void libschroedinger_flush(AVCodecContext *avccontext) { /* Got a seek request. Free the decoded frames queue and then reset * the decoder */ - FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avccontext->priv_data; /* Free data in the output frame queue. */ ff_dirac_schro_queue_free(&p_schro_params->dec_frame_queue, @@ -348,7 +348,7 @@ AVCodec ff_libschroedinger_decoder = { .name = "libschroedinger", .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_DIRAC, - .priv_data_size = sizeof(FfmpegSchroDecoderParams), + .priv_data_size = sizeof(SchroDecoderParams), .init = libschroedinger_decode_init, .close = libschroedinger_decode_close, .decode = libschroedinger_decode_frame, diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index 43494a1..dec9c2a 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -41,7 +41,7 @@ /** libschroedinger encoder private data */ -typedef struct FfmpegSchroEncoderParams { +typedef struct SchroEncoderParams { /** Schroedinger video format */ SchroVideoFormat *format; @@ -64,31 +64,31 @@ typedef struct FfmpegSchroEncoderParams { int enc_buf_size; /** queue storing encoded frames */ - FfmpegDiracSchroQueue enc_frame_queue; + DiracSchroQueue enc_frame_queue; /** end of sequence signalled */ int eos_signalled; /** end of sequence pulled */ int eos_pulled; -} FfmpegSchroEncoderParams; +} SchroEncoderParams; /** * Works out Schro-compatible chroma format. */ static int SetSchroChromaFormat(AVCodecContext *avccontext) { - int num_formats = sizeof(ffmpeg_schro_pixel_format_map) / - sizeof(ffmpeg_schro_pixel_format_map[0]); + int num_formats = sizeof(schro_pixel_format_map) / + sizeof(schro_pixel_format_map[0]); int idx; - FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data; + SchroEncoderParams *p_schro_params = avccontext->priv_data; for (idx = 0; idx < num_formats; ++idx) { - if (ffmpeg_schro_pixel_format_map[idx].ff_pix_fmt == + if (schro_pixel_format_map[idx].ff_pix_fmt == avccontext->pix_fmt) { p_schro_params->format->chroma_format = - ffmpeg_schro_pixel_format_map[idx].schro_pix_fmt; + schro_pixel_format_map[idx].schro_pix_fmt; return 0; } } @@ -102,7 +102,7 @@ static int SetSchroChromaFormat(AVCodecContext *avccontext) static int libschroedinger_encode_init(AVCodecContext *avccontext) { - FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data; + SchroEncoderParams *p_schro_params = avccontext->priv_data; SchroVideoFormatEnum preset; /* Initialize the libraries that libschroedinger depends on. */ @@ -238,7 +238,7 @@ static int libschroedinger_encode_init(AVCodecContext *avccontext) static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avccontext, void *in_data) { - FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data; + SchroEncoderParams *p_schro_params = avccontext->priv_data; SchroFrame *in_frame; /* Input line size may differ from what the codec supports. Especially * when transcoding from one format to another. So use avpicture_layout @@ -256,7 +256,7 @@ static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avccontext, static void SchroedingerFreeFrame(void *data) { - FfmpegDiracSchroEncodedFrame *enc_frame = data; + DiracSchroEncodedFrame *enc_frame = data; av_freep(&(enc_frame->p_encbuf)); av_free(enc_frame); @@ -267,9 +267,9 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext, int buf_size, void *data) { int enc_size = 0; - FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data; + SchroEncoderParams *p_schro_params = avccontext->priv_data; SchroEncoder *encoder = p_schro_params->encoder; - struct FfmpegDiracSchroEncodedFrame* p_frame_output = NULL; + struct DiracSchroEncodedFrame *p_frame_output = NULL; int go = 1; SchroBuffer *enc_buf; int presentation_frame; @@ -328,7 +328,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext, } /* Create output frame. */ - p_frame_output = av_mallocz(sizeof(FfmpegDiracSchroEncodedFrame)); + p_frame_output = av_mallocz(sizeof(DiracSchroEncodedFrame)); /* Set output data. */ p_frame_output->size = p_schro_params->enc_buf_size; p_frame_output->p_encbuf = p_schro_params->enc_buf; @@ -400,8 +400,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext, static int libschroedinger_encode_close(AVCodecContext *avccontext) { - - FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data; + SchroEncoderParams *p_schro_params = avccontext->priv_data; /* Close the encoder. */ schro_encoder_free(p_schro_params->encoder); @@ -426,7 +425,7 @@ AVCodec ff_libschroedinger_encoder = { .name = "libschroedinger", .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_DIRAC, - .priv_data_size = sizeof(FfmpegSchroEncoderParams), + .priv_data_size = sizeof(SchroEncoderParams), .init = libschroedinger_encode_init, .encode = libschroedinger_encode_frame, .close = libschroedinger_encode_close,

1 0

cmdutils: check fread() return value
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Janne Grunau <janne-libav(a)jannau.net> | Sun Oct 30 15:34:32 2011 +0100| [d94c577d3c61e428cfcbcd3dc3a80bd848077eae] | committer: Janne Grunau cmdutils: check fread() return value > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d94c577d3c61e428c… --- cmdutils.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index ade3f10..c158de3 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -787,6 +787,7 @@ int read_yesno(void) int read_file(const char *filename, char **bufptr, size_t *size) { + int ret; FILE *f = fopen(filename, "rb"); if (!f) { @@ -802,11 +803,22 @@ int read_file(const char *filename, char **bufptr, size_t *size) fclose(f); return AVERROR(ENOMEM); } - fread(*bufptr, 1, *size, f); - (*bufptr)[*size++] = '\0'; + ret = fread(*bufptr, 1, *size, f); + if (ret < *size) { + av_free(*bufptr); + if (ferror(f)) { + av_log(NULL, AV_LOG_ERROR, "Error while reading file '%s': %s\n", + filename, strerror(errno)); + ret = AVERROR(errno); + } else + ret = AVERROR_EOF; + } else { + ret = 0; + (*bufptr)[*size++] = '\0'; + } fclose(f); - return 0; + return ret; } void init_pts_correction(PtsCorrectionContext *ctx)

1 0

sws: fallback to mmx2 when yuv2yuvX_sse3() cannot be used.
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 01:46:06 2011 +0100| [e484b64ce37e7bc7556c6113ce6f10671e20f61f] | committer: Michael Niedermayer sws: fallback to mmx2 when yuv2yuvX_sse3() cannot be used. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e484b64ce37e7bc75… --- libswscale/x86/swscale_mmx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libswscale/x86/swscale_mmx.c b/libswscale/x86/swscale_mmx.c index 6053310..c16be83 100644 --- a/libswscale/x86/swscale_mmx.c +++ b/libswscale/x86/swscale_mmx.c @@ -180,6 +180,9 @@ static void yuv2yuvX_sse3(const int16_t *filter, int filterSize, const int16_t **src, uint8_t *dest, int dstW, const uint8_t *dither, int offset) { + if(((int)dest) & 15){ + return yuv2yuvX_MMX2(filter, filterSize, src, dest, dstW, dither, offset); + } if (offset) { __asm__ volatile("movq (%0), %%xmm3\n\t" "movdqa %%xmm3, %%xmm4\n\t"

1 0

sws: print a warning on unaligned input on SSE2+
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 01:36:02 2011 +0100| [f44ad92c3fc87daa0e2e9f5499662050be8b2bf3] | committer: Michael Niedermayer sws: print a warning on unaligned input on SSE2+ Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f44ad92c3fc87daa0… --- libswscale/swscale.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index d5dfa07..bde7307 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2539,6 +2539,18 @@ static int swScale(SwsContext *c, const uint8_t* src[], } } + if ((int)dst[0]%16 || (int)dst[1]%16 || (int)dst[2]%16 || (int)src[0]%16 || (int)src[1]%16 || (int)src[2]%16 + || dstStride[0]%16 || dstStride[1]%16 || dstStride[2]%16 || dstStride[3]%16 + || srcStride[0]%16 || srcStride[1]%16 || srcStride[2]%16 || srcStride[3]%16 + ) { + static int warnedAlready=0; + int cpu_flags = av_get_cpu_flags(); + if (HAVE_MMX2 && (cpu_flags & AV_CPU_FLAG_SSE2) && !warnedAlready){ + av_log(c, AV_LOG_WARNING, "Warning: data is not aligned! This can lead to a speedloss\n"); + warnedAlready=1; + } + } + /* Note the user might start scaling the picture in the middle so this will not get executed. This is not really intended but works currently, so people might do it. */

1 0

sws: increase stride alignment requirement for the warning print code.
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 01:33:24 2011 +0100| [fbf4b390d02ac53ce8558016c791d7e21b8ebfa4] | committer: Michael Niedermayer sws: increase stride alignment requirement for the warning print code. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbf4b390d02ac53ce… --- libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index f0bde47..d5dfa07 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2530,7 +2530,7 @@ static int swScale(SwsContext *c, const uint8_t* src[], DEBUG_BUFFERS("vLumFilterSize: %d vLumBufSize: %d vChrFilterSize: %d vChrBufSize: %d\n", vLumFilterSize, vLumBufSize, vChrFilterSize, vChrBufSize); - if (dstStride[0]%8 !=0 || dstStride[1]%8 !=0 || dstStride[2]%8 !=0 || dstStride[3]%8 != 0) { + if (dstStride[0]%16 !=0 || dstStride[1]%16 !=0 || dstStride[2]%16 !=0 || dstStride[3]%16 != 0) { static int warnedAlready=0; //FIXME move this into the context perhaps if (flags & SWS_PRINT_INFO && !warnedAlready) { av_log(c, AV_LOG_WARNING, "Warning: dstStride is not aligned!\n"

1 0

Dirac decoding is supported natively.
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Oct 31 01:13:41 2011 +0100| [938458094b054fbeb23722f4c3ef705414f840de] | committer: Carl Eugen Hoyos Dirac decoding is supported natively. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=938458094b054fbeb… --- doc/general.texi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/general.texi b/doc/general.texi index 1b102c8..e5f83d6 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -392,7 +392,7 @@ following image formats are supported: @item Creative YUV (CYUV) @tab @tab X @item DFA @tab @tab X @tab Codec used in Chronomaster game. -@item Dirac @tab E @tab E +@item Dirac @tab E @tab X @tab supported through external libdirac/libschroedinger libraries @item Deluxe Paint Animation @tab @tab X @item DNxHD @tab X @tab X

1 0