June 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r23924 - trunk/libavcodec/vp56.h
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: darkshikari Date: Thu Jul 1 01:59:27 2010 New Revision: 23924 Log: Eliminate another redundant instruction in vp56/8 arithcoder Necessary because of this GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44474 To do this, convert some, but not all (!) of the variables in VP56RangeCoder into local variables. If we convert c->high into a local variable, gcc gets the stupids and refuses to use a conditional move for the unpredictable main branch. TODO: dispense with this bullshit and write an asm version. Modified: trunk/libavcodec/vp56.h Modified: trunk/libavcodec/vp56.h ============================================================================== --- trunk/libavcodec/vp56.h Thu Jul 1 01:52:28 2010 (r23923) +++ trunk/libavcodec/vp56.h Thu Jul 1 01:59:27 2010 (r23924) @@ -194,23 +194,32 @@ static inline void vp56_init_range_decod static inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob) { + /* Don't put c->high in a local variable; if we do that, gcc gets + * the stupids and turns the code below into a branch again. */ + int bits = c->bits; + unsigned long code_word = c->code_word; unsigned int low = 1 + (((c->high - 1) * prob) >> 8); unsigned int low_shift = low << 8; - int bit = c->code_word >= low_shift; + int bit = code_word >= low_shift; int shift; + /* Incantation to convince GCC to turn these into conditional moves + * instead of branches -- faster, as this branch is basically + * unpredictable. */ c->high = bit ? c->high - low : low; - c->code_word = bit ? c->code_word - low_shift : c->code_word; + code_word = bit ? code_word - low_shift : code_word; /* normalize */ shift = ff_h264_norm_shift[c->high] - 1; - c->high <<= shift; - c->code_word <<= shift; - c->bits += shift; - if(c->bits >= 0 && c->buffer < c->end) { - c->code_word |= *c->buffer++ << c->bits; - c->bits -= 8; + c->high <<= shift; + code_word <<= shift; + bits += shift; + if(bits >= 0 && c->buffer < c->end) { + code_word |= *c->buffer++ << bits; + bits -= 8; } + c->bits = bits; + c->code_word = code_word; return bit; }

1 0

r23923 - trunk/libavfilter/vf_pad.c
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: stefano Date: Thu Jul 1 01:52:28 2010 New Revision: 23923 Log: Set pad description with NULL_IF_CONFIG_SMALL(), consistent with the other filters. Modified: trunk/libavfilter/vf_pad.c Modified: trunk/libavfilter/vf_pad.c ============================================================================== --- trunk/libavfilter/vf_pad.c Thu Jul 1 01:52:26 2010 (r23922) +++ trunk/libavfilter/vf_pad.c Thu Jul 1 01:52:28 2010 (r23923) @@ -306,7 +306,7 @@ static void draw_slice(AVFilterLink *lin AVFilter avfilter_vf_pad = { .name = "pad", - .description = "Add paddings to the input image.", + .description = NULL_IF_CONFIG_SMALL("Add paddings to the input image."), .priv_size = sizeof(PadContext), .init = init,

1 0

r23922 - trunk/libavfilter/vf_pad.c
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: stefano Date: Thu Jul 1 01:52:26 2010 New Revision: 23922 Log: Improve description for the pad filter. Modified: trunk/libavfilter/vf_pad.c Modified: trunk/libavfilter/vf_pad.c ============================================================================== --- trunk/libavfilter/vf_pad.c Thu Jul 1 01:18:47 2010 (r23921) +++ trunk/libavfilter/vf_pad.c Thu Jul 1 01:52:26 2010 (r23922) @@ -306,7 +306,7 @@ static void draw_slice(AVFilterLink *lin AVFilter avfilter_vf_pad = { .name = "pad", - .description = "Add pads to the input image.", + .description = "Add paddings to the input image.", .priv_size = sizeof(PadContext), .init = init,

1 0

r23920 - trunk/libavcodec/vp56.h
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: darkshikari Date: Thu Jul 1 01:15:25 2010 New Revision: 23920 Log: Optimize vp56 arithmetic decoder Negate "bits" to eliminate a negate in cache refilling. Modified: trunk/libavcodec/vp56.h Modified: trunk/libavcodec/vp56.h ============================================================================== --- trunk/libavcodec/vp56.h Thu Jul 1 01:01:44 2010 (r23919) +++ trunk/libavcodec/vp56.h Thu Jul 1 01:15:25 2010 (r23920) @@ -48,7 +48,8 @@ typedef int (*VP56ParseHeader)(VP56Cont typedef struct { int high; - int bits; + int bits; /* Stored negated (i.e. negative "bits" is a positive number of bits left) + * in order to eliminate a negate in cache refilling */ const uint8_t *buffer; const uint8_t *end; unsigned long code_word; @@ -185,7 +186,7 @@ static inline void vp56_init_range_decod const uint8_t *buf, int buf_size) { c->high = 255; - c->bits = 8; + c->bits = -8; c->buffer = buf; c->end = buf + buf_size; c->code_word = bytestream_get_be16(&c->buffer); @@ -209,10 +210,10 @@ static inline int vp56_rac_get_prob(VP56 shift = ff_h264_norm_shift[c->high] - 1; c->high <<= shift; c->code_word <<= shift; - c->bits -= shift; - if(c->bits <= 0 && c->buffer < c->end) { - c->code_word |= *c->buffer++ << -c->bits; - c->bits += 8; + c->bits += shift; + if(c->bits >= 0 && c->buffer < c->end) { + c->code_word |= *c->buffer++ << c->bits; + c->bits -= 8; } return bit; } @@ -232,8 +233,8 @@ static inline int vp56_rac_get(VP56Range /* normalize */ c->code_word <<= 1; - if (--c->bits == 0 && c->buffer < c->end) { - c->bits = 8; + if (++c->bits == 0 && c->buffer < c->end) { + c->bits = -8; c->code_word |= *c->buffer++; } return bit;

1 0

r23919 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: cehoyos Date: Thu Jul 1 01:01:44 2010 New Revision: 23919 Log: Make "invalid dts/pts combination" a debug instead of a warning message. Patch by XBMC Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c Thu Jul 1 00:39:13 2010 (r23918) +++ trunk/libavformat/utils.c Thu Jul 1 01:01:44 2010 (r23919) @@ -908,7 +908,7 @@ static void compute_pkt_fields(AVFormatC // we take the conservative approach and discard both // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ - av_log(s, AV_LOG_WARNING, "invalid dts/pts combination\n"); + av_log(s, AV_LOG_DEBUG, "invalid dts/pts combination\n"); pkt->dts= pkt->pts= AV_NOPTS_VALUE; }

1 0

r23918 - trunk/libavformat/mpegtsenc.c
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: cehoyos Date: Thu Jul 1 00:39:13 2010 New Revision: 23918 Log: Allow setting streamid when muxing mpegts. Patch by Mike Scheutzow, scheutzow alcatel-lucent com Modified: trunk/libavformat/mpegtsenc.c Modified: trunk/libavformat/mpegtsenc.c ============================================================================== --- trunk/libavformat/mpegtsenc.c Thu Jul 1 00:35:57 2010 (r23917) +++ trunk/libavformat/mpegtsenc.c Thu Jul 1 00:39:13 2010 (r23918) @@ -387,8 +387,9 @@ static int mpegts_write_header(AVFormatC MpegTSService *service; AVStream *st, *pcr_st = NULL; AVMetadataTag *title; - int i; + int i, j; const char *service_name; + int *pids; ts->tsid = DEFAULT_TSID; ts->onid = DEFAULT_ONID; @@ -411,6 +412,10 @@ static int mpegts_write_header(AVFormatC ts->sdt.write_packet = section_write_packet; ts->sdt.opaque = s; + pids = av_malloc(s->nb_streams); + if (!pids) + return AVERROR(ENOMEM); + /* assign pids to each stream */ for(i = 0;i < s->nb_streams; i++) { st = s->streams[i]; @@ -419,7 +424,26 @@ static int mpegts_write_header(AVFormatC goto fail; st->priv_data = ts_st; ts_st->service = service; - ts_st->pid = DEFAULT_START_PID + i; + /* MPEG pid values < 16 are reserved. Applications which set st->id in + * this range are assigned a calculated pid. */ + if (st->id < 16) { + ts_st->pid = DEFAULT_START_PID + i; + } else if (st->id < 0x1FFF) { + ts_st->pid = st->id; + } else { + av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id); + goto fail; + } + if (ts_st->pid == service->pmt.pid) { + av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); + goto fail; + } + for (j = 0; j < i; j++) + if (pids[j] == ts_st->pid) { + av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); + goto fail; + } + pids[i] = ts_st->pid; ts_st->payload_pts = AV_NOPTS_VALUE; ts_st->payload_dts = AV_NOPTS_VALUE; ts_st->first_pts_check = 1; @@ -441,6 +465,8 @@ static int mpegts_write_header(AVFormatC } } + av_free(pids); + /* if no video stream, use the first stream as PCR */ if (service->pcr_pid == 0x1fff && s->nb_streams > 0) { pcr_st = s->streams[0]; @@ -496,6 +522,7 @@ static int mpegts_write_header(AVFormatC return 0; fail: + av_free(pids); for(i = 0;i < s->nb_streams; i++) { st = s->streams[i]; av_free(st->priv_data);

1 0

r23917 - in trunk: doc/ffmpeg-doc.texi ffmpeg.c
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: cehoyos Date: Thu Jul 1 00:35:57 2010 New Revision: 23917 Log: Add new option "streamid" to set the value of an outfile streamid. Patch by Mike Scheutzow, scheutzow alcatel-lucent com Modified: trunk/doc/ffmpeg-doc.texi trunk/ffmpeg.c Modified: trunk/doc/ffmpeg-doc.texi ============================================================================== --- trunk/doc/ffmpeg-doc.texi Thu Jul 1 00:33:38 2010 (r23916) +++ trunk/doc/ffmpeg-doc.texi Thu Jul 1 00:35:57 2010 (r23917) @@ -638,6 +638,15 @@ Timestamp discontinuity delta threshold. Set the maximum demux-decode delay. @item -muxpreload @var{seconds} Set the initial demux-decode delay. + at item -streamid @var{output-stream-index}:@var{new-value} +Assign a new value to a stream's stream-id field in the next output file. +All stream-id fields are reset to default for each output file. + +For example, to set the stream 0 PID to 33 and the stream 1 PID to 36 for +an output mpegts file: + at example +ffmpeg -i infile -streamid 0:33 -streamid 1:36 out.ts + at end example @end table @section Preset files Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Thu Jul 1 00:33:38 2010 (r23916) +++ trunk/ffmpeg.c Thu Jul 1 00:35:57 2010 (r23917) @@ -121,6 +121,9 @@ static int nb_stream_maps; static AVMetaDataMap meta_data_maps[MAX_FILES]; static int nb_meta_data_maps; +/* indexed by output file stream index */ +static int streamid_map[MAX_STREAMS]; + static int frame_width = 0; static int frame_height = 0; static float frame_aspect_ratio = 0; @@ -3348,7 +3351,7 @@ static void new_video_stream(AVFormatCon AVCodecContext *video_enc; enum CodecID codec_id; - st = av_new_stream(oc, oc->nb_streams); + st = av_new_stream(oc, streamid_map[oc->nb_streams]); if (!st) { fprintf(stderr, "Could not alloc stream\n"); av_exit(1); @@ -3486,7 +3489,7 @@ static void new_audio_stream(AVFormatCon AVCodecContext *audio_enc; enum CodecID codec_id; - st = av_new_stream(oc, oc->nb_streams); + st = av_new_stream(oc, streamid_map[oc->nb_streams]); if (!st) { fprintf(stderr, "Could not alloc stream\n"); av_exit(1); @@ -3559,7 +3562,7 @@ static void new_subtitle_stream(AVFormat AVStream *st; AVCodecContext *subtitle_enc; - st = av_new_stream(oc, oc->nb_streams); + st = av_new_stream(oc, streamid_map[oc->nb_streams]); if (!st) { fprintf(stderr, "Could not alloc stream\n"); av_exit(1); @@ -3628,6 +3631,27 @@ static void opt_new_subtitle_stream(void new_subtitle_stream(oc); } +/* arg format is "output-stream-index:streamid-value". */ +static void opt_streamid(const char *opt, const char *arg) +{ + int idx; + char *p; + char idx_str[16]; + + strncpy(idx_str, arg, sizeof(idx_str)); + idx_str[sizeof(idx_str)-1] = '\0'; + p = strchr(idx_str, ':'); + if (!p) { + fprintf(stderr, + "Invalid value '%s' for option '%s', required syntax is 'index:value'\n", + arg, opt); + av_exit(1); + } + *p++ = '\0'; + idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, MAX_STREAMS-1); + streamid_map[idx] = parse_number_or_die(opt, p, OPT_INT, 0, INT_MAX); +} + static void opt_output_file(const char *filename) { AVFormatContext *oc; @@ -3775,6 +3799,8 @@ static void opt_output_file(const char * oc->flags |= AVFMT_FLAG_NONBLOCK; set_context_opts(oc, avformat_opts, AV_OPT_FLAG_ENCODING_PARAM); + + memset(streamid_map, 0, sizeof(streamid_map)); } /* same option as mencoder */ @@ -4233,6 +4259,7 @@ static const OptionDef options[] = { { "vlang", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void *)&video_language}, "set the ISO 639 language code (3 letters) of the current video stream" , "code" }, { "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" }, { "force_fps", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&force_fps}, "force the selected framerate, disable the best supported framerate selection" }, + { "streamid", OPT_FUNC2 | HAS_ARG | OPT_EXPERT, {(void*)opt_streamid}, "set the value of an outfile streamid", "streamIndex:value" }, /* audio options */ { "ab", OPT_FUNC2 | HAS_ARG | OPT_AUDIO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "bitrate" },

1 0

r23916 - in trunk/libavcodec: h264pred.c mathops.h
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Thu Jul 1 00:33:38 2010 New Revision: 23916 Log: Add more int packing macros, name them consistently Modified: trunk/libavcodec/h264pred.c trunk/libavcodec/mathops.h Modified: trunk/libavcodec/h264pred.c ============================================================================== --- trunk/libavcodec/h264pred.c Thu Jul 1 00:05:29 2010 (r23915) +++ trunk/libavcodec/h264pred.c Thu Jul 1 00:33:38 2010 (r23916) @@ -109,7 +109,7 @@ static void pred4x4_vertical_vp8_c(uint8 const int lt= src[-1-1*stride]; LOAD_TOP_EDGE LOAD_TOP_RIGHT_EDGE - uint32_t v = PACK4UINT8((lt + 2*t0 + t1 + 2) >> 2, + uint32_t v = PACK_4U8((lt + 2*t0 + t1 + 2) >> 2, (t0 + 2*t1 + t2 + 2) >> 2, (t1 + 2*t2 + t3 + 2) >> 2, (t2 + 2*t3 + t4 + 2) >> 2); Modified: trunk/libavcodec/mathops.h ============================================================================== --- trunk/libavcodec/mathops.h Thu Jul 1 00:05:29 2010 (r23915) +++ trunk/libavcodec/mathops.h Thu Jul 1 00:33:38 2010 (r23916) @@ -146,12 +146,36 @@ if ((y) < (x)) {\ # define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) #endif -#ifndef PACK4x8 -# if HAVE_BIGENDIAN -# define PACK4UINT8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) -# else -# define PACK4UINT8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +#if HAVE_BIGENDIAN +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((a) << 8) | (b)) +# endif +# ifndef PACK_4U8 +# define PACK_4U8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((a) << 16) | (b)) +# endif +#else +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((b) << 8) | (a)) # endif +# ifndef PACK_4U2 +# define PACK_4U8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((b) << 16) | (a)) +# endif +#endif + +#ifndef PACK_2S8 +# define PACK_2S8(a,b) PACK_2U8((a)&255, (b)&255) +#endif +#ifndef PACK_4S8 +# define PACK_4S8(a,b,c,d) PACK_4U8((a)&255, (b)&255, (c)&255, (d)&255) +#endif +#ifndef PACK_2S16 +# define PACK_2S16(a,b) PACK_2U16((a)&0xffff, (b)&0xffff) #endif #endif /* AVCODEC_MATHOPS_H */

1 0

r23912 - in trunk/libavcodec: dct.c fft.h mpegaudio.h mpegaudiodec.c mpegaudiodec_float.c
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: vitor Date: Wed Jun 30 22:11:27 2010 New Revision: 23912 Log: More mp{1,2,3} 32-point DCT transform to our common DCT framework. Should allow for future SIMD optimizations. Modified: trunk/libavcodec/dct.c trunk/libavcodec/fft.h trunk/libavcodec/mpegaudio.h trunk/libavcodec/mpegaudiodec.c trunk/libavcodec/mpegaudiodec_float.c Modified: trunk/libavcodec/dct.c ============================================================================== --- trunk/libavcodec/dct.c Wed Jun 30 22:09:55 2010 (r23911) +++ trunk/libavcodec/dct.c Wed Jun 30 22:11:27 2010 (r23912) @@ -31,6 +31,9 @@ #include "libavutil/mathematics.h" #include "fft.h" +#define DCT32_FLOAT +#include "dct32.c" + /* sin((M_PI * x / (2*n)) */ #define SIN(s,n,x) (s->costab[(n) - (x)]) @@ -167,6 +170,11 @@ static void ff_dct_calc_II_c(DCTContext } } +static void dct32_func(DCTContext *ctx, FFTSample *data) +{ + ctx->dct32(data, data); +} + void ff_dct_calc(DCTContext *s, FFTSample *data) { s->dct_calc(s, data); @@ -200,6 +208,12 @@ av_cold int ff_dct_init(DCTContext *s, i case DCT_III: s->dct_calc = ff_dct_calc_III_c; break; case DST_I : s->dct_calc = ff_dst_calc_I_c; break; } + + if (inverse == DCT_II && nbits == 5) + s->dct_calc = dct32_func; + + s->dct32 = dct32; + return 0; } Modified: trunk/libavcodec/fft.h ============================================================================== --- trunk/libavcodec/fft.h Wed Jun 30 22:09:55 2010 (r23911) +++ trunk/libavcodec/fft.h Wed Jun 30 22:11:27 2010 (r23912) @@ -228,6 +228,7 @@ struct DCTContext { const float *costab; FFTSample *csc2; void (*dct_calc)(struct DCTContext *s, FFTSample *data); + void (*dct32)(FFTSample *out, const FFTSample *in); }; /** Modified: trunk/libavcodec/mpegaudio.h ============================================================================== --- trunk/libavcodec/mpegaudio.h Wed Jun 30 22:09:55 2010 (r23911) +++ trunk/libavcodec/mpegaudio.h Wed Jun 30 22:11:27 2010 (r23912) @@ -33,6 +33,7 @@ #include "avcodec.h" #include "get_bits.h" #include "dsputil.h" +#include "fft.h" #define CONFIG_AUDIO_NONSHORT 0 @@ -156,6 +157,9 @@ typedef struct MPADecodeContext { int dither_state; int error_recognition; AVCodecContext* avctx; +#if CONFIG_FLOAT + DCTContext dct; +#endif void (*apply_window_mp3)(MPA_INT *synth_buf, MPA_INT *window, int *dither_state, OUT_INT *samples, int incr); } MPADecodeContext; Modified: trunk/libavcodec/mpegaudiodec.c ============================================================================== --- trunk/libavcodec/mpegaudiodec.c Wed Jun 30 22:09:55 2010 (r23911) +++ trunk/libavcodec/mpegaudiodec.c Wed Jun 30 22:11:27 2010 (r23912) @@ -67,6 +67,12 @@ #include "mpegaudiodata.h" #include "mpegaudiodectab.h" +#if CONFIG_FLOAT +# include "fft.h" +#else +# include "dct32.c" +#endif + static void compute_antialias_integer(MPADecodeContext *s, GranuleDef *g); static void compute_antialias_float(MPADecodeContext *s, GranuleDef *g); static void apply_window_mp3_c(MPA_INT *synth_buf, MPA_INT *window, @@ -349,6 +355,9 @@ static av_cold int decode_init(AVCodecCo scale_factor_mult[i][2]); } +#if CONFIG_FLOAT + ff_dct_init(&s->dct, 5, DCT_II); +#endif RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window)); /* huffman decode tables */ @@ -512,245 +521,6 @@ static av_cold int decode_init(AVCodecCo return 0; } -/* tab[i][j] = 1.0 / (2.0 * cos(pi*(2*k+1) / 2^(6 - j))) */ - -/* cos(i*pi/64) */ - -#define COS0_0 FIXHR(0.50060299823519630134/2) -#define COS0_1 FIXHR(0.50547095989754365998/2) -#define COS0_2 FIXHR(0.51544730992262454697/2) -#define COS0_3 FIXHR(0.53104259108978417447/2) -#define COS0_4 FIXHR(0.55310389603444452782/2) -#define COS0_5 FIXHR(0.58293496820613387367/2) -#define COS0_6 FIXHR(0.62250412303566481615/2) -#define COS0_7 FIXHR(0.67480834145500574602/2) -#define COS0_8 FIXHR(0.74453627100229844977/2) -#define COS0_9 FIXHR(0.83934964541552703873/2) -#define COS0_10 FIXHR(0.97256823786196069369/2) -#define COS0_11 FIXHR(1.16943993343288495515/4) -#define COS0_12 FIXHR(1.48416461631416627724/4) -#define COS0_13 FIXHR(2.05778100995341155085/8) -#define COS0_14 FIXHR(3.40760841846871878570/8) -#define COS0_15 FIXHR(10.19000812354805681150/32) - -#define COS1_0 FIXHR(0.50241928618815570551/2) -#define COS1_1 FIXHR(0.52249861493968888062/2) -#define COS1_2 FIXHR(0.56694403481635770368/2) -#define COS1_3 FIXHR(0.64682178335999012954/2) -#define COS1_4 FIXHR(0.78815462345125022473/2) -#define COS1_5 FIXHR(1.06067768599034747134/4) -#define COS1_6 FIXHR(1.72244709823833392782/4) -#define COS1_7 FIXHR(5.10114861868916385802/16) - -#define COS2_0 FIXHR(0.50979557910415916894/2) -#define COS2_1 FIXHR(0.60134488693504528054/2) -#define COS2_2 FIXHR(0.89997622313641570463/2) -#define COS2_3 FIXHR(2.56291544774150617881/8) - -#define COS3_0 FIXHR(0.54119610014619698439/2) -#define COS3_1 FIXHR(1.30656296487637652785/4) - -#define COS4_0 FIXHR(0.70710678118654752439/2) - -/* butterfly operator */ -#define BF(a, b, c, s)\ -{\ - tmp0 = val##a + val##b;\ - tmp1 = val##a - val##b;\ - val##a = tmp0;\ - val##b = MULH3(tmp1, c, 1<<(s));\ -} - -#define BF0(a, b, c, s)\ -{\ - tmp0 = tab[a] + tab[b];\ - tmp1 = tab[a] - tab[b];\ - val##a = tmp0;\ - val##b = MULH3(tmp1, c, 1<<(s));\ -} - -#define BF1(a, b, c, d)\ -{\ - BF(a, b, COS4_0, 1);\ - BF(c, d,-COS4_0, 1);\ - val##c += val##d;\ -} - -#define BF2(a, b, c, d)\ -{\ - BF(a, b, COS4_0, 1);\ - BF(c, d,-COS4_0, 1);\ - val##c += val##d;\ - val##a += val##c;\ - val##c += val##b;\ - val##b += val##d;\ -} - -#define ADD(a, b) val##a += val##b - -/* DCT32 without 1/sqrt(2) coef zero scaling. */ -static void dct32(INTFLOAT *out, const INTFLOAT *tab) -{ - INTFLOAT tmp0, tmp1; - - INTFLOAT val0 , val1 , val2 , val3 , val4 , val5 , val6 , val7 , - val8 , val9 , val10, val11, val12, val13, val14, val15, - val16, val17, val18, val19, val20, val21, val22, val23, - val24, val25, val26, val27, val28, val29, val30, val31; - - /* pass 1 */ - BF0( 0, 31, COS0_0 , 1); - BF0(15, 16, COS0_15, 5); - /* pass 2 */ - BF( 0, 15, COS1_0 , 1); - BF(16, 31,-COS1_0 , 1); - /* pass 1 */ - BF0( 7, 24, COS0_7 , 1); - BF0( 8, 23, COS0_8 , 1); - /* pass 2 */ - BF( 7, 8, COS1_7 , 4); - BF(23, 24,-COS1_7 , 4); - /* pass 3 */ - BF( 0, 7, COS2_0 , 1); - BF( 8, 15,-COS2_0 , 1); - BF(16, 23, COS2_0 , 1); - BF(24, 31,-COS2_0 , 1); - /* pass 1 */ - BF0( 3, 28, COS0_3 , 1); - BF0(12, 19, COS0_12, 2); - /* pass 2 */ - BF( 3, 12, COS1_3 , 1); - BF(19, 28,-COS1_3 , 1); - /* pass 1 */ - BF0( 4, 27, COS0_4 , 1); - BF0(11, 20, COS0_11, 2); - /* pass 2 */ - BF( 4, 11, COS1_4 , 1); - BF(20, 27,-COS1_4 , 1); - /* pass 3 */ - BF( 3, 4, COS2_3 , 3); - BF(11, 12,-COS2_3 , 3); - BF(19, 20, COS2_3 , 3); - BF(27, 28,-COS2_3 , 3); - /* pass 4 */ - BF( 0, 3, COS3_0 , 1); - BF( 4, 7,-COS3_0 , 1); - BF( 8, 11, COS3_0 , 1); - BF(12, 15,-COS3_0 , 1); - BF(16, 19, COS3_0 , 1); - BF(20, 23,-COS3_0 , 1); - BF(24, 27, COS3_0 , 1); - BF(28, 31,-COS3_0 , 1); - - - - /* pass 1 */ - BF0( 1, 30, COS0_1 , 1); - BF0(14, 17, COS0_14, 3); - /* pass 2 */ - BF( 1, 14, COS1_1 , 1); - BF(17, 30,-COS1_1 , 1); - /* pass 1 */ - BF0( 6, 25, COS0_6 , 1); - BF0( 9, 22, COS0_9 , 1); - /* pass 2 */ - BF( 6, 9, COS1_6 , 2); - BF(22, 25,-COS1_6 , 2); - /* pass 3 */ - BF( 1, 6, COS2_1 , 1); - BF( 9, 14,-COS2_1 , 1); - BF(17, 22, COS2_1 , 1); - BF(25, 30,-COS2_1 , 1); - - /* pass 1 */ - BF0( 2, 29, COS0_2 , 1); - BF0(13, 18, COS0_13, 3); - /* pass 2 */ - BF( 2, 13, COS1_2 , 1); - BF(18, 29,-COS1_2 , 1); - /* pass 1 */ - BF0( 5, 26, COS0_5 , 1); - BF0(10, 21, COS0_10, 1); - /* pass 2 */ - BF( 5, 10, COS1_5 , 2); - BF(21, 26,-COS1_5 , 2); - /* pass 3 */ - BF( 2, 5, COS2_2 , 1); - BF(10, 13,-COS2_2 , 1); - BF(18, 21, COS2_2 , 1); - BF(26, 29,-COS2_2 , 1); - /* pass 4 */ - BF( 1, 2, COS3_1 , 2); - BF( 5, 6,-COS3_1 , 2); - BF( 9, 10, COS3_1 , 2); - BF(13, 14,-COS3_1 , 2); - BF(17, 18, COS3_1 , 2); - BF(21, 22,-COS3_1 , 2); - BF(25, 26, COS3_1 , 2); - BF(29, 30,-COS3_1 , 2); - - /* pass 5 */ - BF1( 0, 1, 2, 3); - BF2( 4, 5, 6, 7); - BF1( 8, 9, 10, 11); - BF2(12, 13, 14, 15); - BF1(16, 17, 18, 19); - BF2(20, 21, 22, 23); - BF1(24, 25, 26, 27); - BF2(28, 29, 30, 31); - - /* pass 6 */ - - ADD( 8, 12); - ADD(12, 10); - ADD(10, 14); - ADD(14, 9); - ADD( 9, 13); - ADD(13, 11); - ADD(11, 15); - - out[ 0] = val0; - out[16] = val1; - out[ 8] = val2; - out[24] = val3; - out[ 4] = val4; - out[20] = val5; - out[12] = val6; - out[28] = val7; - out[ 2] = val8; - out[18] = val9; - out[10] = val10; - out[26] = val11; - out[ 6] = val12; - out[22] = val13; - out[14] = val14; - out[30] = val15; - - ADD(24, 28); - ADD(28, 26); - ADD(26, 30); - ADD(30, 25); - ADD(25, 29); - ADD(29, 27); - ADD(27, 31); - - out[ 1] = val16 + val24; - out[17] = val17 + val25; - out[ 9] = val18 + val26; - out[25] = val19 + val27; - out[ 5] = val20 + val28; - out[21] = val21 + val29; - out[13] = val22 + val30; - out[29] = val23 + val31; - out[ 3] = val24 + val20; - out[19] = val25 + val21; - out[11] = val26 + val22; - out[27] = val27 + val23; - out[ 7] = val28 + val18; - out[23] = val29 + val19; - out[15] = val30 + val17; - out[31] = val31; -} #if CONFIG_FLOAT static inline float round_sample(float *sum) Modified: trunk/libavcodec/mpegaudiodec_float.c ============================================================================== --- trunk/libavcodec/mpegaudiodec_float.c Wed Jun 30 22:09:55 2010 (r23911) +++ trunk/libavcodec/mpegaudiodec_float.c Wed Jun 30 22:11:27 2010 (r23912) @@ -34,7 +34,7 @@ void ff_mpa_synth_filter_float(MPADecode offset = *synth_buf_offset; synth_buf = synth_buf_ptr + offset; - dct32(synth_buf, sb_samples); + s->dct.dct32(synth_buf, sb_samples); s->apply_window_mp3(synth_buf, window, dither_state, samples, incr); offset = (offset - 32) & 511;

3 3

[master PATCH] State in the guidelines that function and parameter descriptions in the doxy must use impersonal verbal form.
by stefano.sabatini-lala＠poste.it 30 Jun '10

30 Jun '10

This form is apparently favored by most English speaker developers, and has the advantage of being easier to use than the third person form. This should hopefully put an end to the Third Person Holy Bikeshed War. --- doc/developer.texi | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/doc/developer.texi b/doc/developer.texi index edce7ea..c816352 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -83,6 +83,9 @@ format (see examples below) so that code documentation can be generated automatically. All nontrivial functions should have a comment above them explaining what the function does, even if it is just one sentence. All structures and their member variables should be documented, too. +Impersonal form must be used for the function and parameter +descriptions, e.g. "Set the bikeshed color." is favored over "Sets the +bikeshed color.". @example /** * @@file mpeg.c -- 1.7.1 --pWyiEgJYm5f9v55/--

1 0