September 2012 - ffmpeg-cvslog

aac: reference supported sample rates in encoders.
by git＠videolan.org 06 Nov '12

06 Nov '12

ffmpeg | branch: master | Clément Bœsch <clement.boesch(a)smartjog.com> | Mon Mar 26 22:32:17 2012 +0200| [29679f4a372eb208af31c57177ab49f67c698362] | committer: Clément Bœsch aac: reference supported sample rates in encoders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29679f4a372eb208a… --- libavcodec/aacenc.c | 1 + libavcodec/libvo-aacenc.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index cf4aef9..fd72daf 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -816,6 +816,7 @@ AVCodec ff_aac_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_end, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 8f7c581..c5191ec 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -193,6 +193,7 @@ AVCodec ff_libvo_aacenc_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_close, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

3 2

sws: drop unused variable
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Sep 30 23:14:20 2012 +0200| [015b805d13a293a68263d409a1e7b67d03d3302b] | committer: Michael Niedermayer sws: drop unused variable Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=015b805d13a293a68… --- libswscale/swscale_unscaled.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index d26e6db..de73287 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -109,8 +109,6 @@ DECLARE_ALIGNED(8, const uint8_t, dithers)[8][8][8]={ { 112, 16,104, 8,118, 22,110, 14,}, }}; -static const uint8_t flat64[8]={64,64,64,64,64,64,64,64}; - const uint16_t dither_scale[15][16]={ { 2, 3, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,}, { 2, 3, 7, 7, 13, 13, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,},

1 0

swscale: move main swscale wraper to swscale.c
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Sep 30 23:09:45 2012 +0200| [115e291b533133ec6ba7a720a9255f1c24813857] | committer: Michael Niedermayer swscale: move main swscale wraper to swscale.c It never belonged to swscale_unscaled.c Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=115e291b533133ec6… --- libswscale/swscale.c | 201 +++++++++++++++++++++++++++++++++++++++++ libswscale/swscale_unscaled.c | 200 ---------------------------------------- 2 files changed, 201 insertions(+), 200 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 3b6e847..00a8761 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -739,3 +739,204 @@ SwsFunc ff_getSwsFunc(SwsContext *c) return swScale; } + +static void reset_ptr(const uint8_t *src[], int format) +{ + if (!isALPHA(format)) + src[3] = NULL; + if (!isPlanar(format)) { + src[3] = src[2] = NULL; + + if (!usePal(format)) + src[1] = NULL; + } +} + +static int check_image_pointers(const uint8_t * const data[4], enum PixelFormat pix_fmt, + const int linesizes[4]) +{ + const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; + int i; + + for (i = 0; i < 4; i++) { + int plane = desc->comp[i].plane; + if (!data[plane] || !linesizes[plane]) + return 0; + } + + return 1; +} + +/** + * swscale wrapper, so we don't need to export the SwsContext. + * Assumes planar YUV to be in YUV order instead of YVU. + */ +int attribute_align_arg sws_scale(struct SwsContext *c, + const uint8_t * const srcSlice[], + const int srcStride[], int srcSliceY, + int srcSliceH, uint8_t *const dst[], + const int dstStride[]) +{ + int i, ret; + const uint8_t *src2[4] = { srcSlice[0], srcSlice[1], srcSlice[2], srcSlice[3] }; + uint8_t *dst2[4] = { dst[0], dst[1], dst[2], dst[3] }; + uint8_t *rgb0_tmp = NULL; + + // do not mess up sliceDir if we have a "trailing" 0-size slice + if (srcSliceH == 0) + return 0; + + if (!check_image_pointers(srcSlice, c->srcFormat, srcStride)) { + av_log(c, AV_LOG_ERROR, "bad src image pointers\n"); + return 0; + } + if (!check_image_pointers((const uint8_t* const*)dst, c->dstFormat, dstStride)) { + av_log(c, AV_LOG_ERROR, "bad dst image pointers\n"); + return 0; + } + + if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) { + av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n"); + return 0; + } + if (c->sliceDir == 0) { + if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1; + } + + if (usePal(c->srcFormat)) { + for (i = 0; i < 256; i++) { + int p, r, g, b, y, u, v, a = 0xff; + if (c->srcFormat == PIX_FMT_PAL8) { + p = ((const uint32_t *)(srcSlice[1]))[i]; + a = (p >> 24) & 0xFF; + r = (p >> 16) & 0xFF; + g = (p >> 8) & 0xFF; + b = p & 0xFF; + } else if (c->srcFormat == PIX_FMT_RGB8) { + r = ( i >> 5 ) * 36; + g = ((i >> 2) & 7) * 36; + b = ( i & 3) * 85; + } else if (c->srcFormat == PIX_FMT_BGR8) { + b = ( i >> 6 ) * 85; + g = ((i >> 3) & 7) * 36; + r = ( i & 7) * 36; + } else if (c->srcFormat == PIX_FMT_RGB4_BYTE) { + r = ( i >> 3 ) * 255; + g = ((i >> 1) & 3) * 85; + b = ( i & 1) * 255; + } else if (c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_GRAY8A) { + r = g = b = i; + } else { + av_assert1(c->srcFormat == PIX_FMT_BGR4_BYTE); + b = ( i >> 3 ) * 255; + g = ((i >> 1) & 3) * 85; + r = ( i & 1) * 255; + } +#define RGB2YUV_SHIFT 15 +#define BY ( (int) (0.114 * 219 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define BV (-(int) (0.081 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define BU ( (int) (0.500 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define GY ( (int) (0.587 * 219 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define GV (-(int) (0.419 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define GU (-(int) (0.331 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define RY ( (int) (0.299 * 219 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define RV ( (int) (0.500 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) +#define RU (-(int) (0.169 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) + + y = av_clip_uint8((RY * r + GY * g + BY * b + ( 33 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); + u = av_clip_uint8((RU * r + GU * g + BU * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); + v = av_clip_uint8((RV * r + GV * g + BV * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); + c->pal_yuv[i]= y + (u<<8) + (v<<16) + (a<<24); + + switch (c->dstFormat) { + case PIX_FMT_BGR32: +#if !HAVE_BIGENDIAN + case PIX_FMT_RGB24: +#endif + c->pal_rgb[i]= r + (g<<8) + (b<<16) + (a<<24); + break; + case PIX_FMT_BGR32_1: +#if HAVE_BIGENDIAN + case PIX_FMT_BGR24: +#endif + c->pal_rgb[i]= a + (r<<8) + (g<<16) + (b<<24); + break; + case PIX_FMT_RGB32_1: +#if HAVE_BIGENDIAN + case PIX_FMT_RGB24: +#endif + c->pal_rgb[i]= a + (b<<8) + (g<<16) + (r<<24); + break; + case PIX_FMT_RGB32: +#if !HAVE_BIGENDIAN + case PIX_FMT_BGR24: +#endif + default: + c->pal_rgb[i]= b + (g<<8) + (r<<16) + (a<<24); + } + } + } + + if (c->src0Alpha && !c->dst0Alpha && isALPHA(c->dstFormat)) { + uint8_t *base; + int x,y; + rgb0_tmp = av_malloc(FFABS(srcStride[0]) * srcSliceH + 32); + base = srcStride[0] < 0 ? rgb0_tmp - srcStride[0] * (srcSliceH-1) : rgb0_tmp; + for (y=0; y<srcSliceH; y++){ + memcpy(base + srcStride[0]*y, src2[0] + srcStride[0]*y, 4*c->srcW); + for (x=c->src0Alpha-1; x<4*c->srcW; x+=4) { + base[ srcStride[0]*y + x] = 0xFF; + } + } + src2[0] = base; + } + + // copy strides, so they can safely be modified + if (c->sliceDir == 1) { + // slices go from top to bottom + int srcStride2[4] = { srcStride[0], srcStride[1], srcStride[2], + srcStride[3] }; + int dstStride2[4] = { dstStride[0], dstStride[1], dstStride[2], + dstStride[3] }; + + reset_ptr(src2, c->srcFormat); + reset_ptr((void*)dst2, c->dstFormat); + + /* reset slice direction at end of frame */ + if (srcSliceY + srcSliceH == c->srcH) + c->sliceDir = 0; + + ret = c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, + dstStride2); + } else { + // slices go from bottom to top => we flip the image internally + int srcStride2[4] = { -srcStride[0], -srcStride[1], -srcStride[2], + -srcStride[3] }; + int dstStride2[4] = { -dstStride[0], -dstStride[1], -dstStride[2], + -dstStride[3] }; + + src2[0] += (srcSliceH - 1) * srcStride[0]; + if (!usePal(c->srcFormat)) + src2[1] += ((srcSliceH >> c->chrSrcVSubSample) - 1) * srcStride[1]; + src2[2] += ((srcSliceH >> c->chrSrcVSubSample) - 1) * srcStride[2]; + src2[3] += (srcSliceH - 1) * srcStride[3]; + dst2[0] += ( c->dstH - 1) * dstStride[0]; + dst2[1] += ((c->dstH >> c->chrDstVSubSample) - 1) * dstStride[1]; + dst2[2] += ((c->dstH >> c->chrDstVSubSample) - 1) * dstStride[2]; + dst2[3] += ( c->dstH - 1) * dstStride[3]; + + reset_ptr(src2, c->srcFormat); + reset_ptr((void*)dst2, c->dstFormat); + + /* reset slice direction at end of frame */ + if (!srcSliceY) + c->sliceDir = 0; + + ret = c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, + srcSliceH, dst2, dstStride2); + } + + av_free(rgb0_tmp); + return ret; +} + diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 9180f2e..d26e6db 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -34,17 +34,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/avassert.h" -#define RGB2YUV_SHIFT 15 -#define BY ( (int) (0.114 * 219 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define BV (-(int) (0.081 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define BU ( (int) (0.500 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define GY ( (int) (0.587 * 219 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define GV (-(int) (0.419 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define GU (-(int) (0.331 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define RY ( (int) (0.299 * 219 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define RV ( (int) (0.500 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) -#define RU (-(int) (0.169 * 224 / 255 * (1 << RGB2YUV_SHIFT) + 0.5)) - DECLARE_ALIGNED(8, const uint8_t, dithers)[8][8][8]={ { { 0, 1, 0, 1, 0, 1, 0, 1,}, @@ -1060,195 +1049,6 @@ void ff_get_unscaled_swscale(SwsContext *c) ff_swscale_get_unscaled_altivec(c); } -static void reset_ptr(const uint8_t *src[], int format) -{ - if (!isALPHA(format)) - src[3] = NULL; - if (!isPlanar(format)) { - src[3] = src[2] = NULL; - - if (!usePal(format)) - src[1] = NULL; - } -} - -static int check_image_pointers(const uint8_t * const data[4], enum PixelFormat pix_fmt, - const int linesizes[4]) -{ - const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; - int i; - - for (i = 0; i < 4; i++) { - int plane = desc->comp[i].plane; - if (!data[plane] || !linesizes[plane]) - return 0; - } - - return 1; -} - -/** - * swscale wrapper, so we don't need to export the SwsContext. - * Assumes planar YUV to be in YUV order instead of YVU. - */ -int attribute_align_arg sws_scale(struct SwsContext *c, - const uint8_t * const srcSlice[], - const int srcStride[], int srcSliceY, - int srcSliceH, uint8_t *const dst[], - const int dstStride[]) -{ - int i, ret; - const uint8_t *src2[4] = { srcSlice[0], srcSlice[1], srcSlice[2], srcSlice[3] }; - uint8_t *dst2[4] = { dst[0], dst[1], dst[2], dst[3] }; - uint8_t *rgb0_tmp = NULL; - - // do not mess up sliceDir if we have a "trailing" 0-size slice - if (srcSliceH == 0) - return 0; - - if (!check_image_pointers(srcSlice, c->srcFormat, srcStride)) { - av_log(c, AV_LOG_ERROR, "bad src image pointers\n"); - return 0; - } - if (!check_image_pointers((const uint8_t* const*)dst, c->dstFormat, dstStride)) { - av_log(c, AV_LOG_ERROR, "bad dst image pointers\n"); - return 0; - } - - if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) { - av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n"); - return 0; - } - if (c->sliceDir == 0) { - if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1; - } - - if (usePal(c->srcFormat)) { - for (i = 0; i < 256; i++) { - int p, r, g, b, y, u, v, a = 0xff; - if (c->srcFormat == PIX_FMT_PAL8) { - p = ((const uint32_t *)(srcSlice[1]))[i]; - a = (p >> 24) & 0xFF; - r = (p >> 16) & 0xFF; - g = (p >> 8) & 0xFF; - b = p & 0xFF; - } else if (c->srcFormat == PIX_FMT_RGB8) { - r = ( i >> 5 ) * 36; - g = ((i >> 2) & 7) * 36; - b = ( i & 3) * 85; - } else if (c->srcFormat == PIX_FMT_BGR8) { - b = ( i >> 6 ) * 85; - g = ((i >> 3) & 7) * 36; - r = ( i & 7) * 36; - } else if (c->srcFormat == PIX_FMT_RGB4_BYTE) { - r = ( i >> 3 ) * 255; - g = ((i >> 1) & 3) * 85; - b = ( i & 1) * 255; - } else if (c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_GRAY8A) { - r = g = b = i; - } else { - av_assert1(c->srcFormat == PIX_FMT_BGR4_BYTE); - b = ( i >> 3 ) * 255; - g = ((i >> 1) & 3) * 85; - r = ( i & 1) * 255; - } - y = av_clip_uint8((RY * r + GY * g + BY * b + ( 33 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); - u = av_clip_uint8((RU * r + GU * g + BU * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); - v = av_clip_uint8((RV * r + GV * g + BV * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); - c->pal_yuv[i]= y + (u<<8) + (v<<16) + (a<<24); - - switch (c->dstFormat) { - case PIX_FMT_BGR32: -#if !HAVE_BIGENDIAN - case PIX_FMT_RGB24: -#endif - c->pal_rgb[i]= r + (g<<8) + (b<<16) + (a<<24); - break; - case PIX_FMT_BGR32_1: -#if HAVE_BIGENDIAN - case PIX_FMT_BGR24: -#endif - c->pal_rgb[i]= a + (r<<8) + (g<<16) + (b<<24); - break; - case PIX_FMT_RGB32_1: -#if HAVE_BIGENDIAN - case PIX_FMT_RGB24: -#endif - c->pal_rgb[i]= a + (b<<8) + (g<<16) + (r<<24); - break; - case PIX_FMT_RGB32: -#if !HAVE_BIGENDIAN - case PIX_FMT_BGR24: -#endif - default: - c->pal_rgb[i]= b + (g<<8) + (r<<16) + (a<<24); - } - } - } - - if (c->src0Alpha && !c->dst0Alpha && isALPHA(c->dstFormat)) { - uint8_t *base; - int x,y; - rgb0_tmp = av_malloc(FFABS(srcStride[0]) * srcSliceH + 32); - base = srcStride[0] < 0 ? rgb0_tmp - srcStride[0] * (srcSliceH-1) : rgb0_tmp; - for (y=0; y<srcSliceH; y++){ - memcpy(base + srcStride[0]*y, src2[0] + srcStride[0]*y, 4*c->srcW); - for (x=c->src0Alpha-1; x<4*c->srcW; x+=4) { - base[ srcStride[0]*y + x] = 0xFF; - } - } - src2[0] = base; - } - - // copy strides, so they can safely be modified - if (c->sliceDir == 1) { - // slices go from top to bottom - int srcStride2[4] = { srcStride[0], srcStride[1], srcStride[2], - srcStride[3] }; - int dstStride2[4] = { dstStride[0], dstStride[1], dstStride[2], - dstStride[3] }; - - reset_ptr(src2, c->srcFormat); - reset_ptr((void*)dst2, c->dstFormat); - - /* reset slice direction at end of frame */ - if (srcSliceY + srcSliceH == c->srcH) - c->sliceDir = 0; - - ret = c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, - dstStride2); - } else { - // slices go from bottom to top => we flip the image internally - int srcStride2[4] = { -srcStride[0], -srcStride[1], -srcStride[2], - -srcStride[3] }; - int dstStride2[4] = { -dstStride[0], -dstStride[1], -dstStride[2], - -dstStride[3] }; - - src2[0] += (srcSliceH - 1) * srcStride[0]; - if (!usePal(c->srcFormat)) - src2[1] += ((srcSliceH >> c->chrSrcVSubSample) - 1) * srcStride[1]; - src2[2] += ((srcSliceH >> c->chrSrcVSubSample) - 1) * srcStride[2]; - src2[3] += (srcSliceH - 1) * srcStride[3]; - dst2[0] += ( c->dstH - 1) * dstStride[0]; - dst2[1] += ((c->dstH >> c->chrDstVSubSample) - 1) * dstStride[1]; - dst2[2] += ((c->dstH >> c->chrDstVSubSample) - 1) * dstStride[2]; - dst2[3] += ( c->dstH - 1) * dstStride[3]; - - reset_ptr(src2, c->srcFormat); - reset_ptr((void*)dst2, c->dstFormat); - - /* reset slice direction at end of frame */ - if (!srcSliceY) - c->sliceDir = 0; - - ret = c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, - srcSliceH, dst2, dstStride2); - } - - av_free(rgb0_tmp); - return ret; -} - /* Convert the palette to the same packed 32-bit format as the palette */ void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)

1 0

qt-faststart: simplify code by using FFMIN
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Sep 30 21:53:26 2012 +0200| [59003fe7c064e98359cce83b1b727fb1026bdf12] | committer: Michael Niedermayer qt-faststart: simplify code by using FFMIN Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59003fe7c064e9835… --- tools/qt-faststart.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index b1917f1..b9dbdfd 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -303,10 +303,7 @@ int main(int argc, char *argv[]) } printf(" copying rest of file...\n"); while (last_offset) { - if (last_offset > COPY_BUFFER_SIZE) - bytes_to_copy = COPY_BUFFER_SIZE; - else - bytes_to_copy = last_offset; + bytes_to_copy = FFMIN(bytes_to_copy, last_offset); if (fread(copy_buffer, bytes_to_copy, 1, infile) != 1) { perror(argv[1]);

1 0

qt-faststart: dont allocate a bigger buffer than needed
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Sep 30 21:52:59 2012 +0200| [610efb67739f850d7d08779f55661e15bc6f6722] | committer: Michael Niedermayer qt-faststart: dont allocate a bigger buffer than needed Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=610efb67739f850d7… --- tools/qt-faststart.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index bfa6f1a..b1917f1 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -37,6 +37,8 @@ #define ftello(x) _ftelli64(x) #endif +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) + #define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) #define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ @@ -293,9 +295,10 @@ int main(int argc, char *argv[]) } /* copy the remainder of the infile, from offset 0 -> last_offset - 1 */ - copy_buffer = malloc(COPY_BUFFER_SIZE); + bytes_to_copy = FFMIN(COPY_BUFFER_SIZE, last_offset); + copy_buffer = malloc(bytes_to_copy); if (!copy_buffer) { - printf("could not allocate %"PRIu64" bytes for copy_buffer\n", COPY_BUFFER_SIZE); + printf("could not allocate %"PRIu64" bytes for copy_buffer\n", bytes_to_copy); goto error_out; } printf(" copying rest of file...\n");

1 0

qt-faststart: speedup
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Jan Ehrhardt <phpdev(a)ehrhardt.nl> | Sun Sep 30 21:32:26 2012 +0200| [f4d9148fe282879b9fcc755767c9c04de9ddbcfa] | committer: Michael Niedermayer qt-faststart: speedup qt-faststart is terribly slow when the input file and the output file are on a slow disk like a SD card. By increasing the copy_buffer from 1K to 32M I decreased the processing time on a sample file from 1600 seconds to 4 seconds. The timing difference is during 'copying rest of file'. S:\SD_VIDEO\PRG001>e:\utils\qt-faststart 00005.mp4 5.mp4 ftyp 0 32 free 32 8 mdat 40 13744391 moov 13744431 141848 patching stco atom... patching stco atom... writing ftyp atom... writing moov atom... copying rest of file... Execution time: 1576.259 s S:\SD_VIDEO\PRG001>s:\utils\qt-faststart 00005.mp4 5.mp4 ftyp 0 32 free 32 8 mdat 40 13744391 moov 13744431 141848 patching stco atom... patching stco atom... writing ftyp atom... writing moov atom... copying rest of file... Execution time: 3.846 s Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4d9148fe282879b9… --- tools/qt-faststart.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index ebbe952..bfa6f1a 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -77,7 +77,7 @@ #define CO64_ATOM QT_ATOM('c', 'o', '6', '4') #define ATOM_PREAMBLE_SIZE 8 -#define COPY_BUFFER_SIZE 1024 +#define COPY_BUFFER_SIZE 33554432 int main(int argc, char *argv[]) { @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) uint32_t offset_count; uint64_t current_offset; uint64_t start_offset = 0; - unsigned char copy_buffer[COPY_BUFFER_SIZE]; + unsigned char *copy_buffer = NULL; int bytes_to_copy; if (argc != 3) { @@ -293,6 +293,11 @@ int main(int argc, char *argv[]) } /* copy the remainder of the infile, from offset 0 -> last_offset - 1 */ + copy_buffer = malloc(COPY_BUFFER_SIZE); + if (!copy_buffer) { + printf("could not allocate %"PRIu64" bytes for copy_buffer\n", COPY_BUFFER_SIZE); + goto error_out; + } printf(" copying rest of file...\n"); while (last_offset) { if (last_offset > COPY_BUFFER_SIZE) @@ -315,6 +320,7 @@ int main(int argc, char *argv[]) fclose(outfile); free(moov_atom); free(ftyp_atom); + free(copy_buffer); return 0; @@ -325,5 +331,6 @@ error_out: fclose(outfile); free(moov_atom); free(ftyp_atom); + free(copy_buffer); return 1; }

1 0

lavfi/ashowinfo: check plane value before deferencing.
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sun Sep 30 20:58:01 2012 +0200| [13d878366f4ef15e64d2fc29d482ab283ac75282] | committer: Clément Bœsch lavfi/ashowinfo: check plane value before deferencing. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13d878366f4ef15e6… --- libavfilter/af_ashowinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 0d4bbb2..25a5e2c 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -53,7 +53,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) if (!av_sample_fmt_is_planar(samplesref->format)) linesize *= av_get_channel_layout_nb_channels(samplesref->audio->channel_layout); - for (plane = 0; samplesref->data[plane] && plane < 8; plane++) { + for (plane = 0; plane < 8 && samplesref->data[plane]; plane++) { uint8_t *data = samplesref->data[plane]; plane_checksum[plane] = av_adler32_update(plane_checksum[plane], @@ -78,7 +78,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) checksum, plane_checksum[0]); - for (plane = 1; samplesref->data[plane] && plane < 8; plane++) + for (plane = 1; plane < 8 && samplesref->data[plane]; plane++) av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]); av_log(ctx, AV_LOG_INFO, "]\n");

1 0

xtea: fix decryption with --enable-small
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Giorgio Vazzana <mywing81(a)gmail.com> | Sun Sep 30 18:47:10 2012 +0200| [a8cb21fd62a1a148d5266324b85810be3c4aca4f] | committer: Michael Niedermayer xtea: fix decryption with --enable-small iv decrypt handling code needs to be executed regardless of CONFIG_SMALL Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8cb21fd62a1a148d… --- libavutil/xtea.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/xtea.c b/libavutil/xtea.c index 36b0ce0..1c2bd04 100644 --- a/libavutil/xtea.c +++ b/libavutil/xtea.c @@ -94,12 +94,12 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, DSTEP(0xDAA66D2BU, k1, k2); DSTEP(0x3C6EF372U, k2, k1); DSTEP(0x9E3779B9U, k3, k0); - if(iv){ +#endif + if (iv) { v0 ^= AV_RB32(iv ); v1 ^= AV_RB32(iv+4); memcpy(iv, src, 8); } -#endif } else { #if CONFIG_SMALL int i;

1 0

swscale: fix To{Y,UV} extern prototypes.
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sun Sep 30 00:52:40 2012 +0200| [178ecfc2570ffd4a5ab244d77a848533a5db2440] | committer: Clément Bœsch swscale: fix To{Y,UV} extern prototypes. This fix a bunch of "assignment from incompatible pointer type" warnings with GCC. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=178ecfc2570ffd4a5… --- libswscale/x86/swscale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 102a4e6..de59a2b 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -342,11 +342,14 @@ VSCALE_FUNCS(avx, avx); #define INPUT_Y_FUNC(fmt, opt) \ extern void ff_ ## fmt ## ToY_ ## opt(uint8_t *dst, const uint8_t *src, \ + const uint8_t *unused1, const uint8_t *unused2, \ int w, uint32_t *unused) #define INPUT_UV_FUNC(fmt, opt) \ extern void ff_ ## fmt ## ToUV_ ## opt(uint8_t *dstU, uint8_t *dstV, \ - const uint8_t *src, const uint8_t *unused1, \ - int w, uint32_t *unused2) + const uint8_t *unused0, \ + const uint8_t *src1, \ + const uint8_t *src2, \ + int w, uint32_t *unused) #define INPUT_FUNC(fmt, opt) \ INPUT_Y_FUNC(fmt, opt); \ INPUT_UV_FUNC(fmt, opt)

1 0

APIchanges: fill hashes.
by git＠videolan.org 30 Sep '12

30 Sep '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Sun Sep 23 20:35:03 2012 +0200| [0065d31dcdf08d50c471b984cb1b7c7b59951147] | committer: Clément Bœsch APIchanges: fill hashes. Also fix some dates (use the commit date instead of the author date). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0065d31dcdf08d50c… --- doc/APIchanges | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 257c003..b941c64 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,17 +15,17 @@ libavutil: 2011-04-18 API changes, most recent first: -2012-09-27 - xxxxxxx - lavd 54.3.100 - version.h +2012-09-27 - a70b493 - lavd 54.3.100 - version.h Add LIBAVDEVICE_IDENT symbol. -2012-09-27 - xxxxxxx - lavfi 3.18.100 - version.h +2012-09-27 - a70b493 - lavfi 3.18.100 - version.h Add LIBAVFILTER_IDENT symbol. -2012-09-27 - xxxxxxx - libswr 0.16.100 - version.h +2012-09-27 - a70b493 - libswr 0.16.100 - version.h Add LIBSWRESAMPLE_VERSION, LIBSWRESAMPLE_BUILD and LIBSWRESAMPLE_IDENT symbols. -2012-09-01 - xxxxxxx - lavu 51.72.100 - parseutils.h +2012-09-06 - 29e972f - lavu 51.72.100 - parseutils.h Add av_small_strptime() time parsing function. Can be used as a stripped-down replacement for strptime(), on @@ -35,80 +35,80 @@ API changes, most recent first: Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP instead of AV_CODEC_ID_TEXT. -2012-08-13 - xxxxxxx - lavfi 3.8.100 - avfilter.h +2012-08-13 - 5c0d8bc - lavfi 3.8.100 - avfilter.h Add avfilter_get_class() function, and priv_class field to AVFilter struct. -2012-08-13 - xxxxxxx - lavu 51.69.100 - opt.h +2012-08-12 - a25346e - lavu 51.69.100 - opt.h Add AV_OPT_FLAG_FILTERING_PARAM symbol in opt.h. -2012-07-31 - xxxxxxx - lavc 54.46.100 +2012-07-31 - 23fc4dd - lavc 54.46.100 Add channels field to AVFrame. -2012-07-30 - xxxxxxx - lavu 51.66.100 +2012-07-30 - f893904 - lavu 51.66.100 Add av_get_channel_description() and av_get_standard_channel_layout() functions. -2012-07-20 - xxxxxxx - lavc 54.43.100 +2012-07-21 - 016a472 - lavc 54.43.100 Add decode_error_flags field to AVFrame. -2012-07-20 - xxxxxxx - lavf 54.18.100 +2012-07-20 - b062936 - lavf 54.18.100 Add avformat_match_stream_specifier() function. -2012-07-14 - xxxxxxx - lavc 54.38.100 - avcodec.h +2012-07-14 - f49ec1b - lavc 54.38.100 - avcodec.h Add metadata to AVFrame, and the accessor functions av_frame_get_metadata() and av_frame_set_metadata(). -2012-07-10 - xxxxxxx - lavc 54.33.100 +2012-07-10 - 0e003d8 - lavc 54.33.100 Add av_fast_padded_mallocz(). -2012-07-10 - xxxxxxx - lavfi 3.2.0 - avfilter.h +2012-07-10 - 21d5609 - lavfi 3.2.0 - avfilter.h Add init_opaque() callback to AVFilter struct. -2012-06-26 - xxxxxxx - lavu 51.63.100 - imgutils.h +2012-06-26 - e6674e4 - lavu 51.63.100 - imgutils.h Add functions to libavutil/imgutils.h: av_image_get_buffer_size() av_image_fill_arrays() av_image_copy_to_buffer() -2012-06-24 - xxxxxxx - lavu 51.62.100 - version.h +2012-06-24 - c41899a - lavu 51.62.100 - version.h version moved from avutil.h to version.h -2012-04-11 - xxxxxxx - lavu 51.58.100 - error.h +2012-04-11 - 359abb1 - lavu 51.58.100 - error.h Add av_make_error_string() and av_err2str() utilities to libavutil/error.h. -2012-06-05 - xxxxxxx - lavc 54.24.100 +2012-06-05 - 62b39d4 - lavc 54.24.100 Add pkt_duration field to AVFrame. -2012-05-24 - xxxxxxx - lavu 51.54.100 +2012-05-24 - f2ee065 - lavu 51.54.100 Move AVPALETTE_SIZE and AVPALETTE_COUNT macros from libavcodec/avcodec.h to libavutil/pixfmt.h. -2012-05-07 - xxxxxxx - lavf 54.5.100 +2012-05-14 - 94a9ac1 - lavf 54.5.100 Add av_guess_sample_aspect_ratio() function. -2012-04-20 - xxxxxxx - lavfi 2.70.100 +2012-04-20 - 65fa7bc - lavfi 2.70.100 Add avfilter_unref_bufferp() to avfilter.h. -2012-04-12 - xxxxxxx - lavfi 2.68.100 +2012-04-13 - 162e400 - lavfi 2.68.100 Install libavfilter/asrc_abuffer.h public header. 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. -2012-09-23 - xxxxxxx - lavc 54.28.0 - avcodec.h +2012-09-23 - a42aada - lavc 54.28.0 - avcodec.h Add avcodec_free_frame(). This function must now be used for freeing an AVFrame. -2012-09-12 - xxxxxxx - lavu 51.41.0 - audioconvert.h +2012-09-12 - 8919fee - lavu 51.41.0 - audioconvert.h Added AV_CH_LOW_FREQUENCY_2 channel mask value. -2012-09-04 - xxxxxxx - lavu 51.40.0 - opt.h +2012-09-04 - 686a329 - lavu 51.40.0 - opt.h Reordered the fields in default_val in AVOption, changed which default_val field is used for which AVOptionType. -2012-xx-xx - xxxxxxx - lavc 54.26.1 - avcodec.h +2012-08-30 - a231832 - lavc 54.26.1 - avcodec.h Add codec descriptor properties AV_CODEC_PROP_LOSSY and AV_CODEC_PROP_LOSSLESS.

1 0