December 2010 - ffmpeg-cvslog

r18533 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 10 Jan '11

10 Jan '11

Author: michael Date: Thu Apr 16 06:46:44 2009 New Revision: 18533 Log: Support broken avc nal encapsulation. Fixes issue987. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Apr 16 04:28:49 2009 (r18532) +++ trunk/libavcodec/h264.c Thu Apr 16 06:46:44 2009 (r18533) @@ -7461,6 +7461,7 @@ static int decode_nal_units(H264Context int buf_index=0; H264Context *hx; ///< thread context int context_count = 0; + int next_avc= h->is_avc ? 0 : buf_size; h->max_contexts = avctx->thread_count; #if 0 @@ -7484,7 +7485,7 @@ static int decode_nal_units(H264Context int i, nalsize = 0; int err; - if(h->is_avc) { + if(buf_index >= next_avc) { if(buf_index >= buf_size) break; nalsize = 0; for(i = 0; i < h->nal_length_size; i++) @@ -7498,6 +7499,7 @@ static int decode_nal_units(H264Context break; } } + next_avc= buf_index + nalsize; } else { // start code prefix search for(; buf_index + 3 < buf_size; buf_index++){ @@ -7513,7 +7515,7 @@ static int decode_nal_units(H264Context hx = h->thread_context[context_count]; - ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); + ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index); if (ptr==NULL || dst_length < 0){ return -1; } @@ -7525,13 +7527,12 @@ static int decode_nal_units(H264Context av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length); } - if (h->is_avc && (nalsize != consumed)){ + if (h->is_avc && (nalsize != consumed) && nalsize){ int i, debug_level = AV_LOG_DEBUG; for (i = consumed; i < nalsize; i++) if (buf[buf_index+i]) debug_level = AV_LOG_ERROR; av_log(h->s.avctx, debug_level, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); - consumed= nalsize; } buf_index += consumed;

3 7

r26119 - in trunk: Changelog MAINTAINERS doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/ass.c libavcodec/ass.h libavcodec/avcodec.h libavcodec/srtdec.c tests/fate.mak tests/...
by subversion＠mplayerhq.hu 01 Jan '11

01 Jan '11

Author: aurel Date: Wed Dec 29 00:52:53 2010 New Revision: 26119 Log: add SubRip decoder Added: trunk/libavcodec/srtdec.c trunk/tests/ref/fate/sub-srt Modified: trunk/Changelog trunk/MAINTAINERS trunk/doc/general.texi trunk/libavcodec/Makefile trunk/libavcodec/allcodecs.c trunk/libavcodec/ass.c trunk/libavcodec/ass.h trunk/libavcodec/avcodec.h trunk/tests/fate.mak Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/Changelog Wed Dec 29 00:52:53 2010 (r26119) @@ -69,6 +69,7 @@ version <next>: - replace the ocv_smooth filter with a more generic ocv filter - Windows Televison (WTV) demuxer - FFmpeg metadata format muxer and demuxer +- SubRip (srt) subtitle decoder version 0.6: Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/MAINTAINERS Wed Dec 29 00:52:53 2010 (r26119) @@ -198,6 +198,7 @@ Codecs: smc.c Mike Melanson snow.c Michael Niedermayer, Loren Merritt sonic.c Alex Beregszaszi + srtdec.c Aurelien Jacobs sunrast.c Ivo van Poorten svq3.c Michael Niedermayer targa.c Kostya Shishkov Modified: trunk/doc/general.texi ============================================================================== --- trunk/doc/general.texi Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/doc/general.texi Wed Dec 29 00:52:53 2010 (r26119) @@ -694,7 +694,7 @@ performance on systems without hardware @item DVB @tab X @tab X @tab X @tab X @item DVD @tab X @tab X @tab X @tab X @item PGS @tab @tab @tab @tab X - at item SubRip (SRT) @tab X @tab X + at item SubRip (SRT) @tab X @tab X @tab @tab X @item XSUB @tab @tab @tab X @tab X @end multitable Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/libavcodec/Makefile Wed Dec 29 00:52:53 2010 (r26119) @@ -337,6 +337,7 @@ OBJS-$(CONFIG_SONIC_DECODER) + OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o OBJS-$(CONFIG_SONIC_LS_ENCODER) += sonic.o OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o +OBJS-$(CONFIG_SRT_DECODER) += srtdec.o ass.o OBJS-$(CONFIG_SUNRAST_DECODER) += sunrast.o OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o h263.o \ mpegvideo.o error_resilience.o Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/libavcodec/allcodecs.c Wed Dec 29 00:52:53 2010 (r26119) @@ -347,6 +347,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (DVBSUB, dvbsub); REGISTER_ENCDEC (DVDSUB, dvdsub); REGISTER_DECODER (PGSSUB, pgssub); + REGISTER_DECODER (SRT, srt); REGISTER_ENCDEC (XSUB, xsub); /* external libraries */ Modified: trunk/libavcodec/ass.c ============================================================================== --- trunk/libavcodec/ass.c Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/libavcodec/ass.c Wed Dec 29 00:52:53 2010 (r26119) @@ -22,6 +22,46 @@ #include "avcodec.h" #include "ass.h" +int ff_ass_subtitle_header(AVCodecContext *avctx, + const char *font, int font_size, + int color, int back_color, + int bold, int italic, int underline, + int alignment) +{ + char header[512]; + + snprintf(header, sizeof(header), + "[Script Info]\r\n" + "ScriptType: v4.00+\r\n" + "\r\n" + "[V4+ Styles]\r\n" + "Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding\r\n" + "Style: Default,%s,%d,&H%x,&H%x,&H%x,&H%x,%d,%d,%d,1,1,0,%d,10,10,10,0,0\r\n" + "\r\n" + "[Events]\r\n" + "Format: Layer, Start, End, Text\r\n", + font, font_size, color, color, back_color, back_color, + -bold, -italic, -underline, alignment); + + avctx->subtitle_header = av_strdup(header); + if (!avctx->subtitle_header) + return AVERROR(ENOMEM); + avctx->subtitle_header_size = strlen(avctx->subtitle_header); + return 0; +} + +int ff_ass_subtitle_header_default(AVCodecContext *avctx) +{ + return ff_ass_subtitle_header(avctx, ASS_DEFAULT_FONT, + ASS_DEFAULT_FONT_SIZE, + ASS_DEFAULT_COLOR, + ASS_DEFAULT_BACK_COLOR, + ASS_DEFAULT_BOLD, + ASS_DEFAULT_ITALIC, + ASS_DEFAULT_UNDERLINE, + ASS_DEFAULT_ALIGNMENT); +} + void ff_ass_init(AVSubtitle *sub) { memset(sub, 0, sizeof(*sub)); Modified: trunk/libavcodec/ass.h ============================================================================== --- trunk/libavcodec/ass.h Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/libavcodec/ass.h Wed Dec 29 00:52:53 2010 (r26119) @@ -25,6 +25,51 @@ #include "avcodec.h" /** + * Default values for ASS style. + * @defgroup ass_default + * @{ + */ +#define ASS_DEFAULT_FONT "Arial" +#define ASS_DEFAULT_FONT_SIZE 16 +#define ASS_DEFAULT_COLOR 0xffffff +#define ASS_DEFAULT_BACK_COLOR 0 +#define ASS_DEFAULT_BOLD 0 +#define ASS_DEFAULT_ITALIC 0 +#define ASS_DEFAULT_UNDERLINE 0 +#define ASS_DEFAULT_ALIGNMENT 2 +/** @} */ + +/** + * Generate a suitable AVCodecContext.subtitle_header for SUBTITLE_ASS. + * + * @param avctx pointer to the AVCodecContext + * @param font name of the default font face to use + * @param font_size default font size to use + * @param color default text color to use (ABGR) + * @param back_color default background color to use (ABGR) + * @param bold 1 for bold text, 0 for normal text + * @param italic 1 for italic text, 0 for normal text + * @param underline 1 for underline text, 0 for normal text + * @param alignment position of the text (left, center, top...), defined after + * the layout of the numpad (1-3 sub, 4-6 mid, 7-9 top) + * @return >= 0 on success otherwise an error code <0 + */ +int ff_ass_subtitle_header(AVCodecContext *avctx, + const char *font, int font_size, + int color, int back_color, + int bold, int italic, int underline, + int alignment); + +/** + * Generate a suitable AVCodecContext.subtitle_header for SUBTITLE_ASS + * with default style. + * + * @param avctx pointer to the AVCodecContext + * @return >= 0 on success otherwise an error code <0 + */ +int ff_ass_subtitle_header_default(AVCodecContext *avctx); + +/** * Initialize an AVSubtitle structure for use with ff_ass_add_rect(). * * @param sub pointer to the AVSubtitle Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/libavcodec/avcodec.h Wed Dec 29 00:52:53 2010 (r26119) @@ -32,8 +32,8 @@ #include "libavutil/cpu.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 100 -#define LIBAVCODEC_VERSION_MICRO 1 +#define LIBAVCODEC_VERSION_MINOR 101 +#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ Added: trunk/libavcodec/srtdec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libavcodec/srtdec.c Wed Dec 29 00:52:53 2010 (r26119) @@ -0,0 +1,240 @@ +/* + * SubRip subtitle decoder + * Copyright (c) 2010 Aurelien Jacobs <aurel at gnuage.org> + * + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/avstring.h" +#include "libavcore/parseutils.h" +#include "avcodec.h" +#include "ass.h" + +static int html_color_parse(AVCodecContext *avctx, const char *str) +{ + uint8_t rgba[4]; + if (av_parse_color(rgba, str, strcspn(str, "\" >"), avctx) < 0) + return -1; + return rgba[0] | rgba[1] << 8 | rgba[2] << 16; +} + +enum { + PARAM_UNKNOWN = -1, + PARAM_SIZE, + PARAM_COLOR, + PARAM_FACE, + PARAM_NUMBER +}; + +typedef struct { + char tag[128]; + char param[PARAM_NUMBER][128]; +} SrtStack; + +static const char *srt_to_ass(AVCodecContext *avctx, char *out, char *out_end, + const char *in, int x1, int y1, int x2, int y2) +{ + char c, *param, buffer[128], tmp[128]; + int len, tag_close, sptr = 1, line_start = 1, an = 0, end = 0; + SrtStack stack[16]; + + stack[0].tag[0] = 0; + strcpy(stack[0].param[PARAM_SIZE], "{\\fs}"); + strcpy(stack[0].param[PARAM_COLOR], "{\\c}"); + strcpy(stack[0].param[PARAM_FACE], "{\\fn}"); + + if (x1 >= 0 && y1 >= 0) { + if (x2 >= 0 && y2 >= 0 && (x2 != x1 || y2 != y1)) + out += snprintf(out, out_end-out, + "{\\an1}{\\move(%d,%d,%d,%d)}", x1, y1, x2, y2); + else + out += snprintf(out, out_end-out, "{\\an1}{\\pos(%d,%d)}", x1, y1); + } + + for (; *in && out < out_end && !end; in++) { + switch (*in) { + case '\r': + break; + case '\n': + if (line_start) { + end = 1; + break; + } + while (out[-1] == ' ') + out--; + out += snprintf(out, out_end-out, "\\N"); + line_start = 1; + break; + case ' ': + if (!line_start) + *out++ = *in; + break; + case '{': /* skip all {\xxx} substrings except for {\an%d} + and all microdvd like styles such as {Y:xxx} */ + an += sscanf(in, "{\\an%*1u}%c", &c) == 1; + if ((an != 1 && sscanf(in, "{\\%*[^}]}%n%c", &len, &c) > 0) || + sscanf(in, "{%*1[CcFfoPSsYy]:%*[^}]}%n%c", &len, &c) > 0) { + in += len - 1; + } else + *out++ = *in; + break; + case '<': + tag_close = in[1] == '/'; + if (sscanf(in+tag_close+1, "%128[^>]>%n%c", buffer, &len,&c) >= 2) { + if ((param = strchr(buffer, ' '))) + *param++ = 0; + if ((!tag_close && sptr < FF_ARRAY_ELEMS(stack)) || + ( tag_close && sptr > 0 && !strcmp(stack[sptr-1].tag, buffer))) { + int i, j, unknown = 0; + in += len + tag_close; + if (!tag_close) + memset(stack+sptr, 0, sizeof(*stack)); + if (!strcmp(buffer, "font")) { + if (tag_close) { + for (i=PARAM_NUMBER-1; i>=0; i--) + if (stack[sptr-1].param[i][0]) + for (j=sptr-2; j>=0; j--) + if (stack[j].param[i][0]) { + out += snprintf(out, out_end-out, + stack[j].param[i]); + break; + } + } else { + while (param) { + if (!strncmp(param, "size=", 5)) { + unsigned font_size; + param += 5 + (param[5] == '"'); + if (sscanf(param, "%u", &font_size) == 1) { + snprintf(stack[sptr].param[PARAM_SIZE], + sizeof(stack[0].param[PARAM_SIZE]), + "{\\fs%u}", font_size); + } + } else if (!strncmp(param, "color=", 6)) { + param += 6 + (param[6] == '"'); + snprintf(stack[sptr].param[PARAM_COLOR], + sizeof(stack[0].param[PARAM_COLOR]), + "{\\c&H%X&}", + html_color_parse(avctx, param)); + } else if (!strncmp(param, "face=", 5)) { + param += 5 + (param[5] == '"'); + len = strcspn(param, + param[-1] == '"' ? "\"" :" "); + av_strlcpy(tmp, param, + FFMIN(sizeof(tmp), len+1)); + param += len; + snprintf(stack[sptr].param[PARAM_FACE], + sizeof(stack[0].param[PARAM_FACE]), + "{\\fn%s}", tmp); + } + if ((param = strchr(param, ' '))) + param++; + } + for (i=0; i<PARAM_NUMBER; i++) + if (stack[sptr].param[i][0]) + out += snprintf(out, out_end-out, + stack[sptr].param[i]); + } + } else if (!buffer[1] && strspn(buffer, "bisu") == 1) { + out += snprintf(out, out_end-out, + "{\\%c%d}", buffer[0], !tag_close); + } else { + unknown = 1; + snprintf(tmp, sizeof(tmp), "</%s>", buffer); + } + if (tag_close) { + sptr--; + } else if (unknown && !strstr(in, tmp)) { + in -= len + tag_close; + *out++ = *in; + } else + av_strlcpy(stack[sptr++].tag, buffer, + sizeof(stack[0].tag)); + break; + } + } + default: + *out++ = *in; + break; + } + if (*in != ' ' && *in != '\r' && *in != '\n') + line_start = 0; + } + + out = FFMIN(out, out_end-3); + while (!strncmp(out-2, "\\N", 2)) + out -= 2; + while (out[-1] == ' ') + out--; + out += snprintf(out, out_end-out, "\r\n"); + return in; +} + +static const char *read_ts(const char *buf, int *ts_start, int *ts_end, + int *x1, int *y1, int *x2, int *y2) +{ + int i, hs, ms, ss, he, me, se; + + for (i=0; i<2; i++) { + /* try to read timestamps in either the first or second line */ + int c = sscanf(buf, "%d:%2d:%2d%*1[,.]%3d --> %d:%2d:%2d%*1[,.]%3d" + "%*[ ]X1:%u X2:%u Y1:%u Y2:%u", + &hs, &ms, &ss, ts_start, &he, &me, &se, ts_end, + x1, x2, y1, y2); + buf += strcspn(buf, "\n") + 1; + if (c >= 8) { + *ts_start = 100*(ss + 60*(ms + 60*hs)) + *ts_start/10; + *ts_end = 100*(se + 60*(me + 60*he)) + *ts_end /10; + return buf; + } + } + return NULL; +} + +static int srt_decode_frame(AVCodecContext *avctx, + void *data, int *got_sub_ptr, AVPacket *avpkt) +{ + AVSubtitle *sub = data; + int ts_start, ts_end, x1 = -1, y1 = -1, x2 = -1, y2 = -1; + char buffer[2048]; + const char *ptr = avpkt->data; + + if (avpkt->size <= 0) + return avpkt->size; + + ff_ass_init(sub); + + while (*ptr) { + ptr = read_ts(ptr, &ts_start, &ts_end, &x1, &y1, &x2, &y2); + if (!ptr) + break; + ptr = srt_to_ass(avctx, buffer, buffer+sizeof(buffer), ptr, + x1, y1, x2, y2); + ff_ass_add_rect(sub, buffer, ts_start, ts_end, 0); + } + + *got_sub_ptr = sub->num_rects > 0; + return avpkt->size; +} + +AVCodec srt_decoder = { + .name = "srt", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + .type = AVMEDIA_TYPE_SUBTITLE, + .id = CODEC_ID_SRT, + .init = ff_ass_subtitle_header_default, + .decode = srt_decode_frame, +}; Modified: trunk/tests/fate.mak ============================================================================== --- trunk/tests/fate.mak Tue Dec 28 23:48:39 2010 (r26118) +++ trunk/tests/fate.mak Wed Dec 29 00:52:53 2010 (r26119) @@ -282,6 +282,8 @@ FATE_TESTS += fate-smc fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -vsync 0 -pix_fmt rgb24 FATE_TESTS += fate-sp5x fate-sp5x: CMD = framecrc -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi +FATE_TESTS += fate-sub-srt +fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass FATE_TESTS += fate-sunraster-1bit-raw fate-sunraster-1bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-raw.sun FATE_TESTS += fate-sunraster-1bit-rle Added: trunk/tests/ref/fate/sub-srt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/fate/sub-srt Wed Dec 29 00:52:53 2010 (r26119) @@ -0,0 +1 @@ +03b2a3f7e7e83624c8e4d1b5569df758

3 3

r26181 - trunk/libavcodec/ac3enc.c
by subversion＠mplayerhq.hu 31 Dec '10

31 Dec '10

Author: jbr Date: Sat Jan 1 00:22:08 2011 New Revision: 26181 Log: Skip the bit allocation search if previous and current SNR offsets are the maximum value of 1023. This speeds up overall encoding depending on the content and bitrate. The most improvement is with high bitrates and/or low complexity content. Modified: trunk/libavcodec/ac3enc.c Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c Fri Dec 31 23:59:19 2010 (r26180) +++ trunk/libavcodec/ac3enc.c Sat Jan 1 00:22:08 2011 (r26181) @@ -1116,6 +1116,13 @@ static int cbr_bit_allocation(AC3EncodeC snr_offset = s->coarse_snr_offset << 4; + /* if previous frame SNR offset was 1023, check if current frame can also + use SNR offset of 1023. if so, skip the search. */ + if ((snr_offset | s->fine_snr_offset[0]) == 1023) { + if (bit_alloc(s, 1023) <= bits_left) + return 0; + } + while (snr_offset >= 0 && bit_alloc(s, snr_offset) > bits_left) { snr_offset -= 64;

1 0

r26180 - trunk/libavcodec/ac3enc.c
by subversion＠mplayerhq.hu 31 Dec '10

31 Dec '10

Author: jbr Date: Fri Dec 31 23:59:19 2010 New Revision: 26180 Log: 10l: Fix mistake in r26044. Check increment bounds using actual increment instead of 64. This will change output in some cases, but it happens to not affect the AC-3 regression tests. Modified: trunk/libavcodec/ac3enc.c Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c Fri Dec 31 21:01:12 2010 (r26179) +++ trunk/libavcodec/ac3enc.c Fri Dec 31 23:59:19 2010 (r26180) @@ -1125,7 +1125,7 @@ static int cbr_bit_allocation(AC3EncodeC FFSWAP(uint8_t *, s->bap_buffer, s->bap1_buffer); for (snr_incr = 64; snr_incr > 0; snr_incr >>= 2) { - while (snr_offset + 64 <= 1023 && + while (snr_offset + snr_incr <= 1023 && bit_alloc(s, snr_offset + snr_incr) <= bits_left) { snr_offset += snr_incr; FFSWAP(uint8_t *, s->bap_buffer, s->bap1_buffer);

1 0

r26179 - trunk/libavcodec/ac3enc.c
by subversion＠mplayerhq.hu 31 Dec '10

31 Dec '10

Author: jbr Date: Fri Dec 31 21:01:12 2010 New Revision: 26179 Log: Change planar_samples from int16_t to SampleType. This one was missed in r26174. Modified: trunk/libavcodec/ac3enc.c Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c Fri Dec 31 05:56:44 2010 (r26178) +++ trunk/libavcodec/ac3enc.c Fri Dec 31 21:01:12 2010 (r26179) @@ -139,7 +139,7 @@ typedef struct AC3EncodeContext { int mant1_cnt, mant2_cnt, mant4_cnt; ///< mantissa counts for bap=1,2,4 uint16_t *qmant1_ptr, *qmant2_ptr, *qmant4_ptr; ///< mantissa pointers for bap=1,2,4 - int16_t **planar_samples; + SampleType **planar_samples; uint8_t *bap_buffer; uint8_t *bap1_buffer; CoefType *mdct_coef_buffer;

1 0

r26178 - trunk/libavcodec/lclenc.c
by subversion＠mplayerhq.hu 30 Dec '10

30 Dec '10

Author: darkshikari Date: Fri Dec 31 05:56:44 2010 New Revision: 26178 Log: Add .pix_fmts to LCL encoder Now ffmpeg should automatically convert to BGR instead of erroring out. Modified: trunk/libavcodec/lclenc.c Modified: trunk/libavcodec/lclenc.c ============================================================================== --- trunk/libavcodec/lclenc.c Fri Dec 31 02:29:06 2010 (r26177) +++ trunk/libavcodec/lclenc.c Fri Dec 31 05:56:44 2010 (r26178) @@ -130,16 +130,8 @@ static av_cold int encode_init(AVCodecCo // Will be user settable someday c->compression = 6; c->flags = 0; - - switch(avctx->pix_fmt){ - case PIX_FMT_BGR24: - c->imgtype = IMGTYPE_RGB24; - avctx->bits_per_coded_sample= 24; - break; - default: - av_log(avctx, AV_LOG_ERROR, "Input pixel format %s not supported\n", avcodec_get_pix_fmt_name(avctx->pix_fmt)); - return -1; - } + c->imgtype = IMGTYPE_RGB24; + avctx->bits_per_coded_sample= 24; avctx->extradata[0]= 4; avctx->extradata[1]= 0; @@ -186,5 +178,6 @@ AVCodec zlib_encoder = { encode_init, encode_frame, encode_end, + .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_BGR24, PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), };

1 0

r26177 - trunk/libavcodec/x86/h264_intrapred.asm
by subversion＠mplayerhq.hu 30 Dec '10

30 Dec '10

Author: rbultje Date: Fri Dec 31 02:29:06 2010 New Revision: 26177 Log: Fix invalid reads in valgrind fate, patch by Daniel Kang <daniel dot d dot kang at gmail com>, as part of Google's GCI 2010. Modified: trunk/libavcodec/x86/h264_intrapred.asm Modified: trunk/libavcodec/x86/h264_intrapred.asm ============================================================================== --- trunk/libavcodec/x86/h264_intrapred.asm Fri Dec 31 01:06:25 2010 (r26176) +++ trunk/libavcodec/x86/h264_intrapred.asm Fri Dec 31 02:29:06 2010 (r26177) @@ -2679,10 +2679,10 @@ INIT_MMX cglobal pred4x4_horizontal_up_mmxext, 3,3 sub r0, r2 lea r1, [r0+r2*2] - movq m0, [r0+r2*1-8] - punpckhbw m0, [r0+r2*2-8] - movq m1, [r1+r2*1-8] - punpckhbw m1, [r1+r2*2-8] + movd m0, [r0+r2*1-4] + punpcklbw m0, [r0+r2*2-4] + movd m1, [r1+r2*1-4] + punpcklbw m1, [r1+r2*2-4] punpckhwd m0, m1 movq m1, m0 punpckhbw m1, m1 @@ -2716,10 +2716,10 @@ cglobal pred4x4_horizontal_down_mmxext, movh m0, [r0-4] ; lt .. punpckldq m0, [r0] ; t3 t2 t1 t0 lt .. .. .. psllq m0, 8 ; t2 t1 t0 lt .. .. .. .. - movq m1, [r1+r2*2-8] ; l3 - punpckhbw m1, [r1+r2*1-8] ; l2 l3 - movq m2, [r0+r2*2-8] ; l1 - punpckhbw m2, [r0+r2*1-8] ; l0 l1 + movd m1, [r1+r2*2-4] ; l3 + punpcklbw m1, [r1+r2*1-4] ; l2 l3 + movd m2, [r0+r2*2-4] ; l1 + punpcklbw m2, [r0+r2*1-4] ; l0 l1 punpckhwd m1, m2 ; l0 l1 l2 l3 punpckhdq m1, m0 ; t2 t1 t0 lt l0 l1 l2 l3 movq m0, m1

1 0

r26176 - trunk/libavcodec/utils.c
by subversion＠mplayerhq.hu 30 Dec '10

30 Dec '10

Author: aurel Date: Fri Dec 31 01:06:25 2010 New Revision: 26176 Log: free subtitle_header before overwriting it to avoid memleak Modified: trunk/libavcodec/utils.c Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Fri Dec 31 01:01:37 2010 (r26175) +++ trunk/libavcodec/utils.c Fri Dec 31 01:06:25 2010 (r26176) @@ -505,6 +505,11 @@ int attribute_align_arg avcodec_open(AVC avcodec_set_dimensions(avctx, 0, 0); } + /* if the decoder init function was already called previously, + free the already allocated subtitle_header before overwriting it */ + if (codec->decode) + av_freep(&avctx->subtitle_header); + #define SANE_NB_CHANNELS 128U if (avctx->channels > SANE_NB_CHANNELS) { ret = AVERROR(EINVAL);

1 0

r26175 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 30 Dec '10

30 Dec '10

Author: aurel Date: Fri Dec 31 01:01:37 2010 New Revision: 26175 Log: use avsubtitle_free() instead of re-implementing it partially (fix a memleak) Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Thu Dec 30 23:30:48 2010 (r26174) +++ trunk/ffmpeg.c Fri Dec 31 01:01:37 2010 (r26175) @@ -1747,15 +1747,7 @@ static int output_packet(AVInputStream * av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { - if (subtitle_to_free->rects != NULL) { - for (i = 0; i < subtitle_to_free->num_rects; i++) { - av_freep(&subtitle_to_free->rects[i]->pict.data[0]); - av_freep(&subtitle_to_free->rects[i]->pict.data[1]); - av_freep(&subtitle_to_free->rects[i]); - } - av_freep(&subtitle_to_free->rects); - } - subtitle_to_free->num_rects = 0; + avsubtitle_free(subtitle_to_free); subtitle_to_free = NULL; } }

1 0

r26174 - trunk/libavcodec/ac3enc.c
by subversion＠mplayerhq.hu 30 Dec '10

30 Dec '10

Author: jbr Date: Thu Dec 30 23:30:48 2010 New Revision: 26174 Log: Add typedefs and a macro that will allow sharing of functions between the fixed-point and floating-point AC-3 encoders. Modified: trunk/libavcodec/ac3enc.c Modified: trunk/libavcodec/ac3enc.c ============================================================================== --- trunk/libavcodec/ac3enc.c Thu Dec 30 23:13:41 2010 (r26173) +++ trunk/libavcodec/ac3enc.c Thu Dec 30 23:30:48 2010 (r26174) @@ -43,6 +43,11 @@ /** Scale a float value by 2^bits and convert to an integer. */ #define SCALE_FLOAT(a, bits) lrintf((a) * (float)(1 << (bits))) +typedef int16_t SampleType; +typedef int32_t CoefType; + +#define SCALE_COEF(a) (a) + /** Scale a float value by 2^15, convert to an integer, and clip to range -32767..32767. */ #define FIX15(a) av_clip(SCALE_FLOAT(a, 15), -32767, 32767) @@ -71,7 +76,7 @@ typedef struct AC3MDCTContext { */ typedef struct AC3Block { uint8_t **bap; ///< bit allocation pointers (bap) - int32_t **mdct_coef; ///< MDCT coefficients + CoefType **mdct_coef; ///< MDCT coefficients uint8_t **exp; ///< original exponents uint8_t **grouped_exp; ///< grouped exponents int16_t **psd; ///< psd per frequency bin @@ -137,7 +142,7 @@ typedef struct AC3EncodeContext { int16_t **planar_samples; uint8_t *bap_buffer; uint8_t *bap1_buffer; - int32_t *mdct_coef_buffer; + CoefType *mdct_coef_buffer; uint8_t *exp_buffer; uint8_t *grouped_exp_buffer; int16_t *psd_buffer; @@ -145,7 +150,7 @@ typedef struct AC3EncodeContext { int16_t *mask_buffer; uint16_t *qmant_buffer; - DECLARE_ALIGNED(16, int16_t, windowed_samples)[AC3_WINDOW_SIZE]; + DECLARE_ALIGNED(16, SampleType, windowed_samples)[AC3_WINDOW_SIZE]; } AC3EncodeContext; @@ -204,13 +209,13 @@ static void adjust_frame_size(AC3EncodeC * Channels are reordered from FFmpeg's default order to AC-3 order. */ static void deinterleave_input_samples(AC3EncodeContext *s, - const int16_t *samples) + const SampleType *samples) { int ch, i; /* deinterleave and remap input samples */ for (ch = 0; ch < s->channels; ch++) { - const int16_t *sptr; + const SampleType *sptr; int sinc; /* copy last 256 samples of previous frame to the start of the current frame */ @@ -525,7 +530,7 @@ static void apply_mdct(AC3EncodeContext for (ch = 0; ch < s->channels; ch++) { for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) { AC3Block *block = &s->blocks[blk]; - const int16_t *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE]; + const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE]; apply_window(s->windowed_samples, input_samples, s->mdct.window, AC3_WINDOW_SIZE); @@ -567,7 +572,7 @@ static void extract_exponents(AC3EncodeC AC3Block *block = &s->blocks[blk]; for (i = 0; i < AC3_MAX_COEFS; i++) { int e; - int v = abs(block->mdct_coef[ch][i]); + int v = abs(SCALE_COEF(block->mdct_coef[ch][i])); if (v == 0) e = 24; else { @@ -1287,7 +1292,7 @@ static inline int asym_quant(int c, int /** * Quantize a set of mantissas for a single channel in a single block. */ -static void quantize_mantissas_blk_ch(AC3EncodeContext *s, int32_t *mdct_coef, +static void quantize_mantissas_blk_ch(AC3EncodeContext *s, CoefType *mdct_coef, int8_t exp_shift, uint8_t *exp, uint8_t *bap, uint16_t *qmant, int n) { @@ -1295,7 +1300,7 @@ static void quantize_mantissas_blk_ch(AC for (i = 0; i < n; i++) { int v; - int c = mdct_coef[i]; + int c = SCALE_COEF(mdct_coef[i]); int e = exp[i] - exp_shift; int b = bap[i]; switch (b) { @@ -1650,7 +1655,7 @@ static int ac3_encode_frame(AVCodecConte int buf_size, void *data) { AC3EncodeContext *s = avctx->priv_data; - const int16_t *samples = data; + const SampleType *samples = data; int ret; if (s->bit_alloc.sr_code == 1)

1 0