June 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r2299 - eac3/ac3dec.h
by jbr 01 Jun '08

01 Jun '08

Author: jbr Date: Sun Jun 1 20:20:16 2008 New Revision: 2299 Log: cosmetics: indent Modified: eac3/ac3dec.h Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sun Jun 1 20:20:16 2008 @@ -83,17 +83,17 @@ typedef struct AC3DecodeContext { ///@} ///@defgroup cpl Standard Coupling - int cpl_in_use[MAX_BLOCKS]; ///< coupling in use (cplinu) - int cpl_strategy_exists[MAX_BLOCKS]; ///< coupling strategy exists (cplstre) - int channel_in_cpl[AC3_MAX_CHANNELS]; ///< channel in coupling (chincpl) - int phase_flags_in_use; ///< phase flag in use (phsflginu) - int phase_flags[18]; ///< phase flag - int num_cpl_subbands; ///< number of coupling sub bands (ncplsubnd) - int num_cpl_bands; ///< number of coupling bands (ncplbnd) - int cpl_band_struct[18]; ///< coupling band structure (cplbndstrc) - int firstchincpl; ///< first channel in coupling - int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states (firstcplcos) - int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco) + int cpl_in_use[MAX_BLOCKS]; ///< coupling in use (cplinu) + int cpl_strategy_exists[MAX_BLOCKS]; ///< coupling strategy exists (cplstre) + int channel_in_cpl[AC3_MAX_CHANNELS]; ///< channel in coupling (chincpl) + int phase_flags_in_use; ///< phase flag in use (phsflginu) + int phase_flags[18]; ///< phase flag + int num_cpl_subbands; ///< number of coupling sub bands (ncplsubnd) + int num_cpl_bands; ///< number of coupling bands (ncplbnd) + int cpl_band_struct[18]; ///< coupling band structure (cplbndstrc) + int firstchincpl; ///< first channel in coupling + int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states (firstcplcos) + int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco) ///@} ///@defgroup aht adaptive hybrid transform

1 0

[soc]: r2297 - wmapro/wma3dec.c
by faust3 01 Jun '08

01 Jun '08

Author: faust3 Date: Sun Jun 1 11:56:03 2008 New Revision: 2297 Log: added av_cold to the init and end functions Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c (original) +++ wmapro/wma3dec.c Sun Jun 1 11:56:03 2008 @@ -99,7 +99,7 @@ static int get_samples_per_frame(int sam return samples_per_frame; } -static int wma3_decode_init(AVCodecContext *avctx) +static av_cold int wma3_decode_init(AVCodecContext *avctx) { WMA3DecodeContext *s = avctx->priv_data; uint8_t *edata_ptr = avctx->extradata; @@ -226,7 +226,7 @@ static int wma3_decode_packet(AVCodecCon return avctx->block_align; } -static int wma3_decode_end(AVCodecContext *avctx) +static av_cold int wma3_decode_end(AVCodecContext *avctx) { return 0; }

1 0

[soc]: r2296 - wmapro/wma3dec.c
by faust3 01 Jun '08

01 Jun '08

Author: faust3 Date: Sun Jun 1 11:53:12 2008 New Revision: 2296 Log: the input buffer of decode packet should be declared as const Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c (original) +++ wmapro/wma3dec.c Sun Jun 1 11:53:12 2008 @@ -137,7 +137,7 @@ static int wma3_decode_init(AVCodecConte static int wma3_decode_packet(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { WMA3DecodeContext *s = avctx->priv_data; int more_frames=1;

1 0

[soc]: r2295 - wmapro/wma3dec.c
by faust3 01 Jun '08

01 Jun '08

Author: faust3 Date: Sun Jun 1 11:50:13 2008 New Revision: 2295 Log: added long_name Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c (original) +++ wmapro/wma3dec.c Sun Jun 1 11:50:13 2008 @@ -241,4 +241,5 @@ AVCodec wmav3pro_decoder = NULL, wma3_decode_end, wma3_decode_packet, + .long_name = "Windows Media Audio 9 Professional", };

1 0

[soc]: r2294 - wmapro/TODO
by faust3 01 Jun '08

01 Jun '08

Author: faust3 Date: Sun Jun 1 11:46:27 2008 New Revision: 2294 Log: added TODO file Added: wmapro/TODO Added: wmapro/TODO ============================================================================== --- (empty file) +++ wmapro/TODO Sun Jun 1 11:46:27 2008 @@ -0,0 +1 @@ +decide about the name wmapro vs. wmav3pro vs. wmav3 and adjust the filenames etc. accordingly

1 0

[soc]: r2293 - wmapro/checkout.sh
by faust3 01 Jun '08

01 Jun '08

Author: faust3 Date: Sun Jun 1 11:44:23 2008 New Revision: 2293 Log: added a checkout script Added: wmapro/checkout.sh (contents, props changed) Added: wmapro/checkout.sh ============================================================================== --- (empty file) +++ wmapro/checkout.sh Sun Jun 1 11:44:23 2008 @@ -0,0 +1,7 @@ +#!/bin/sh +svn co svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg +cd ffmpeg/libavcodec +ln -s ../../wma3dec.c wma3dec.c +cd ../ +patch -p0 <../wmapro_ffmpeg.patch +

1 0

[soc]: r2292 - wmapro/wmapro_ffmpeg.patch
by faust3 01 Jun '08

01 Jun '08

Author: faust3 Date: Sun Jun 1 11:43:39 2008 New Revision: 2292 Log: added wmapro ffmpeg patch Added: wmapro/wmapro_ffmpeg.patch Added: wmapro/wmapro_ffmpeg.patch ============================================================================== --- (empty file) +++ wmapro/wmapro_ffmpeg.patch Sun Jun 1 11:43:39 2008 @@ -0,0 +1,24 @@ +Index: libavcodec/Makefile +=================================================================== +--- libavcodec/Makefile (revision 13558) ++++ libavcodec/Makefile (working copy) +@@ -217,6 +217,7 @@ + OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o mdct.o fft.o + OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o mdct.o fft.o + OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o mdct.o fft.o ++OBJS-$(CONFIG_WMAV3PRO_DECODER) += wma3dec.o + OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o + OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o + OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o +Index: libavcodec/allcodecs.c +=================================================================== +--- libavcodec/allcodecs.c (revision 13558) ++++ libavcodec/allcodecs.c (working copy) +@@ -210,6 +210,7 @@ + REGISTER_DECODER (WAVPACK, wavpack); + REGISTER_ENCDEC (WMAV1, wmav1); + REGISTER_ENCDEC (WMAV2, wmav2); ++ REGISTER_DECODER (WMAV3PRO, wmav3pro); + REGISTER_DECODER (WS_SND1, ws_snd1); + + /* PCM codecs */

1 0