diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 17:37:42 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-01 17:37:42 +0400 |
| commit | 6cbb04ca0bd4d7feba3e510187231a7065153149 (patch) | |
| tree | 04c24c00094d70d7f5d819f46169def6e153b629 /src | |
| parent | 2fa91881376e2755415efcb52973a3fa482c2e97 (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2092 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
110 files changed, 332 insertions, 210 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.c index 255ec9081..4d73f42a9 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/ac3.c
+ * @file
* Common code between the AC-3 encoder and decoder.
*/
@@ -42,7 +42,7 @@ static const uint8_t band_start_tab[51] = { };
/**
- * Maps each frequency coefficient bin to the critical band that contains it.
+ * Map each frequency coefficient bin to the critical band that contains it.
*/
static const uint8_t bin_to_band_tab[253] = {
0,
@@ -261,7 +261,7 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap, }
/**
- * Initializes some tables.
+ * Initialize some tables.
* note: This function must remain thread safe because it is called by the
* AVParser init code.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.h index 4a4d3709b..3939d267a 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3.h @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/ac3.h
+ * @file
* Common code between the AC-3 encoder and decoder.
*/
@@ -114,7 +114,7 @@ typedef enum { void ac3_common_init(void);
/**
- * Calculates the log power-spectral density of the input signal.
+ * Calculate the log power-spectral density of the input signal.
* This gives a rough estimate of signal power in the frequency domain by using
* the spectral envelope (exponents). The psd is also separately grouped
* into critical bands for use in the calculating the masking curve.
@@ -131,7 +131,7 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *exp, int start, int end, int16_t *psd, int16_t *band_psd);
/**
- * Calculates the masking curve.
+ * Calculate the masking curve.
* First, the excitation is calculated using parameters in s and the signal
* power in each critical band. The excitation is compared with a predefined
* hearing threshold table to produce the masking curve. If delta bit
@@ -159,7 +159,7 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd, int16_t *mask);
/**
- * Calculates bit allocation pointers.
+ * Calculate bit allocation pointers.
* The SNR is the difference between the masking curve and the signal. AC-3
* uses this value for each frequency bin to allocate bits. The snroffset
* parameter is a global adjustment to the SNR for all bins.
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3_parser.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3_parser.h index 766c68b2b..757cb1582 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3_parser.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3_parser.h @@ -27,8 +27,8 @@ #include "get_bits.h" /** - * Parses AC-3 frame header. - * Parses the header up to the lfeon element, which is the first 52 or 54 bits + * Parse AC-3 frame header. + * Parse the header up to the lfeon element, which is the first 52 or 54 bits * depending on the audio coding mode. * @param gbc[in] BitContext containing the first 54 bits of the frame. * @param hdr[out] Pointer to struct where header info is written. @@ -39,8 +39,8 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); /** - * Parses AC-3 frame header and sets channel_map - * Parses the header up to the lfeon (channel_map in E-AC-3) + * Parse AC-3 frame header and sets channel_map + * Parse the header up to the lfeon (channel_map in E-AC-3) * element, which is the first 52, 54 or 104 bits depending * on the audio coding mode. * @param gbc[in] BitContext containing the first 54 bits of the frame. diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.c index 34b39c6fe..126424440 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.c @@ -1437,7 +1437,7 @@ static av_cold int ac3_decode_end(AVCodecContext *avctx) AVCodec ac3_decoder = { /*.name = */"ac3", - /*.type = */CODEC_TYPE_AUDIO, + /*.type = */AVMEDIA_TYPE_AUDIO, /*.id = */CODEC_ID_AC3, /*.priv_data_size = */sizeof (AC3DecodeContext), /*.init = */ac3_decode_init, @@ -1455,7 +1455,7 @@ AVCodec ac3_decoder = { #if CONFIG_EAC3_DECODER AVCodec eac3_decoder = { /*.name = */"eac3", - /*.type = */CODEC_TYPE_AUDIO, + /*.type = */AVMEDIA_TYPE_AUDIO, /*.id = */CODEC_ID_EAC3, /*.priv_data_size = */sizeof (AC3DecodeContext), /*.init = */ac3_decode_init, diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.h index bd555bdde..8c0d442fc 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec.h @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/ac3.h + * @file * Common code between the AC-3 and E-AC-3 decoders. * * Summary of MDCT Coefficient Grouping: diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec_data.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec_data.c index abe359b88..ea13d3de5 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec_data.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3dec_data.c @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/ac3dec_data.c + * @file * Tables taken directly from the AC-3 spec. */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3tab.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3tab.c index 0ee330589..9bf643571 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3tab.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ac3tab.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/ac3tab.c
+ * @file
* tables taken directly from the AC-3 spec.
*/
@@ -73,7 +73,7 @@ const uint16_t ff_ac3_frame_size_tab[38][3] = { };
/**
- * Maps audio coding mode (acmod) to number of full-bandwidth channels.
+ * Map audio coding mode (acmod) to number of full-bandwidth channels.
* from ATSC A/52 Table 5.8 Audio Coding Mode
*/
const uint8_t ff_ac3_channels_tab[8] = {
@@ -81,7 +81,7 @@ const uint8_t ff_ac3_channels_tab[8] = { };
/**
- * Maps audio coding mode (acmod) to channel layout mask.
+ * Map audio coding mode (acmod) to channel layout mask.
*/
const uint16_t ff_ac3_channel_layout_tab[8] = {
CH_LAYOUT_STEREO,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/allcodecs.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/allcodecs.c index 594f72baa..79a6ae32b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/allcodecs.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/allcodecs.c @@ -1,5 +1,5 @@ /*
- * Provides registration of all codecs, parsers and bitstream filters for libavcodec.
+ * Provide registration of all codecs, parsers and bitstream filters for libavcodec.
* Copyright (c) 2002 Fabrice Bellard
*
* This file is part of FFmpeg.
@@ -20,8 +20,8 @@ */
/**
- * @file libavcodec/allcodecs.c
- * Provides registration of all codecs, parsers and bitstream filters for libavcodec.
+ * @file
+ * Provide registration of all codecs, parsers and bitstream filters for libavcodec.
*/
#include "avcodec.h"
@@ -145,7 +145,7 @@ void avcodec_register_all(void) //REGISTER_DECODER (WMAV1, wmav1);
//REGISTER_DECODER (WMAV2, wmav2);
- /* pcm codecs */
+ /* PCM codecs */
//REGISTER_DECODER (PCM_ALAW, pcm_alaw);
//REGISTER_DECODER (PCM_MULAW,pcm_mulaw);
@@ -179,3 +179,4 @@ void avcodec_register_all(void) REGISTER_PARSER (MLP, mlp);
//REGISTER_PARSER (MPEGAUDIO, mpegaudio);
}
+
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avfft.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avfft.h index 623f0a33b..be2d9c7e1 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avfft.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/avfft.h @@ -85,7 +85,7 @@ enum DCTTransformType { }; /** - * Sets up DCT. + * Set up DCT. * @param nbits size of the input array: * (1 << nbits) for DCT-II, DCT-III and DST-I * (1 << nbits) + 1 for DCT-I diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.c index cc0a7c225..1d7e55aa9 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/cabac.c
+ * @file
* Context Adaptive Binary Arithmetic Coder.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.h index 16b0dc079..dd33345a9 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cabac.h @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/cabac.h
+ * @file
* Context Adaptive Binary Arithmetic Coder.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cook.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cook.c index 8992f8935..1d4cc70a0 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cook.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cook.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/cook.c
+ * @file
* Cook compatible decoder. Bastardization of the G.722.1 standard.
* This decoder handles RealNetworks, RealAudio G2 data.
* Cook is identified by the codec name cook in RM files.
@@ -1224,7 +1224,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) AVCodec cook_decoder =
{
/*.name = */"cook",
- /*.type = */CODEC_TYPE_AUDIO,
+ /*.type = */AVMEDIA_TYPE_AUDIO,
/*.id = */CODEC_ID_COOK,
/*.priv_data_size = */sizeof(COOKContext),
/*.init =*/ cook_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cookdata.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cookdata.h index a0175f04a..aa7a5f423 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cookdata.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cookdata.h @@ -21,7 +21,7 @@ */
/**
- * @file cookdata.h
+ * @file
* Cook AKA RealAudio G2 compatible decoderdata
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cscd.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cscd.c index 55df95873..bc33f8a14 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cscd.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cscd.c @@ -247,7 +247,7 @@ static av_cold int decode_end(AVCodecContext *avctx) { AVCodec cscd_decoder = {
"camstudio",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_CSCD,
sizeof(CamStudioContext),
decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cyuv.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cyuv.c index 7f67d922b..a1e94a407 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cyuv.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/cyuv.c @@ -24,7 +24,7 @@ */
/**
- * @file libavcodec/cyuv.c
+ * @file
* Creative YUV (CYUV) Video Decoder.
*/
@@ -174,7 +174,7 @@ static av_cold int cyuv_decode_end(AVCodecContext *avctx) #if CONFIG_CYUV_DECODER
AVCodec cyuv_decoder = {
"cyuv",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_CYUV,
sizeof(CyuvDecodeContext),
cyuv_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/eac3dec_data.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/eac3dec_data.c index 9e9f8a254..031702e9e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/eac3dec_data.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/eac3dec_data.c @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/eac3dec_data.c + * @file * Tables taken directly from the E-AC-3 spec. */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/error_resilience.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/error_resilience.c index 86755909e..d81ef0967 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/error_resilience.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/error_resilience.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/error_resilience.c
+ * @file
* Error resilience / concealment.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.c index 08818a24c..cdc4ef291 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.c @@ -19,7 +19,7 @@ */
/**
- * @file faandct.c
+ * @file
* @brief
* Floating point AAN DCT
* @author Michael Niedermayer <michaelni@gmx.at>
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.h index ce9000923..368aa4fb6 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/faandct.h @@ -20,7 +20,7 @@ */
/**
- * @file faandct.h
+ * @file
* @brief
* Floating point AAN DCT
* @author Michael Niedermayer <michaelni@gmx.at>
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c index db7cf5816..c095ef3b3 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c @@ -22,7 +22,7 @@ */
/**
- * @file libavcodec/fft.c
+ * @file
* FFT/IFFT transforms.
*/
@@ -113,7 +113,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) #if HAVE_MMX && HAVE_YASM && ARCH_X86_32
ff_fft_init_mmx(s);
#endif
-
+
if (s->split_radix) {
for(j=4; j<=nbits; j++) {
ff_init_ff_cos_tabs(j);
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.h index 644c23082..3749ea9aa 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.h @@ -84,7 +84,7 @@ extern COSTABLE(65536); extern COSTABLE_CONST FFTSample* const ff_cos_tabs[17]; /** - * Initializes the cosine table in ff_cos_tabs[index] + * Initialize the cosine table in ff_cos_tabs[index] * \param index index in ff_cos_tabs array of the table to initialize */ void ff_init_ff_cos_tabs(int index); @@ -104,7 +104,7 @@ extern SINTABLE(32768); extern SINTABLE(65536); /** - * Sets up a complex FFT. + * Set up a complex FFT. * @param nbits log2 of the length of the input array * @param inverse if 0 perform the forward transform, if 1 perform the inverse */ @@ -205,7 +205,7 @@ struct RDFTContext { }; /** - * Sets up a real FFT. + * Set up a real FFT. * @param nbits log2 of the length of the input array * @param trans the type of transform */ @@ -229,7 +229,7 @@ struct DCTContext { }; /** - * Sets up DCT. + * Set up DCT. * @param nbits size of the input array: * (1 << nbits) for DCT-II, DCT-III and DST-I * (1 << nbits) + 1 for DCT-I diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c index 104e48d91..372460a76 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/flvdec.c @@ -119,7 +119,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s) AVCodec flv_decoder = { "flv", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_FLV1, sizeof(MpegEncContext), ff_h263_decode_init, diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h index 93298063f..773a3953d 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/get_bits.h @@ -19,7 +19,7 @@ */
/**
- * @file libavcodec/get_bits.h
+ * @file
* bitstream reader API header.
*/
@@ -660,7 +660,7 @@ static inline int get_xbits_trace(GetBitContext *s, int n, char *file, const cha #define tprintf(p, ...) av_log(p, AV_LOG_DEBUG, __VA_ARGS__)
#else //TRACE
- #define tprintf(p, ...) {}
+#define tprintf(p, ...) {}
#endif
static inline int decode012(GetBitContext *gb){
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.c index 00ebf8f49..d71b1db76 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.c @@ -21,7 +21,7 @@ */
/**
- * @file h261.c
+ * @file
* h261codec.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.h index b5eb539e7..5b60dd65a 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261.h @@ -21,7 +21,7 @@ */ /** - * @file h261.c + * @file * h261codec. */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261_parser.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261_parser.c index 8353d7a9f..10c17bbe5 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261_parser.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261_parser.c @@ -21,7 +21,7 @@ */
/**
- * @file h261_parser.c
+ * @file
* h261codec.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261data.h index 54d74b82d..60428a320 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261data.h @@ -20,7 +20,7 @@ */
/**
- * @file h261data.h
+ * @file
* H.261 tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261dec.c index fb98c8f3f..8f7edac53 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h261dec.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/h261dec.c
+ * @file
* H.261 decoder.
*/
@@ -641,7 +641,7 @@ static av_cold int h261_decode_end(AVCodecContext *avctx) AVCodec h261_decoder = {
"h261",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_H261,
sizeof(H261Context),
/*.init = */h261_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.c index 7e1009d2a..e8686421c 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.c @@ -23,7 +23,7 @@ */
/**
- * @file libavcodec/h263.c
+ * @file
* h263/mpeg4 codec.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.h index 7502ecfcb..d8b7abe4f 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263.h @@ -93,7 +93,7 @@ void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n); /** - * Prints picture info if FF_DEBUG_PICT_INFO is set. + * Print picture info if FF_DEBUG_PICT_INFO is set. */ void ff_h263_show_pict_info(MpegEncContext *s); @@ -102,8 +102,8 @@ int ff_h263_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); /** - * Returns the value of the 3bit "source format" syntax element. - * that represents some standard picture dimensions or indicates that + * Return the value of the 3bit "source format" syntax element. + * This represents some standard picture dimensions or indicates that * width&height are explicitly stored later. */ int av_const h263_get_picture_format(int width, int height); diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263_parser.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263_parser.c index e1936c1ed..ee91cc8ce 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263_parser.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263_parser.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h263_parser.c
+ * @file
* H.263 parser
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263data.h index 0c0d307f2..e099c5c12 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h263data.h @@ -22,7 +22,7 @@ */
/**
- * @file libavcodec/h263data.h
+ * @file
* H.263 tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h index b5bbd33f1..4f848c33a 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h @@ -638,7 +638,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h); int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length);
/**
- * Decodes a network abstraction layer unit.
+ * Decode a network abstraction layer unit.
* @param consumed is the number of bytes used as input
* @param length is the length of the array
* @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing?
@@ -647,29 +647,29 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length); const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length);
/**
- * identifies the exact end of the bitstream
+ * Identify the exact end of the bitstream
* @return the length of the trailing, or 0 if damaged
*/
int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src);
/**
- * frees any data that may have been allocated in the H264 context like SPS, PPS etc.
+ * Free any data that may have been allocated in the H264 context like SPS, PPS etc.
*/
av_cold void ff_h264_free_context(H264Context *h);
/**
- * reconstructs bitstream slice_type.
+ * Reconstruct bitstream slice_type.
*/
int ff_h264_get_slice_type(const H264Context *h);
/**
- * allocates tables.
+ * Allocate tables.
* needs width/height
*/
int ff_h264_alloc_tables(H264Context *h);
/**
- * fills the default_ref_list.
+ * Fill the default_ref_list.
*/
int ff_h264_fill_default_ref_list(H264Context *h);
@@ -678,7 +678,7 @@ void ff_h264_fill_mbaff_ref_list(H264Context *h); void ff_h264_remove_all_refs(H264Context *h);
/**
- * Executes the reference picture marking (memory management control operations).
+ * Execute the reference picture marking (memory management control operations).
*/
int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count);
@@ -686,12 +686,12 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb); /**
- * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks.
+ * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks.
*/
int ff_h264_check_intra4x4_pred_mode(H264Context *h);
/**
- * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks.
+ * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks.
*/
int ff_h264_check_intra_pred_mode(H264Context *h, int mode);
@@ -704,13 +704,13 @@ av_cold int ff_h264_decode_end(AVCodecContext *avctx); av_cold void ff_h264_decode_init_vlc(void);
/**
- * decodes a macroblock
+ * Decode a macroblock
* @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
*/
int ff_h264_decode_mb_cavlc(H264Context *h);
/**
- * decodes a CABAC coded macroblock
+ * Decode a CABAC coded macroblock
* @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
*/
int ff_h264_decode_mb_cabac(H264Context *h);
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cabac.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cabac.c index ffcefe6fc..1a02d19f9 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cabac.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cabac.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264_cabac.c
+ * @file
* H.264 / AVC / MPEG4 part10 cabac decoding.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cavlc.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cavlc.c index ccca67f74..4f8d12078 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cavlc.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_cavlc.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264_cavlc.c
+ * @file
* H.264 / AVC / MPEG4 part10 cavlc bitstream decoding.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_direct.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_direct.c index a0a313565..9c7dd68bd 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_direct.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_direct.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264_direct.c
+ * @file
* H.264 / AVC / MPEG4 part10 direct mb/block decoding.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_loopfilter.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_loopfilter.c index 3129e4889..5a9459fc9 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_loopfilter.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_loopfilter.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264_loopfilter.c
+ * @file
* H.264 / AVC / MPEG4 part10 loop filter.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_mvpred.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_mvpred.h index 0a89b880b..8b661a23e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_mvpred.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_mvpred.h @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264_mvpred.h
+ * @file
* H.264 / AVC / MPEG4 part10 motion vector predicion.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.c index a2a11662f..cef0d926c 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.c @@ -202,29 +202,29 @@ static inline int parse_nal_units(AVCodecParserContext *s, switch (h->sei_pic_struct) {
case SEI_PIC_STRUCT_TOP_FIELD:
case SEI_PIC_STRUCT_BOTTOM_FIELD:
- s->repeat_pict = -1;
+ s->repeat_pict = 0;
break;
case SEI_PIC_STRUCT_FRAME:
case SEI_PIC_STRUCT_TOP_BOTTOM:
case SEI_PIC_STRUCT_BOTTOM_TOP:
- s->repeat_pict = 0;
+ s->repeat_pict = 1;
break;
case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
- s->repeat_pict = 1;
+ s->repeat_pict = 2;
break;
case SEI_PIC_STRUCT_FRAME_DOUBLING:
- s->repeat_pict = 2;
+ s->repeat_pict = 3;
break;
case SEI_PIC_STRUCT_FRAME_TRIPLING:
- s->repeat_pict = 4;
+ s->repeat_pict = 5;
break;
default:
- s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 0 : -1;
+ s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0;
break;
}
} else {
- s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 0 : -1;
+ s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0;
}
return 0; /* no need to evaluate the rest */
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.h index 27ae0c1ab..0e4c13a9f 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_parser.h @@ -20,7 +20,7 @@ */
/**
- * @file h264_parser.h
+ * @file
* H.264 / AVC / MPEG4 part10 parser.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c index 98e7e2a81..3570e62f7 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264_refs.c
+ * @file
* H.264 / AVC / MPEG4 part10 reference picture handling.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_sei.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_sei.c index 2d1f21e9e..2d2d114e7 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_sei.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_sei.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264-sei.c
+ * @file
* H.264 / AVC / MPEG4 part10 sei decoding.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264data.h index bbe553e87..fa261a92e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264data.h @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264data.h
+ * @file
* @brief
* H264 / AVC / MPEG4 part10 codec data table
* @author Michael Niedermayer <michaelni@gmx.at>
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.c index 93cdc21a7..7d1e22593 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/h264dsp.c
+ * @file
* H.264 / AVC / MPEG4 part10 DSP functions.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
@@ -314,7 +314,9 @@ void ff_h264dsp_init(H264DSPContext *c) c->h264_h_loop_filter_chroma_intra= h264_h_loop_filter_chroma_intra_c;
c->h264_loop_filter_strength= NULL;
- #if HAVE_MMX
+/* MPC custom code start */
+#if HAVE_MMX
ff_h264dsp_init_x86(c);
- #endif
+#endif
+/* MPC custom code end */
}
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.h index c5121b41c..1f063cf3e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264dsp.h @@ -19,7 +19,7 @@ */
/**
- * @file libavcodec/h264dsp.h
+ * @file
* H.264 DSP functions.
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.c index f07d9e373..8fafba919 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264pred.c @@ -109,7 +109,7 @@ static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, int st 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);
@@ -1184,7 +1184,7 @@ static void pred8x8_horizontal_add_c(uint8_t *pix, const int *block_offset, cons /**
- * Sets the intra prediction function pointers.
+ * Set the intra prediction function pointers.
*/
void ff_h264_pred_init(H264PredContext *h, int codec_id){
// MpegEncContext * const s = &h->s;
@@ -1298,7 +1298,9 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id){ h->pred16x16_add[VERT_PRED8x8]= pred16x16_vertical_add_c;
h->pred16x16_add[ HOR_PRED8x8]= pred16x16_horizontal_add_c;
+/* MPC custom code start */
#if HAVE_MMX
- ff_h264_pred_init_x86(h, codec_id);
+ ff_h264_pred_init_x86(h, codec_id);
#endif
+/* MPC custom code end */
}
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c index 6b8ed4f75..f77ee6f65 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c @@ -1,5 +1,5 @@ /**
- * @file libavcodec/huffman.c
+ * @file
* huffman tree builder and VLC generator
* Copyright (c) 2006 Konstantin Shishkov
*
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.h index d56c7274b..3c08e6fb1 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.h @@ -1,5 +1,5 @@ /** - * @file libavcodec/huffman.h + * @file * huffman tree builder and VLC generator * Copyright (C) 2007 Aurelien Jacobs <aurel@gnuage.org> * diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intelh263dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intelh263dec.c index 30dcf7c55..4f95fc1f1 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intelh263dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intelh263dec.c @@ -117,7 +117,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) AVCodec h263i_decoder = { "h263i", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_H263I, sizeof(MpegEncContext), ff_h263_decode_init, @@ -131,3 +131,4 @@ AVCodec h263i_decoder = { /*.pix_fmts = */NULL, /*.long_name = */NULL_IF_CONFIG_SMALL("Intel H.263"), }; + diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/internal.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/internal.h index 479c7f9c8..e7b59b956 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/internal.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/internal.h @@ -28,7 +28,7 @@ #include "avcodec.h"
/**
- * Determines whether pix_fmt is a hardware accelerated format.
+ * Determine whether pix_fmt is a hardware accelerated format.
*/
int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt);
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8.c index 70e3bff75..75166e8ff 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8.c @@ -17,7 +17,7 @@ */ /** - * @file libavcodec/intrax8.c + * @file * @brief IntraX8 (J-Frame) subdecoder, used by WMV2 and VC-1 */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8dsp.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8dsp.c index 05d6f66fb..692e1b102 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8dsp.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/intrax8dsp.c @@ -17,7 +17,7 @@ */ /** -* @file libavcodec/intrax8dsp.c +* @file *@brief IntraX8 frame subdecoder image manipulation routines */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ituh263dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ituh263dec.c index 5337aab6b..f408126b4 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ituh263dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ituh263dec.c @@ -23,7 +23,7 @@ */
/**
- * @file libavcodec/ituh263dec.c
+ * @file
* h263 decoder.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.c index 732f45d80..aa56a068b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.c @@ -21,7 +21,7 @@ */
/**
- * @file jpegls.c
+ * @file
* JPEG-LS common code.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h index 61d64cd1c..455849a0e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h @@ -21,7 +21,7 @@ */
/**
- * @file jpegls.h
+ * @file
* JPEG-LS common code.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.c index d363f3702..602b82308 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/jpeglsdec.c
+ * @file
* JPEG-LS decoder.
*/
@@ -365,7 +365,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor AVCodec jpegls_decoder = {
"jpegls",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_JPEGLS,
sizeof(MJpegDecodeContext),
/*.init=*/ff_mjpeg_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.h index 13eec758d..941288028 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpeglsdec.h @@ -21,7 +21,7 @@ */
/**
- * @file jpeglsdec.h
+ * @file
* JPEG-LS decoder.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jrevdct.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jrevdct.c index 46a692bd8..ad11345ab 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jrevdct.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jrevdct.c @@ -60,7 +60,7 @@ */
/**
- * @file libavcodec/jrevdct.c
+ * @file
* Independent JPEG Group's LLM idct.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/lpc.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/lpc.h index c8053d0d7..a5b6f2ebb 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/lpc.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/lpc.h @@ -23,6 +23,30 @@ #define AVCODEC_LPC_H #include <stdint.h> +#include "dsputil.h" + +#define ORDER_METHOD_EST 0 +#define ORDER_METHOD_2LEVEL 1 +#define ORDER_METHOD_4LEVEL 2 +#define ORDER_METHOD_8LEVEL 3 +#define ORDER_METHOD_SEARCH 4 +#define ORDER_METHOD_LOG 5 + +#define MIN_LPC_ORDER 1 +#define MAX_LPC_ORDER 32 + + +/** + * Calculate LPC coefficients for multiple orders + */ +int ff_lpc_calc_coefs(DSPContext *s, + const int32_t *samples, int blocksize, int min_order, + int max_order, int precision, + int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc, + int omethod, int max_shift, int zero_shift); + +void ff_lpc_compute_autocorr(const int32_t *data, int len, int lag, + double *autoc); #ifdef LPC_USE_DOUBLE #define LPC_TYPE double @@ -32,7 +56,7 @@ /** * Levinson-Durbin recursion. - * Produces LPC coefficients from autocorrelation data. + * Produce LPC coefficients from autocorrelation data. */ static inline int compute_lpc_coefs(const LPC_TYPE *autoc, int max_order, LPC_TYPE *lpc, int lpc_stride, int fail, diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h index 28d96ccc0..2c43787e0 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mathops.h @@ -136,17 +136,41 @@ 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 /* ffdshow custom code */ #ifndef INT_BIT -# define INT_BIT (8 * sizeof(int)) +# define INT_BIT (8 * sizeof(int)) +#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 */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mdct.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mdct.c index d91611c65..c6f9403e6 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mdct.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mdct.c @@ -30,10 +30,6 @@ * MDCT/IMDCT transforms.
*/
-#if _MSC_VER<1400
-#define sinf sin
-#endif
-
// Generate a Kaiser-Bessel Derived Window.
#define BESSEL_I0_ITER 50 // default: 50 iterations of Bessel I0 approximation
av_cold void ff_kbd_window_init(float *window, float alpha, int n)
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.c index 69b8a507d..a1b98dd15 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.c @@ -26,7 +26,7 @@ */
/**
- * @file mjpeg.c
+ * @file
* MJPEG encoder and decoder.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.h index b59fb785b..05579ee7d 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpeg.h @@ -26,7 +26,7 @@ */
/**
- * @file libavcodec/mjpeg.h
+ * @file
* MJPEG encoder and decoder.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c index 49c04107e..f4917095b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c @@ -26,7 +26,7 @@ */
/**
- * @file libavcodec/mjpegdec.c
+ * @file
* MJPEG decoder.
*/
@@ -975,6 +975,9 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s) if(s->lossless){
if(CONFIG_JPEGLS_DECODER && s->ls){
+// for(){
+// reset_ls_coding_parameters(s, 0);
+
if(ff_jpegls_decode_picture(s, predictor, point_transform, ilv) < 0)
return -1;
}else{
@@ -1036,15 +1039,32 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) informations, but it's always present in AVID creates files */
if (id == AV_RL32("AVI1"))
{
+ /* structure:
+ 4bytes AVI1
+ 1bytes polarity
+ 1bytes always zero
+ 4bytes field_size
+ 4bytes field_size_less_padding
+ */
s->buggy_avid = 1;
-
+// if (s->first_picture)
+// printf("mjpeg: workarounding buggy AVID\n");
i = get_bits(&s->gb, 8);
if (i==2) s->bottom_field= 1;
else if(i==1) s->bottom_field= 0;
-
+#if 0
+ skip_bits(&s->gb, 8);
+ skip_bits(&s->gb, 32);
+ skip_bits(&s->gb, 32);
+ len -= 10;
+#endif
+// if (s->interlace_polarity)
+// printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);
goto out;
}
+// len -= 2;
+
if (id == AV_RL32("JFIF"))
{
int t_w, t_h, v1, v2;
@@ -1118,6 +1138,16 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) len -= 4;
if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */
{
+#if 0
+ skip_bits(&s->gb, 32); /* field size */
+ skip_bits(&s->gb, 32); /* pad field size */
+ skip_bits(&s->gb, 32); /* next off */
+ skip_bits(&s->gb, 32); /* quant off */
+ skip_bits(&s->gb, 32); /* huff off */
+ skip_bits(&s->gb, 32); /* image off */
+ skip_bits(&s->gb, 32); /* scan off */
+ skip_bits(&s->gb, 32); /* data off */
+#endif
if (s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n");
}
@@ -1172,6 +1202,29 @@ static int mjpeg_decode_com(MJpegDecodeContext *s) return 0;
}
+#if 0
+static int valid_marker_list[] =
+{
+ /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f */
+/* 0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 1 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 2 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 3 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 4 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 5 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 6 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 7 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 8 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 9 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* a */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* b */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+/* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+/* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+/* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+}
+#endif
+
/* return the 8 bit start code value and update the search
state. Return -1 if no start code found */
static int find_marker(const uint8_t **pbuf_ptr, const uint8_t *buf_end)
@@ -1478,7 +1531,7 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) AVCodec mjpeg_decoder = {
"mjpeg",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MJPEG,
sizeof(MJpegDecodeContext),
/*.init=*/ff_mjpeg_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h index fef4e5ccb..5a9da5902 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.h @@ -22,7 +22,7 @@ */ /** - * @file libavcodec/mjpegdec.h + * @file * MJPEG decoder. */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegenc.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegenc.h index 15cefa9db..49627a3d5 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegenc.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegenc.h @@ -26,7 +26,7 @@ */ /** - * @file mjpegenc.h + * @file * MJPEG encoder. */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.c index 1e7ea2616..aae28808e 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.c @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/mlp_parser.c + * @file * MLP parser */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.h index 5e8861b94..d7ce2b831 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlp_parser.h @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/mlp_parser.h + * @file * MLP parser prototypes */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c index fa5b62086..e392d971b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdec.c @@ -939,8 +939,8 @@ static int output_data(MLPDecodeContext *m, unsigned int substr, /** Read an access unit from the stream. - * Returns < 0 on error, 0 if not enough data is present in the input stream - * otherwise returns the number of bytes consumed. */ + * @return negative on error, 0 if not enough data is present in the input stream, + * otherwise the number of bytes consumed. */ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, const uint8_t *buf, int buf_size) @@ -1139,7 +1139,7 @@ error: AVCodec mlp_decoder = { "mlp", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MLP, sizeof(MLPDecodeContext), /*.init = */mlp_decode_init, @@ -1157,7 +1157,7 @@ AVCodec mlp_decoder = { #if CONFIG_TRUEHD_DECODER AVCodec truehd_decoder = { "truehd", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUEHD, sizeof(MLPDecodeContext), /*.init = */mlp_decode_init, diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdsp.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdsp.c index 386f463d1..290020ad3 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdsp.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mlpdsp.c @@ -58,6 +58,8 @@ static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff, void ff_mlp_init(DSPContext* c, AVCodecContext *avctx) { c->mlp_filter_channel = ff_mlp_filter_channel; + +//ffdshow custom code #if HAVE_MMX if (ARCH_X86) ff_mlp_init_x86(c, avctx); diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c index f39a34ebf..ecbb62c89 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/mpeg12.c
+ * @file
* MPEG-1/2 decoder
*/
@@ -1440,7 +1440,7 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) w= get_bits(&s->gb, 14);
skip_bits(&s->gb, 1); //marker
h= get_bits(&s->gb, 14);
- skip_bits(&s->gb, 1); //marker
+ // remaining 3 bits are zero padding
s1->pan_scan.width= 16*w;
s1->pan_scan.height=16*h;
@@ -1926,7 +1926,7 @@ static int slice_decode_thread(AVCodecContext *c, void *arg){ }
/**
- * Handles slice ends.
+ * Handle slice ends.
* @return 1 if it seems to be the last slice
*/
static int slice_end(AVCodecContext *avctx, AVFrame *pict)
@@ -2159,7 +2159,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, time_code_pictures, s->closed_gop, broken_link);
}
/**
- * Finds the end of the current frame in the bitstream.
+ * Find the end of the current frame in the bitstream.
* @return the position of the first byte of the next frame, or -1
*/
int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s, int64_t *rtStart, AVCodecContext *avctx) /* rtStart,avctx: ffdshow custom code */
@@ -2194,7 +2194,7 @@ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, if(pc->frame_start_found==0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){
i++;
pc->frame_start_found=4;
-
+
pc->rtStart=*rtStart; /* ffdshow custom code */
*rtStart=_I64_MIN; /* ffdshow custom code */
}
@@ -2509,7 +2509,7 @@ static int mpeg_decode_end(AVCodecContext *avctx) AVCodec mpeg1video_decoder = {
"mpeg1video",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MPEG1VIDEO,
sizeof(Mpeg1Context),
/*.init=*/mpeg_decode_init,
@@ -2526,7 +2526,7 @@ AVCodec mpeg1video_decoder = { AVCodec mpeg2video_decoder = {
"mpeg2video",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MPEG2VIDEO,
sizeof(Mpeg1Context),
/*.init=*/mpeg_decode_init,
@@ -2546,7 +2546,7 @@ AVCodec mpeg2video_decoder = { //legacy decoder
AVCodec mpegvideo_decoder = {
"mpegvideo",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MPEG2VIDEO,
sizeof(Mpeg1Context),
/*.init=*/mpeg_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.c index 229ec3ba2..3bdf0b6e5 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.c @@ -21,7 +21,7 @@ */
/**
- * @file mpeg12data.c
+ * @file
* MPEG1/2 tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.h index a6dbd1c49..6d48d8d96 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12data.h @@ -21,7 +21,7 @@ */
/**
- * @file mpeg12data.h
+ * @file
* MPEG1/2 tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12decdata.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12decdata.h index 9890afd16..fac906bdc 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12decdata.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12decdata.h @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/mpeg12decdata.h
+ * @file
* MPEG1/2 decoder tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4data.h index e127d76c1..7e48a1449 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4data.h @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/mpeg4data.h
+ * @file
* mpeg4 tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4videodec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4videodec.c index 6d2c4d59d..bbc518f0f 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4videodec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg4videodec.c @@ -2242,7 +2242,7 @@ static av_cold int decode_init(AVCodecContext *avctx) AVCodec mpeg4_decoder = {
"mpeg4",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MPEG4,
sizeof(MpegEncContext),
decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.c index 06bf96842..79f5eb295 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.c @@ -187,7 +187,7 @@ void ff_copy_picture(Picture *dst, Picture *src){ }
/**
- * Releases a frame buffer
+ * Release a frame buffer
*/
static void free_frame_buffer(MpegEncContext *s, Picture *pic)
{
@@ -195,7 +195,7 @@ static void free_frame_buffer(MpegEncContext *s, Picture *pic) }
/**
- * Allocates a frame buffer
+ * Allocate a frame buffer
*/
static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
{
@@ -330,6 +330,9 @@ static void free_picture(MpegEncContext *s, Picture *pic){ }
static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){
+ int y_size = s->b8_stride * (2 * s->mb_height + 1);
+ int c_size = s->mb_stride * (s->mb_height + 1);
+ int yc_size = y_size + 2 * c_size;
int i;
// edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264)
@@ -355,6 +358,14 @@ static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ for(i=0;i<12;i++){
s->pblocks[i] = &s->block[i];
}
+
+ if (s->ac_val_base) {
+ FF_ALLOCZ_OR_GOTO(s->avctx, s->ac_val_base, yc_size * sizeof(int16_t) * 16, fail);
+ s->ac_val[0] = s->ac_val_base + s->b8_stride + 1;
+ s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1;
+ s->ac_val[2] = s->ac_val[1] + c_size;
+ }
+
return 0;
fail:
return -1; //free() through MPV_common_end()
@@ -374,6 +385,7 @@ static void free_duplicate_context(MpegEncContext *s){ av_freep(&s->me.map);
av_freep(&s->me.score_map);
av_freep(&s->blocks);
+ av_freep(&s->ac_val_base);
s->block= NULL;
}
@@ -397,6 +409,10 @@ static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){ COPY(dct_error_sum);
COPY(dct_count[0]);
COPY(dct_count[1]);
+ COPY(ac_val_base);
+ COPY(ac_val[0]);
+ COPY(ac_val[1]);
+ COPY(ac_val[2]);
#undef COPY
}
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.h index 0d347f85b..6e66d6bf6 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo.h @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/mpegvideo.h
+ * @file
* mpegvideo header.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo_common.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo_common.h index 5d69f23b2..5a30a3963 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo_common.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpegvideo_common.h @@ -670,19 +670,19 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s, }
if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){
- *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1];
- *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1];
+ AV_COPY32(mv_cache[1][0], mv_cache[1][1]);
+ AV_COPY32(mv_cache[2][0], mv_cache[2][1]);
}else{
- *(int32_t*)mv_cache[1][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1];
- *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride];
+ AV_COPY32(mv_cache[1][0], s->current_picture.motion_val[0][mot_xy-1]);
+ AV_COPY32(mv_cache[2][0], s->current_picture.motion_val[0][mot_xy-1+mot_stride]);
}
if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){
- *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2];
- *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2];
+ AV_COPY32(mv_cache[1][3], mv_cache[1][2]);
+ AV_COPY32(mv_cache[2][3], mv_cache[2][2]);
}else{
- *(int32_t*)mv_cache[1][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2];
- *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride];
+ AV_COPY32(mv_cache[1][3], s->current_picture.motion_val[0][mot_xy+2]);
+ AV_COPY32(mv_cache[2][3], s->current_picture.motion_val[0][mot_xy+2+mot_stride]);
}
mx = 0;
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.c index de48a6d23..a3c9e2aeb 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.c @@ -23,7 +23,7 @@ */
/**
- * @file libavcodec/msmpeg4.c
+ * @file
* MSMPEG4 backend for ffmpeg encoder and decoder.
*/
@@ -1921,7 +1921,7 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s, AVCodec msmpeg4v1_decoder = {
"msmpeg4v1",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MSMPEG4V1,
sizeof(MpegEncContext),
ff_msmpeg4_decode_init,
@@ -1938,7 +1938,7 @@ AVCodec msmpeg4v1_decoder = { AVCodec msmpeg4v2_decoder = {
"msmpeg4v2",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MSMPEG4V2,
sizeof(MpegEncContext),
ff_msmpeg4_decode_init,
@@ -1955,7 +1955,7 @@ AVCodec msmpeg4v2_decoder = { AVCodec msmpeg4v3_decoder = {
"msmpeg4",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_MSMPEG4V3,
sizeof(MpegEncContext),
ff_msmpeg4_decode_init,
@@ -1972,7 +1972,7 @@ AVCodec msmpeg4v3_decoder = { AVCodec wmv1_decoder = {
"wmv1",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_WMV1,
sizeof(MpegEncContext),
ff_msmpeg4_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.h index 259be2f37..28372a0bc 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4.h @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/msmpeg4.h + * @file */ #ifndef AVCODEC_MSMPEG4_H diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.c index cfef62b12..5602c9d76 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.c @@ -23,7 +23,7 @@ */
/**
- * @file libavcodec/msmpeg4data.c
+ * @file
* MSMPEG4 data tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.h index 9baa9370d..f2d61b5a7 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/msmpeg4data.h @@ -23,7 +23,7 @@ */
/**
- * @file libavcodec/msmpeg4data.h
+ * @file
* MSMPEG4 data tables.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.c index 08559e68c..0716c25a2 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.c @@ -26,7 +26,7 @@ */ /** - * @file libavcodec/nellymoser.c + * @file * The 3 alphanumeric copyright notices are md5summed they are from the original * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.h index 6a7526dbf..88d9aa624 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/nellymoser.h @@ -26,7 +26,7 @@ */ /** - * @file nellymoser.h + * @file * The 3 alphanumeric copyright notices are md5summed they are from the original * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/parser.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/parser.h index 200b13be5..01f3fbfc6 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/parser.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/parser.h @@ -62,7 +62,7 @@ void ff_parse_close(AVCodecParserContext *s); void ff_parse1_close(AVCodecParserContext *s); /** - * Fetches timestamps for a specific byte within the current access unit. + * Fetch timestamps for a specific byte within the current access unit. * @param off byte position within the access unit * @param remove Found timestamps will be removed if set to 1, kept if set to 0. */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/put_bits.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/put_bits.h index c02027857..45c16f780 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/put_bits.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/put_bits.h @@ -19,7 +19,7 @@ */
/**
- * @file libavcodec/put_bits.h
+ * @file
* bitstream writer API
*/
@@ -52,7 +52,7 @@ typedef struct PutBitContext { } PutBitContext;
/**
- * Initializes the PutBitContext s.
+ * Initialize the PutBitContext s.
*
* @param buffer the buffer where to put bits
* @param buffer_size the size in bytes of buffer
@@ -79,7 +79,7 @@ static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_s }
/**
- * Returns the total number of bits written to the bitstream.
+ * @return the total number of bits written to the bitstream.
*/
static inline int put_bits_count(PutBitContext *s)
{
@@ -91,7 +91,7 @@ static inline int put_bits_count(PutBitContext *s) }
/**
- * Pads the end of the output stream with zeros.
+ * Pad the end of the output stream with zeros.
*/
static inline void flush_put_bits(PutBitContext *s)
{
@@ -123,19 +123,19 @@ static inline void flush_put_bits(PutBitContext *s) #define ff_copy_bits ff_copy_bits_unsupported_here
#else
/**
- * Pads the bitstream with zeros up to the next byte boundary.
+ * Pad the bitstream with zeros up to the next byte boundary.
*/
void align_put_bits(PutBitContext *s);
/**
- * Puts the string string in the bitstream.
+ * Put the string string in the bitstream.
*
* @param terminate_string 0-terminates the written string if value is 1
*/
void ff_put_string(PutBitContext *pb, const char *string, int terminate_string);
/**
- * Copies the content of src to the bitstream.
+ * Copy the content of src to the bitstream.
*
* @param length the number of bits of src to copy
*/
@@ -143,7 +143,7 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length); #endif
/**
- * Writes up to 31 bits into a bitstream.
+ * Write up to 31 bits into a bitstream.
* Use put_bits32 to write 32 bits.
*/
static inline void put_bits(PutBitContext *s, int n, unsigned int value)
@@ -270,7 +270,7 @@ static inline void put_sbits(PutBitContext *pb, int n, int32_t value) }
/**
- * Writes exactly 32 bits into a bitstream.
+ * Write exactly 32 bits into a bitstream.
*/
static void av_unused put_bits32(PutBitContext *s, uint32_t value)
{
@@ -286,7 +286,7 @@ static void av_unused put_bits32(PutBitContext *s, uint32_t value) }
/**
- * Returns the pointer to the byte where the bitstream writer will put
+ * Return the pointer to the byte where the bitstream writer will put
* the next bit.
*/
static inline uint8_t* put_bits_ptr(PutBitContext *s)
@@ -299,7 +299,7 @@ static inline uint8_t* put_bits_ptr(PutBitContext *s) }
/**
- * Skips the given number of bytes.
+ * Skip the given number of bytes.
* PutBitContext must be flushed & aligned to a byte boundary before calling this.
*/
static inline void skip_put_bytes(PutBitContext *s, int n)
@@ -315,7 +315,7 @@ static inline void skip_put_bytes(PutBitContext *s, int n) }
/**
- * Skips the given number of bits.
+ * Skip the given number of bits.
* Must only be used if the actual values in the bitstream do not matter.
* If n is 0 the behavior is undefined.
*/
@@ -331,7 +331,7 @@ static inline void skip_put_bits(PutBitContext *s, int n) }
/**
- * Changes the end of the buffer.
+ * Change the end of the buffer.
*
* @param size the new size in bytes of the buffer where to put bits
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rangecoder.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rangecoder.h index f5ce3684f..24b42ce6d 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rangecoder.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rangecoder.h @@ -20,7 +20,7 @@ */
/**
- * @file rangecoder.h
+ * @file
* Range coder.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ratecontrol.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ratecontrol.h index d8151f32a..84acaaacf 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ratecontrol.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/ratecontrol.h @@ -39,7 +39,7 @@ typedef struct Predictor{ } Predictor;
typedef struct RateControlEntry{
- int rcOverrideIndex1,rcOverrideQscale; //Milan Cutka - don't obey qmin/qmax in RcOverride sections
+ int rcOverrideIndex1,rcOverrideQscale; //ffdshow custom code: Milan Cutka - don't obey qmin/qmax in RcOverride sections
int pict_type;
float qscale;
int mv_bits;
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rectangle.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rectangle.h index ca9b36f85..871e4c354 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rectangle.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rectangle.h @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/rectangle.h
+ * @file
* useful rectangle filling function
* @author Michael Niedermayer <michaelni@gmx.at>
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rl.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rl.h index 773d96e49..9cd37326b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rl.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rl.h @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/rl.h
+ * @file
* rl header.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv10.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv10.c index 4e7995f5b..04ad5ebe3 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv10.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv10.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/rv10.c
+ * @file
* RV10/RV20 decoder
*/
@@ -706,7 +706,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, AVCodec rv10_decoder = {
"rv10",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_RV10,
sizeof(MpegEncContext),
rv10_decode_init,
@@ -723,7 +723,7 @@ AVCodec rv10_decoder = { AVCodec rv20_decoder = {
"rv20",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_RV20,
sizeof(MpegEncContext),
rv10_decode_init,
@@ -737,4 +737,3 @@ AVCodec rv20_decoder = { /*.pix_fmts = */NULL,
/*.long_name = */NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
};
-
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c index f97c326f8..5c83d34ab 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/rv30.c + * @file * RV30 decoder */ @@ -268,7 +268,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) AVCodec rv30_decoder = { "rv30", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV30, sizeof(RV34DecContext), /*.init = */rv30_decode_init, diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30data.h index 1662fd7af..9cc48a6a3 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30data.h @@ -20,7 +20,7 @@ */ /** - * @file rv30data.h + * @file * miscellaneous RV30 tables */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30dsp.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30dsp.c index bf2dc18b8..4700e7868 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30dsp.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30dsp.c @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/rv30dsp.c + * @file * RV30 decoder motion compensation functions */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.c index 55953af2c..963479bb9 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.c @@ -1142,7 +1142,7 @@ static int rv34_set_deblock_coef(RV34DecContext *r) MpegEncContext *s = &r->s; int hmvmask = 0, vmvmask = 0, i, j; int midx = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride; - int16_t (*motion_val)[2] = s->current_picture_ptr->motion_val[0][midx]; + int16_t (*motion_val)[2] = &s->current_picture_ptr->motion_val[0][midx]; for(j = 0; j < 16; j += 8){ for(i = 0; i < 2; i++){ if(is_mv_diff_gt_3(motion_val + i, 1)) diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.h index 5cefe935d..3d25af2b1 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34.h @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/rv34.h + * @file * RV30 and RV40 decoder common data declarations */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34data.h index 95e5572df..2155084d0 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv34data.h @@ -20,7 +20,7 @@ */ /** - * @file rv34data.h + * @file * miscellaneous RV30/40 tables */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40.c index 3738d2d45..d425c6ff1 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40.c @@ -20,7 +20,7 @@ */ /** - * @file libavcodec/rv40.c + * @file * RV40 decoder */ @@ -307,7 +307,7 @@ static inline void rv40_weak_loop_filter(uint8_t *src, const int step, } } -static inline void rv40_adaptive_loop_filter(uint8_t *src, const int step, +static av_always_inline void rv40_adaptive_loop_filter(uint8_t *src, const int step, const int stride, const int dmode, const int lim_q1, const int lim_p1, const int alpha, @@ -668,7 +668,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) AVCodec rv40_decoder = { "rv40", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_RV40, sizeof(RV34DecContext), /*.init = */rv40_decode_init, diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40data.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40data.h index b81b39318..556656920 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40data.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40data.h @@ -20,7 +20,7 @@ */ /** - * @file rv40data.h + * @file * miscellaneous RV40 tables */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c index b48c4e85b..27bc79eec 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c @@ -20,7 +20,7 @@ */ /** - * @file rv40dsp.c + * @file * RV40 decoder motion compensation functions */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40vlc2.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40vlc2.h index 3b17d8faa..15119a145 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40vlc2.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40vlc2.h @@ -20,7 +20,7 @@ */ /** - * @file rv40vlc2.h + * @file * RV40 VLC tables used for macroblock information decoding */ diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.c index 659863d6a..433177b14 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.c @@ -21,7 +21,7 @@ */
/**
- * @file libavcodec/simple_idct.c
+ * @file
* simpleidct in C.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.h index 12b96f6ed..7bda2a6a4 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/simple_idct.h @@ -21,13 +21,14 @@ */
/**
- * @file simple_idct.h
+ * @file
* simple idct header.
*/
#ifndef AVCODEC_SIMPLE_IDCT_H
#define AVCODEC_SIMPLE_IDCT_H
+#include <stdint.h>
#include "dsputil.h"
void ff_simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block);
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/sp5xdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/sp5xdec.c index 4d7c9f765..09ae52f04 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/sp5xdec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/sp5xdec.c @@ -20,7 +20,7 @@ */
/**
- * @file libavcodec/sp5xdec.c
+ * @file
* Sunplus JPEG decoder (SP5X).
*/
@@ -189,7 +189,7 @@ static int sp5x_decode_frame(AVCodecContext *avctx, AVCodec sp5x_decoder = {
"sp5x",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_SP5X,
sizeof(MJpegDecodeContext),
/*.init = */ff_mjpeg_decode_init,
@@ -206,7 +206,7 @@ AVCodec sp5x_decoder = { AVCodec amv_decoder = {
"amv",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_AMV,
sizeof(MJpegDecodeContext),
/*.init = */ff_mjpeg_decode_init,
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.c index a1583fef8..1b1fa2f6d 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.c @@ -6,6 +6,8 @@ * Copyright (C) 2002 the xine project
* Copyright (C) 2002 the ffmpeg project
*
+ * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net>
+ *
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
@@ -24,7 +26,7 @@ */
/**
- * @file libavcodec/svq1.c
+ * @file
* Sorenson Vector Quantizer #1 (SVQ1) video codec.
* For more information of the SVQ1 algorithm, visit:
* http://www.pcisys.net/~melanson/codecs/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.h index e89d1c384..bc94306d4 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1.h @@ -6,6 +6,8 @@ * Copyright (C) 2002 the xine project
* Copyright (C) 2002 the ffmpeg project
*
+ * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net>
+ *
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
@@ -24,7 +26,7 @@ */
/**
- * @file libavcodec/svq1.h
+ * @file
* Sorenson Vector Quantizer #1 (SVQ1) video codec.
* For more information of the SVQ1 algorithm, visit:
* http://www.pcisys.net/~melanson/codecs/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1_cb.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1_cb.h index 504066961..da83d06f7 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1_cb.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1_cb.h @@ -24,7 +24,7 @@ */
/**
- * @file libavcodec/svq1_cb.h
+ * @file
* svq1 code books.
*/
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1dec.c index dacde1c10..7bc220bb3 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq1dec.c @@ -6,6 +6,8 @@ * Copyright (C) 2002 the xine project
* Copyright (C) 2002 the ffmpeg project
*
+ * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net>
+ *
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
@@ -842,10 +844,6 @@ AVCodec svq1_decoder = { /*.next=*/NULL,
/*.flush=*/ff_mpeg_flush,
/*.supported_framerates = */NULL,
-#if __STDC_VERSION__ >= 199901L
- .pix_fmts=(const enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE},
-#else
/*.pix_fmts = */NULL,
-#endif
/*.long_name= */NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
};
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq3.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq3.c index 81c748af2..752400fa5 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq3.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/svq3.c @@ -50,7 +50,6 @@ #include "h264_mvpred.h"
#include "golomb.h"
#include "rectangle.h"
-//#include "vdpau_internal.h"
#if CONFIG_ZLIB
#include <zlib.h>
|