From 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 27 Apr 2016 13:45:23 -0400 Subject: cosmetics: Fix spelling mistakes Signed-off-by: Diego Biurrun --- libavcodec/aacdec.c | 6 +-- libavcodec/aacsbr.c | 2 +- libavcodec/aarch64/mpegaudiodsp_neon.S | 2 +- libavcodec/aasc.c | 2 +- libavcodec/adpcm.c | 2 +- libavcodec/adpcm.h | 2 +- libavcodec/adpcm_data.c | 2 +- libavcodec/adpcm_data.h | 2 +- libavcodec/adpcmenc.c | 2 +- libavcodec/alac.c | 28 +++++------ libavcodec/alsdec.c | 2 +- libavcodec/amrnbdec.c | 4 +- libavcodec/amrwbdata.h | 2 +- libavcodec/ansi.c | 2 +- libavcodec/apedec.c | 4 +- libavcodec/arm/mlpdsp_armv6.S | 2 +- libavcodec/arm/mpegvideo_armv5te.c | 2 +- libavcodec/arm/simple_idct_arm.S | 6 +-- libavcodec/arm/vp8dsp_neon.S | 2 +- libavcodec/ass.c | 2 +- libavcodec/ass.h | 2 +- libavcodec/atrac1data.h | 2 +- libavcodec/avcodec.h | 54 ++++++++++----------- libavcodec/bink.c | 2 +- libavcodec/bitstream.c | 4 +- libavcodec/bsf.h | 2 +- libavcodec/cinepak.c | 2 +- libavcodec/cook.c | 6 +-- libavcodec/cookdata.h | 2 +- libavcodec/cyuv.c | 2 +- libavcodec/dcadata.c | 6 +-- libavcodec/dcadec.c | 2 +- libavcodec/dct-test.c | 2 +- libavcodec/dnxhddata.h | 2 +- libavcodec/dnxhdenc.c | 2 +- libavcodec/dpcm.c | 2 +- libavcodec/dxva2_h264.c | 2 +- libavcodec/eamad.c | 4 +- libavcodec/elbg.c | 4 +- libavcodec/error_resilience.c | 2 +- libavcodec/error_resilience.h | 2 +- libavcodec/exr.c | 10 ++-- libavcodec/faxcompr.h | 2 +- libavcodec/flicvideo.c | 6 +-- libavcodec/flvenc.c | 2 +- libavcodec/g723_1dec.c | 4 +- libavcodec/g726.c | 26 +++++----- libavcodec/get_bits.h | 4 +- libavcodec/h261.c | 4 +- libavcodec/h261.h | 4 +- libavcodec/h261_parser.c | 4 +- libavcodec/h261dec.c | 4 +- libavcodec/h261enc.c | 2 +- libavcodec/h263.c | 8 ++-- libavcodec/h263.h | 4 +- libavcodec/h263data.c | 2 +- libavcodec/h263data.h | 2 +- libavcodec/h263dec.c | 8 ++-- libavcodec/h264.c | 2 +- libavcodec/h264.h | 10 ++-- libavcodec/h2645_parse.h | 2 +- libavcodec/h264_cabac.c | 4 +- libavcodec/h264_cavlc.c | 2 +- libavcodec/h264_direct.c | 2 +- libavcodec/h264_loopfilter.c | 2 +- libavcodec/h264_mb.c | 4 +- libavcodec/h264_mvpred.h | 4 +- libavcodec/h264_parse.h | 2 +- libavcodec/h264_parser.c | 2 +- libavcodec/h264_picture.c | 2 +- libavcodec/h264_ps.c | 2 +- libavcodec/h264_refs.c | 4 +- libavcodec/h264_sei.c | 4 +- libavcodec/h264_slice.c | 6 +-- libavcodec/h264addpx_template.c | 2 +- libavcodec/h264data.c | 4 +- libavcodec/h264dsp.c | 2 +- libavcodec/h264dsp.h | 2 +- libavcodec/h264dsp_template.c | 2 +- libavcodec/h264pred.c | 4 +- libavcodec/h264pred.h | 4 +- libavcodec/h264pred_template.c | 2 +- libavcodec/hevc_mvs.c | 2 +- libavcodec/hevc_sei.c | 2 +- libavcodec/idcinvideo.c | 2 +- libavcodec/imc.c | 2 +- libavcodec/indeo3.c | 4 +- libavcodec/indeo3data.h | 4 +- libavcodec/intelh263dec.c | 8 ++-- libavcodec/interplayvideo.c | 2 +- libavcodec/intrax8.c | 10 ++-- libavcodec/ituh263dec.c | 18 +++---- libavcodec/ituh263enc.c | 18 +++---- libavcodec/ivi_dsp.c | 2 +- libavcodec/ivi_dsp.h | 2 +- libavcodec/jpeg2000.c | 4 +- libavcodec/jpeglsenc.c | 2 +- libavcodec/lagarith.c | 10 ++-- libavcodec/libopencore-amr.c | 4 +- libavcodec/libopus.c | 8 ++-- libavcodec/libopus.h | 8 ++-- libavcodec/libopusdec.c | 2 +- libavcodec/libopusenc.c | 8 ++-- libavcodec/libschroedingerenc.c | 2 +- libavcodec/libspeexenc.c | 2 +- libavcodec/libtheoraenc.c | 2 +- libavcodec/libvo-amrwbenc.c | 4 +- libavcodec/libxvid.c | 8 ++-- libavcodec/lsp.c | 2 +- libavcodec/lsp.h | 2 +- libavcodec/mjpegdec.c | 12 ++--- libavcodec/mjpegdec.h | 2 +- libavcodec/mjpegenc.h | 2 +- libavcodec/mlp_parser.h | 6 +-- libavcodec/mmaldec.c | 2 +- libavcodec/motion_est.c | 8 ++-- libavcodec/motion_est_template.c | 8 ++-- libavcodec/motionpixels_tablegen.c | 2 +- libavcodec/motionpixels_tablegen.h | 2 +- libavcodec/mpeg12.h | 2 +- libavcodec/mpeg12data.c | 4 +- libavcodec/mpeg12data.h | 4 +- libavcodec/mpeg12dec.c | 10 ++-- libavcodec/mpeg12enc.c | 12 ++--- libavcodec/mpeg12vlc.h | 4 +- libavcodec/mpeg4data.h | 6 +-- libavcodec/mpeg4video.c | 6 +-- libavcodec/mpeg4video.h | 4 +- libavcodec/mpeg4video_parser.c | 2 +- libavcodec/mpeg4video_parser.h | 2 +- libavcodec/mpeg4videodec.c | 30 ++++++------ libavcodec/mpeg4videoenc.c | 26 +++++----- libavcodec/mpegaudiodec_template.c | 2 +- libavcodec/mpegaudiodecheader.h | 2 +- libavcodec/mpegaudioenc.c | 4 +- libavcodec/mpegpicture.c | 4 +- libavcodec/mpegvideo.c | 20 ++++---- libavcodec/mpegvideo.h | 88 +++++++++++++++++----------------- libavcodec/mpegvideo_enc.c | 37 +++++++------- libavcodec/mpegvideo_motion.c | 2 +- libavcodec/mpegvideo_parser.c | 2 +- libavcodec/mqc.h | 4 +- libavcodec/msmpeg4.c | 10 ++-- libavcodec/msmpeg4dec.c | 4 +- libavcodec/msmpeg4enc.c | 9 ++-- libavcodec/msrle.c | 2 +- libavcodec/msvideo1.c | 2 +- libavcodec/nuv.c | 4 +- libavcodec/nvenc.c | 8 ++-- libavcodec/nvenc.h | 2 +- libavcodec/nvenc_h264.c | 4 +- libavcodec/omx.c | 8 ++-- libavcodec/options_table.h | 2 +- libavcodec/opus.c | 4 +- libavcodec/pcm-dvd.c | 4 +- libavcodec/pngdec.c | 2 +- libavcodec/pthread_internal.h | 2 +- libavcodec/qcelpdec.c | 2 +- libavcodec/qdm2.c | 4 +- libavcodec/qsvdec_mpeg2.c | 2 +- libavcodec/qtrle.c | 2 +- libavcodec/qtrleenc.c | 4 +- libavcodec/ra144.c | 2 +- libavcodec/ra144.h | 2 +- libavcodec/ra144enc.c | 6 +-- libavcodec/ra288.c | 2 +- libavcodec/ra288.h | 2 +- libavcodec/ratecontrol.c | 10 ++-- libavcodec/ratecontrol.h | 2 +- libavcodec/rectangle.h | 2 +- libavcodec/rl2.c | 2 +- libavcodec/roqvideodec.c | 2 +- libavcodec/roqvideoenc.c | 2 +- libavcodec/rpza.c | 4 +- libavcodec/rv10.c | 4 +- libavcodec/rv10enc.c | 2 +- libavcodec/rv30data.h | 2 +- libavcodec/rv34.c | 4 +- libavcodec/rv34.h | 4 +- libavcodec/screenpresso.c | 2 +- libavcodec/simple_idct_template.c | 6 +-- libavcodec/smc.c | 2 +- libavcodec/sp5x.h | 2 +- libavcodec/svq1.c | 2 +- libavcodec/svq1.h | 2 +- libavcodec/svq1_cb.h | 2 +- libavcodec/svq1_vlc.h | 2 +- libavcodec/svq1dec.c | 2 +- libavcodec/svq1enc.c | 2 +- libavcodec/svq3.c | 2 +- libavcodec/tdsc.c | 4 +- libavcodec/texturedsp.c | 2 +- libavcodec/texturedspenc.c | 4 +- libavcodec/twinvq.h | 2 +- libavcodec/twinvqdec.c | 2 +- libavcodec/utvideoenc.c | 6 +-- libavcodec/vaapi_encode.c | 4 +- libavcodec/vaapi_encode_h264.c | 8 ++-- libavcodec/vaapi_encode_h265.c | 8 ++-- libavcodec/vc1.c | 6 +-- libavcodec/vc1.h | 32 ++++++------- libavcodec/vc1_block.c | 14 +++--- libavcodec/vc1_mc.c | 4 +- libavcodec/vc1_pred.c | 2 +- libavcodec/vc1dec.c | 2 +- libavcodec/vda_h264.c | 4 +- libavcodec/vdpau.h | 2 +- libavcodec/vdpau_h264.c | 4 +- libavcodec/vp3.c | 14 +++--- libavcodec/vp3data.h | 2 +- libavcodec/vp3dsp.c | 2 +- libavcodec/vp8.h | 4 +- libavcodec/vp9.h | 2 +- libavcodec/vqavideo.c | 2 +- libavcodec/wma.c | 2 +- libavcodec/wmadec.c | 6 +-- libavcodec/wmaenc.c | 2 +- libavcodec/wmalosslessdec.c | 6 +-- libavcodec/wmaprodec.c | 2 +- libavcodec/wmavoice.c | 4 +- libavcodec/wmv2enc.c | 2 +- libavcodec/x86/cabac.h | 2 +- libavcodec/x86/h264_chromamc.asm | 2 +- libavcodec/x86/h264_i386.h | 2 +- libavcodec/x86/inline_asm.h | 2 +- libavcodec/x86/mpegvideo.c | 4 +- libavcodec/x86/rv40dsp.asm | 10 ++-- libavcodec/x86/vc1dsp_mmx.c | 14 +++--- libavcodec/xan.c | 2 +- libavcodec/zmbv.c | 2 +- 230 files changed, 591 insertions(+), 593 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 966a2eeacc..6a06062c53 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1916,8 +1916,8 @@ static int decode_ics(AACContext *ac, SingleChannelElement *sce, avpriv_request_sample(ac->avctx, "SSR"); return AVERROR_PATCHWELCOME; } - // I see no textual basis in the spec for this occuring after SSR gain - // control, but this is what both reference and real implmentations do + // I see no textual basis in the spec for this occurring after SSR gain + // control, but this is what both reference and real implementations do if (tns->present && er_syntax) if (decode_tns(ac, tns, gb, ics) < 0) return AVERROR_INVALIDDATA; @@ -3047,7 +3047,7 @@ static av_cold int aac_decode_close(AVCodecContext *avctx) struct LATMContext { AACContext aac_ctx; ///< containing AACContext - int initialized; ///< initilized after a valid extradata was seen + int initialized; ///< initialized after a valid extradata was seen // parser data int audio_mux_version_A; ///< LATM syntax version diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index b389e10817..3e3432c57e 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -130,7 +130,7 @@ av_cold void ff_aac_sbr_init(void) /** Places SBR in pure upsampling mode. */ static void sbr_turnoff(SpectralBandReplication *sbr) { sbr->start = 0; - // Init defults used in pure upsampling mode + // Init defaults used in pure upsampling mode sbr->kx[1] = 32; //Typo in spec, kx' inits to 32 sbr->m[1] = 0; // Reset values for first SBR header diff --git a/libavcodec/aarch64/mpegaudiodsp_neon.S b/libavcodec/aarch64/mpegaudiodsp_neon.S index 808576af72..c1edc64135 100644 --- a/libavcodec/aarch64/mpegaudiodsp_neon.S +++ b/libavcodec/aarch64/mpegaudiodsp_neon.S @@ -142,7 +142,7 @@ function ff_mpadsp_apply_window_\type\()_neon, export=1 sub x10, x10, #4<<2 b.gt 1b -// comuting samples[16] +// computing samples[16] add x6, x1, #32<<2 ld1 {v0.2s}, [x6], x9 ld1 {v1.2s}, [x0], x9 diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 9e70314964..e65ea397b8 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -1,6 +1,6 @@ /* * Autodesk RLE Decoder - * Copyright (C) 2005 the ffmpeg project + * Copyright (C) 2005 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index aa3c7b9262..3ab16dd0b4 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2003 The ffmpeg Project + * Copyright (c) 2001-2003 The FFmpeg project * * first version by Francois Revol (revol@free.fr) * fringe ADPCM codecs (e.g., DK3, DK4, Westwood) diff --git a/libavcodec/adpcm.h b/libavcodec/adpcm.h index 16facb6d0f..11be5a99c5 100644 --- a/libavcodec/adpcm.h +++ b/libavcodec/adpcm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2003 The ffmpeg Project + * Copyright (c) 2001-2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/adpcm_data.c b/libavcodec/adpcm_data.c index 3bc5de23b3..e40abc5595 100644 --- a/libavcodec/adpcm_data.c +++ b/libavcodec/adpcm_data.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2003 The ffmpeg Project + * Copyright (c) 2001-2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/adpcm_data.h b/libavcodec/adpcm_data.h index a46cb5bdec..cecd156e10 100644 --- a/libavcodec/adpcm_data.h +++ b/libavcodec/adpcm_data.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2003 The ffmpeg Project + * Copyright (c) 2001-2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 3e17dbd8de..0757624aef 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2003 The ffmpeg Project + * Copyright (c) 2001-2003 The FFmpeg project * * first version by Francois Revol (revol@free.fr) * fringe ADPCM codecs (e.g., DK3, DK4, Westwood) diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 72e8a5717b..1f24e1b41c 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -29,20 +29,20 @@ * passed through the extradata[_size] fields. This atom is tacked onto * the end of an 'alac' stsd atom and has the following format: * - * 32bit atom size - * 32bit tag ("alac") - * 32bit tag version (0) - * 32bit samples per frame (used when not set explicitly in the frames) - * 8bit compatible version (0) - * 8bit sample size - * 8bit history mult (40) - * 8bit initial history (14) - * 8bit rice param limit (10) - * 8bit channels - * 16bit maxRun (255) - * 32bit max coded frame size (0 means unknown) - * 32bit average bitrate (0 means unknown) - * 32bit samplerate + * 32 bits atom size + * 32 bits tag ("alac") + * 32 bits tag version (0) + * 32 bits samples per frame (used when not set explicitly in the frames) + * 8 bits compatible version (0) + * 8 bits sample size + * 8 bits history mult (40) + * 8 bits initial history (14) + * 8 bits rice param limit (10) + * 8 bits channels + * 16 bits maxRun (255) + * 32 bits max coded frame size (0 means unknown) + * 32 bits average bitrate (0 means unknown) + * 32 bits samplerate */ #include diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 9d25b57d8f..f356a70104 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -305,7 +305,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx) skip_bits_long(&gb, 32); // sample rate already known sconf->samples = get_bits_long(&gb, 32); avctx->channels = m4ac.channels; - skip_bits(&gb, 16); // number of channels already knwon + skip_bits(&gb, 16); // number of channels already known skip_bits(&gb, 3); // skip file_type sconf->resolution = get_bits(&gb, 3); sconf->floating = get_bits1(&gb); diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index 60d5683604..e2b5641c23 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -532,13 +532,13 @@ static void decode_fixed_sparse(AMRFixed *fixed_sparse, const uint16_t *pulses, * @param p the context * @param subframe unpacked amr subframe * @param mode mode of the current frame - * @param fixed_sparse sparse respresentation of the fixed vector + * @param fixed_sparse sparse representation of the fixed vector */ static void pitch_sharpening(AMRContext *p, int subframe, enum Mode mode, AMRFixed *fixed_sparse) { // The spec suggests the current pitch gain is always used, but in other - // modes the pitch and codebook gains are joinly quantized (sec 5.8.2) + // modes the pitch and codebook gains are jointly quantized (sec 5.8.2) // so the codebook gain cannot depend on the quantized pitch gain. if (mode == MODE_12k2) p->beta = FFMIN(p->pitch_gain[4], 1.0); diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 81f8b47d1b..c0078b3c6e 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -38,7 +38,7 @@ #define MIN_ISF_SPACING (128.0 / 32768.0) ///< minimum isf gap #define PRED_FACTOR (1.0 / 3.0) -#define MIN_ENERGY -14.0 ///< initial innnovation energy (dB) +#define MIN_ENERGY -14.0 ///< initial innovation energy (dB) #define ENERGY_MEAN 30.0 ///< mean innovation energy (dB) in all modes #define PREEMPH_FAC 0.68 ///< factor used to de-emphasize synthesis diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 070192ad46..65e2e16fae 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -189,7 +189,7 @@ static int execute_code(AVCodecContext * avctx, int c) s->y = s->nb_args > 0 ? av_clip((s->args[0] - 1)*s->font_height, 0, avctx->height - s->font_height) : 0; s->x = s->nb_args > 1 ? av_clip((s->args[1] - 1)*FONT_WIDTH, 0, avctx->width - FONT_WIDTH) : 0; break; - case 'h': //set creen mode + case 'h': //set screen mode case 'l': //reset screen mode if (s->nb_args < 2) s->args[0] = DEFAULT_SCREEN_MODE; diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index d7cf8a2708..2f6448867a 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -359,10 +359,10 @@ static inline void range_dec_normalize(APEContext *ctx) } /** - * Calculate culmulative frequency for next symbol. Does NO update! + * Calculate cumulative frequency for next symbol. Does NO update! * @param ctx decoder context * @param tot_f is the total frequency or (code_value)1<> ROW_SHIFT; add r8, r6, r0 @ R8=a0+b0 add r9, r2, r1 @ R9=a1+b1 - @@ put 2 16 bits half-words in a 32bits word - @@ ROWr32[0]=ROWr16[0] | (ROWr16[1]<<16) (only Little Endian compliant then!!!) + @@ put two 16-bit half-words in a 32-bit word + @@ ROWr32[0]=ROWr16[0] | (ROWr16[1]<<16) (only little-endian compliant then!!!) ldr r10, =MASK_MSHW @ R10=0xFFFF0000 and r9, r10, r9, lsl #ROW_SHIFT2MSHW @ R9=0xFFFF0000 & ((a1+b1)<<5) mvn r11, r10 @ R11= NOT R10= 0x0000FFFF diff --git a/libavcodec/arm/vp8dsp_neon.S b/libavcodec/arm/vp8dsp_neon.S index 544332c3c2..02236a4a2e 100644 --- a/libavcodec/arm/vp8dsp_neon.S +++ b/libavcodec/arm/vp8dsp_neon.S @@ -322,7 +322,7 @@ endfunc vmov.i16 q12, #3 vsubl.s8 q10, d8, d6 @ QS0 - PS0 - vsubl.s8 q11, d9, d7 @ (widened to 16bit) + vsubl.s8 q11, d9, d7 @ (widened to 16 bits) veor q2, q2, q13 @ PS1 = P1 ^ 0x80 veor q5, q5, q13 @ QS1 = Q1 ^ 0x80 vmul.i16 q10, q10, q12 @ w = 3 * (QS0 - PS0) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 098050a1a6..def11f0ae3 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -1,5 +1,5 @@ /* - * SSA/ASS common funtions + * SSA/ASS common functions * Copyright (c) 2010 Aurelien Jacobs * * This file is part of Libav. diff --git a/libavcodec/ass.h b/libavcodec/ass.h index 594b5f3ac6..1302a04a56 100644 --- a/libavcodec/ass.h +++ b/libavcodec/ass.h @@ -1,5 +1,5 @@ /* - * SSA/ASS common funtions + * SSA/ASS common functions * Copyright (c) 2010 Aurelien Jacobs * * This file is part of Libav. diff --git a/libavcodec/atrac1data.h b/libavcodec/atrac1data.h index d4b8cd0def..539867b86e 100644 --- a/libavcodec/atrac1data.h +++ b/libavcodec/atrac1data.h @@ -43,7 +43,7 @@ static const uint8_t bfu_bands_t[4] = {0, 20, 36, 52}; */ static const uint8_t specs_per_bfu[52] = { 8, 8, 8, 8, 4, 4, 4, 4, 8, 8, 8, 8, 6, 6, 6, 6, 6, 6, 6, 6, // low band - 6, 6, 6, 6, 7, 7, 7, 7, 9, 9, 9, 9, 10, 10, 10, 10, // midle band + 6, 6, 6, 6, 7, 7, 7, 7, 9, 9, 9, 9, 10, 10, 10, 10, // middle band 12, 12, 12, 12, 12, 12, 12, 12, 20, 20, 20, 20, 20, 20, 20, 20 // high band }; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 26e6eb3fe3..8e97c977b6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -783,7 +783,7 @@ typedef struct RcOverride{ * Use only bitexact stuff (except (I)DCT). */ #define AV_CODEC_FLAG_BITEXACT (1 << 23) -/* Fx : Flag for h263+ extra options */ +/* Fx : Flag for H.263+ extra options */ /** * H.263 advanced intra coding / MPEG-4 AC prediction */ @@ -869,7 +869,7 @@ typedef struct RcOverride{ * are connected to a parser to split what they return into proper frames. * This flag is reserved to the very rare category of codecs which have a * bitstream that cannot be split into frames without timeconsuming - * operations like full decoding. Demuxers carring such bitstreams thus + * operations like full decoding. Demuxers carrying such bitstreams thus * may return multiple frames in a packet. This has many disadvantages like * prohibiting stream copy in many cases thus it should only be considered * as a last resort. @@ -959,7 +959,7 @@ typedef struct RcOverride{ #define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay. #define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in extradata instead of every keyframe. #define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT). -/* Fx : Flag for h263+ extra options */ +/* Fx : Flag for H.263+ extra options */ #define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction #define CODEC_FLAG_LOOP_FILTER 0x00000800 ///< loop filter #define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation @@ -1031,7 +1031,7 @@ typedef struct RcOverride{ * are connected to a parser to split what they return into proper frames. * This flag is reserved to the very rare category of codecs which have a * bitstream that cannot be split into frames without timeconsuming - * operations like full decoding. Demuxers carring such bitstreams thus + * operations like full decoding. Demuxers carrying such bitstreams thus * may return multiple frames in a packet. This has many disadvantages like * prohibiting stream copy in many cases thus it should only be considered * as a last resort. @@ -1097,7 +1097,7 @@ typedef struct RcOverride{ #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) #define MB_TYPE_QUANT 0x00010000 #define MB_TYPE_CBP 0x00020000 -//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...) +// Note bits 24-31 are reserved for codec specific use (H.264 ref0, MPEG-1 0mv, ...) #endif /** @@ -1500,11 +1500,11 @@ typedef struct AVCodecContext { /** * some codecs need / can use extradata like Huffman tables. - * mjpeg: Huffman tables + * MJPEG: Huffman tables * rv10: additional flags - * mpeg4: global headers (they can be in the bitstream or here) + * MPEG-4: global headers (they can be in the bitstream or here) * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger - * than extradata_size to avoid prolems if it is read with the bitstream reader. + * than extradata_size to avoid problems if it is read with the bitstream reader. * The bytewise contents of extradata must not depend on the architecture or CPU endianness. * - encoding: Set/allocated/freed by libavcodec. * - decoding: Set/allocated/freed by user. @@ -1557,7 +1557,7 @@ typedef struct AVCodecContext { * picture width / height. * * @note Those fields may not match the values of the last - * AVFrame outputted by avcodec_decode_video2 due frame + * AVFrame output by avcodec_decode_video2 due frame * reordering. * * - encoding: MUST be set by user. @@ -1573,7 +1573,7 @@ typedef struct AVCodecContext { * the decoded frame is cropped before being output. * * @note Those field may not match the value of the last - * AVFrame outputted by avcodec_receive_frame() due frame + * AVFrame output by avcodec_receive_frame() due frame * reordering. * * - encoding: unused @@ -1597,10 +1597,10 @@ typedef struct AVCodecContext { /** * Pixel format, see AV_PIX_FMT_xxx. * May be set by the demuxer if known from headers. - * May be overriden by the decoder if it knows better. + * May be overridden by the decoder if it knows better. * * @note This field may not match the value of the last - * AVFrame outputted by avcodec_receive_frame() due frame + * AVFrame output by avcodec_receive_frame() due frame * reordering. * * - encoding: Set by user. @@ -1710,8 +1710,8 @@ typedef struct AVCodecContext { #endif /** - * qscale factor between P and I-frames - * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset). + * qscale factor between P- and I-frames + * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor + offset). * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset). * - encoding: Set by user. * - decoding: unused @@ -1921,7 +1921,7 @@ typedef struct AVCodecContext { */ int slice_flags; #define SLICE_FLAG_CODED_ORDER 0x0001 ///< draw_horiz_band() is called in coded order instead of display -#define SLICE_FLAG_ALLOW_FIELD 0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics) +#define SLICE_FLAG_ALLOW_FIELD 0x0002 ///< allow draw_horiz_band() with field slices (MPEG-2 field pics) #define SLICE_FLAG_ALLOW_PLANE 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1) #if FF_API_XVMC @@ -2012,14 +2012,14 @@ typedef struct AVCodecContext { #endif /** - * minimum MB lagrange multipler + * minimum MB Lagrange multiplier * - encoding: Set by user. * - decoding: unused */ int mb_lmin; /** - * maximum MB lagrange multipler + * maximum MB Lagrange multiplier * - encoding: Set by user. * - decoding: unused */ @@ -2238,7 +2238,7 @@ typedef struct AVCodecContext { * to all data planes. data[] must hold as many pointers as it can. * extended_data must be allocated with av_malloc() and will be freed in * av_frame_unref(). - * * otherwise exended_data must point to data + * * otherwise extended_data must point to data * - buf[] must contain one or more pointers to AVBufferRef structures. Each of * the frame's data and extended_data pointers must be contained in these. That * is, one AVBufferRef for each allocated chunk of memory, not necessarily one @@ -2580,7 +2580,7 @@ typedef struct AVCodecContext { #define FF_BUG_TRUNCATED 16384 /** - * strictly follow the standard (MPEG4, ...). + * strictly follow the standard (MPEG-4, ...). * - encoding: Set by user. * - decoding: Set by user. * Setting this to STRICT or higher means the encoder and decoder will @@ -2646,9 +2646,9 @@ typedef struct AVCodecContext { */ attribute_deprecated int debug_mv; -#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames -#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames -#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames +#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 // visualize forward predicted MVs of P-frames +#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 // visualize forward predicted MVs of B-frames +#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 // visualize backward predicted MVs of B-frames #endif /** @@ -2670,7 +2670,7 @@ typedef struct AVCodecContext { #define AV_EF_EXPLODE (1<<3) /** - * opaque 64bit number (generally a PTS) that will be reordered and + * opaque 64-bit number (generally a PTS) that will be reordered and * output in AVFrame.reordered_opaque * - encoding: unused * - decoding: Set by user. @@ -2855,7 +2855,7 @@ typedef struct AVCodecContext { int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count); /** - * noise vs. sse weight for the nsse comparsion function + * noise vs. sse weight for the nsse comparison function * - encoding: Set by user. * - decoding: unused */ @@ -3426,7 +3426,7 @@ typedef struct AVSubtitleRect { /** * 0 terminated ASS/SSA compatible event line. - * The pressentation of this is unaffected by the other values in this + * The presentation of this is unaffected by the other values in this * struct. */ char *ass; @@ -4153,7 +4153,7 @@ int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, * next call to this function or until closing or flushing the * decoder. The caller may not write to it. * - * @param[in] avpkt The input AVpacket containing the input buffer. + * @param[in] avpkt The input AVPacket containing the input buffer. * You can create such packet with av_init_packet() and by then setting * data and size, some decoders might in addition need other fields like * flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least @@ -5172,7 +5172,7 @@ unsigned int av_xiphlacing(unsigned char *s, unsigned int v); * a pointer to an AVClass struct * @param[in] feature string containing the name of the missing feature * @param[in] want_sample indicates if samples are wanted which exhibit this feature. - * If want_sample is non-zero, additional verbage will be added to the log + * If want_sample is non-zero, additional verbiage will be added to the log * message which tells the user how to report samples to the development * mailing list. * @deprecated Use avpriv_report_missing_feature() instead. diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 4e72267667..94d1598eed 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1236,7 +1236,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac } /** - * Caclulate quantization tables for version b + * Calculate quantization tables for version b */ static av_cold void binkb_calc_quant(void) { diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 93047a2b91..a0d2a982c0 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -146,7 +146,7 @@ static int compare_vlcspec(const void *a, const void *b) /** * Build VLC decoding tables suitable for use with get_vlc(). * - * @param vlc the context to be initted + * @param vlc the context to be initialized * * @param table_nb_bits max length of vlc codes to store directly in this table * (Longer codes are delegated to subtables.) @@ -240,7 +240,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, /* Build VLC decoding tables suitable for use with get_vlc(). - 'nb_bits' set thee decoding table size (2^nb_bits) entries. The + 'nb_bits' sets the decoding table size (2^nb_bits) entries. The bigger it is, the faster is the decoding. But it should not be too big to save memory and L1 cache. '9' is a good compromise. diff --git a/libavcodec/bsf.h b/libavcodec/bsf.h index 9e05f0b8ce..cf35fc8e01 100644 --- a/libavcodec/bsf.h +++ b/libavcodec/bsf.h @@ -22,7 +22,7 @@ #include "avcodec.h" /** - * Called by the biststream filters to get the next packet for filtering. + * Called by the bitstream filters to get the next packet for filtering. * The filter is responsible for either freeing the packet or passing it to the * caller. */ diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index a3ca817479..611ffe5acd 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -1,6 +1,6 @@ /* * Cinepak Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/cook.c b/libavcodec/cook.c index ddce57f6d3..f487db6a97 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -140,7 +140,7 @@ typedef struct cook { VLC envelope_quant_index[13]; VLC sqvh[7]; // scalar quantization - /* generatable tables and related variables */ + /* generate tables and related variables */ int gain_size_factor; float gain_table[23]; @@ -1170,7 +1170,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) /* Initialize variable relations */ q->subpacket[s].numvector_size = (1 << q->subpacket[s].log2_numvector_size); - /* Try to catch some obviously faulty streams, othervise it might be exploitable */ + /* Try to catch some obviously faulty streams, otherwise it might be exploitable */ if (q->subpacket[s].total_subbands > 53) { avpriv_request_sample(avctx, "total_subbands > 53"); return AVERROR_PATCHWELCOME; @@ -1234,7 +1234,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) q->saturate_output = saturate_output_float; } - /* Try to catch some obviously faulty streams, othervise it might be exploitable */ + /* Try to catch some obviously faulty streams, otherwise it might be exploitable */ if (q->samples_per_channel != 256 && q->samples_per_channel != 512 && q->samples_per_channel != 1024) { avpriv_request_sample(avctx, "samples_per_channel = %d", diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h index c4c26fae5f..714ba1e76d 100644 --- a/libavcodec/cookdata.h +++ b/libavcodec/cookdata.h @@ -22,7 +22,7 @@ /** * @file - * Cook AKA RealAudio G2 compatible decoderdata + * Cook AKA RealAudio G2 compatible decoder data */ #ifndef AVCODEC_COOKDATA_H diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index c8d4ed3045..86f7aacb65 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -4,7 +4,7 @@ * based on "Creative YUV (CYUV) stream format for AVI": * http://www.csse.monash.edu.au/~timf/videocodec/cyuv.txt * - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/dcadata.c b/libavcodec/dcadata.c index 6c41aef3a8..2369f55c1b 100644 --- a/libavcodec/dcadata.c +++ b/libavcodec/dcadata.c @@ -47,7 +47,7 @@ const uint8_t ff_dca_bits_per_sample[7] = { /* ADPCM data */ -/* 16bits signed fractional Q13 binary codes */ +/* 16 bits signed fractional Q13 binary codes */ const int16_t ff_dca_adpcm_vb[4096][4] = { { 9928, -2618, -1093, -1263 }, { 11077, -2876, -1747, -308 }, @@ -4179,7 +4179,7 @@ const uint32_t ff_dca_scale_factor_quant7[128] = { 5011872, 5688529, 6456542, 7328245, 8317638, 0, 0, 0 }; -/* 20bits unsigned fractional binary codes */ +/* 20 bits unsigned fractional binary codes */ const uint32_t ff_dca_lossy_quant[32] = { 0, 6710886, 4194304, 3355443, 2474639, 2097152, 1761608, 1426063, 796918, 461373, 251658, 146801, 79692, 46137, 27263, 16777, @@ -4187,7 +4187,7 @@ const uint32_t ff_dca_lossy_quant[32] = { 84, 42, 21, 0, 0, 0, 0, 0 }; -/* 20bits unsigned fractional binary codes */ +/* 20 bits unsigned fractional binary codes */ const uint32_t ff_dca_lossless_quant[32] = { 0, 4194304, 2097152, 1384120, 1048576, 696254, 524288, 348127, 262144, 131072, 65431, 33026, 16450, 8208, 4100, 2049, diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 43992ddfb8..cd4432368c 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1348,7 +1348,7 @@ static int set_channel_layout(AVCodecContext *avctx, int channels, int num_core_ ff_dlog(s->avctx, "\n"); } } else { - av_log(avctx, AV_LOG_ERROR, "Non standard configuration %d !\n", s->amode); + av_log(avctx, AV_LOG_ERROR, "Nonstandard configuration %d !\n", s->amode); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index d3233f310e..262319e1b4 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -394,7 +394,7 @@ static void help(void) printf("dct-test [-i] []\n" "test-number 0 -> test with random matrixes\n" " 1 -> test with random sparse matrixes\n" - " 2 -> do 3. test from mpeg4 std\n" + " 2 -> do 3. test from MPEG-4 std\n" "-i test IDCT implementations\n" "-4 test IDCT248 implementations\n" "-t speed test\n"); diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index e0ab102f87..cc877b6504 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -40,7 +40,7 @@ typedef struct CIDEntry { const uint8_t *ac_run_flag, *ac_index_flag; const uint16_t *run_codes; const uint8_t *run_bits, *run; - int bit_rates[5]; ///< Helpher to choose variants, rounded to nearest 5Mb/s + int bit_rates[5]; ///< Helper to choose variants, rounded to nearest 5Mb/s } CIDEntry; extern const CIDEntry ff_dnxhd_cid_table[]; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index f90499ce21..f3182c97d6 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -36,7 +36,7 @@ #include "pixblockdsp.h" #include "dnxhdenc.h" -// The largest value that will not lead to overflow for 10bit samples. +// The largest value that will not lead to overflow for 10-bit samples. #define DNX10BIT_QMAT_SHIFT 18 #define RC_VARIANCE 1 // use variance or ssd for fast rc #define LAMBDA_FRAC_BITS 10 diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index b9f5b93ebc..7567643d45 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -1,6 +1,6 @@ /* * Assorted DPCM codecs - * Copyright (c) 2003 The ffmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index 995f0e03dd..e2e987d259 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -1,5 +1,5 @@ /* - * DXVA2 H264 HW acceleration. + * DXVA2 H.264 HW acceleration. * * copyright (c) 2009 Laurent Aimar * diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 8f7dd25d81..3e8d4fdd88 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -41,8 +41,8 @@ #include "mpeg12vlc.h" #define EA_PREAMBLE_SIZE 8 -#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */ -#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD p-frame */ +#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD I-frame */ +#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD P-frame */ #define MADe_TAG MKTAG('M', 'A', 'D', 'e') /* MAD lqp-frame */ typedef struct MadContext { diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index e2b03a6f9b..07bb2e3117 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -30,7 +30,7 @@ #include "elbg.h" #include "avcodec.h" -#define DELTA_ERR_MAX 0.1 ///< Precision of the ELBG algorithm (as percentual error) +#define DELTA_ERR_MAX 0.1 ///< Precision of the ELBG algorithm (as percentage error) /** * In the ELBG jargon, a cell is the set of points that are closest to a @@ -189,7 +189,7 @@ static void get_new_centroids(elbg_data *elbg, int huc, int *newcentroid_i, /** * Add the points in the low utility cell to its closest cell. Split the high - * utility cell, putting the separed points in the (now empty) low utility + * utility cell, putting the separated points in the (now empty) low utility * cell. * * @param elbg Internal elbg data diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 2c7836f23d..eb6fd1481b 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -1047,7 +1047,7 @@ void ff_er_frame_end(ERContext *s) s->mv[0][0][1] = s->cur_pic.motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][1]; } - s->decode_mb(s->opaque, 0 /* FIXME h264 partitioned slices need this set */, + s->decode_mb(s->opaque, 0 /* FIXME H.264 partitioned slices need this set */, mv_dir, mv_type, &s->mv, mb_x, mb_y, 0, 0); } } diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 741325ac9d..3139880362 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -41,7 +41,7 @@ typedef struct ERPicture { AVFrame *f; ThreadFrame *tf; - // it's the caller responsability to allocate these buffers + // it is the caller's responsibility to allocate these buffers int16_t (*motion_val[2])[2]; int8_t *ref_index[2]; diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 9c35f5f5ae..d10841d8d6 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -159,13 +159,13 @@ static union av_intfloat32 exr_half2float(uint16_t hf) mantissa <<= 1; exp -= (1 << 23); } - // clamp the mantissa to 10-bits + // clamp the mantissa to 10 bits mantissa &= ((1 << 10) - 1); - // shift left to generate single-precision mantissa of 23-bits + // shift left to generate single-precision mantissa of 23 bits mantissa <<= 13; } } else { - // shift left to generate single-precision mantissa of 23-bits + // shift left to generate single-precision mantissa of 23 bits mantissa <<= 13; // generate single precision biased exponent value exp = (exp << 13) + HALF_FLOAT_MIN_BIASED_EXP_AS_SINGLE_FP_EXP; @@ -1381,7 +1381,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } } - // allocate thread data, used for non EXR_RAW compreesion types + // allocate thread data, used for non EXR_RAW compression types s->thread_data = av_mallocz_array(avctx->thread_count, sizeof(EXRThreadData)); if (!s->thread_data) return AVERROR_INVALIDDATA; @@ -1392,7 +1392,7 @@ static av_cold int decode_init(AVCodecContext *avctx) static int decode_init_thread_copy(AVCodecContext *avctx) { EXRContext *s = avctx->priv_data; - // allocate thread data, used for non EXR_RAW compreesion types + // allocate thread data, used for non EXR_RAW compression types s->thread_data = av_mallocz_array(avctx->thread_count, sizeof(EXRThreadData)); if (!s->thread_data) return AVERROR_INVALIDDATA; diff --git a/libavcodec/faxcompr.h b/libavcodec/faxcompr.h index 8157f1fc21..0a8b64de8b 100644 --- a/libavcodec/faxcompr.h +++ b/libavcodec/faxcompr.h @@ -31,7 +31,7 @@ #include "tiff.h" /** - * initialize upacker code + * initialize unpacker code */ void ff_ccitt_unpack_init(void); diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 3a595435b0..13e6ae4b4a 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -1,6 +1,6 @@ /* * FLI/FLC Animation Video Decoder - * Copyright (C) 2003, 2004 the ffmpeg project + * Copyright (C) 2003, 2004 The FFmpeg project * * This file is part of Libav. * @@ -115,7 +115,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) case 8 : avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 15 : avctx->pix_fmt = AV_PIX_FMT_RGB555; break; case 16 : avctx->pix_fmt = AV_PIX_FMT_RGB565; break; - case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but havent any files to test with */ + case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but no files to test with */ av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n"); return AVERROR_PATCHWELCOME; default : @@ -725,7 +725,7 @@ static int flic_decode_frame(AVCodecContext *avctx, /* Should not get here, ever as the pix_fmt is processed */ /* in flic_decode_init and the above if should deal with */ - /* the finite set of possibilites allowable by here. */ + /* the finite set of possibilities allowable by here. */ /* But in case we do, just error out. */ av_log(avctx, AV_LOG_ERROR, "Unknown FLC format, my science cannot explain how this happened.\n"); return AVERROR_BUG; diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index ab89b25203..f7c72c5ec6 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -31,7 +31,7 @@ void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number) avpriv_align_put_bits(&s->pb); put_bits(&s->pb, 17, 1); - /* 0: h263 escape codes 1: 11-bit escape codes */ + /* 0: H.263 escape codes 1: 11-bit escape codes */ put_bits(&s->pb, 5, (s->h263_flv - 1)); put_bits(&s->pb, 8, (((int64_t) s->picture_number * 30 * s->avctx->time_base.num) / // FIXME use timestamp diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index 99043169fe..701e034f8a 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -483,7 +483,7 @@ static int comp_interp_index(G723_1_Context *p, int pitch_lag, } /** - * Peform residual interpolation based on frame classification. + * Perform residual interpolation based on frame classification. * * @param buf decoded excitation vector * @param out output vector @@ -931,7 +931,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, p->interp_index = comp_interp_index(p, p->pitch_lag[1], &p->sid_gain, &p->cur_gain); - /* Peform pitch postfiltering */ + /* Perform pitch postfiltering */ if (p->postfilter) { i = PITCH_MAX; for (j = 0; j < SUBFRAMES; i += SUBFRAME_LEN, j++) diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 4a23ff78a4..e783e74c90 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -31,15 +31,15 @@ #include "put_bits.h" /** - * G.726 11bit float. - * G.726 Standard uses rather odd 11bit floating point arithmentic for + * G.726 11-bit float. + * G.726 Standard uses rather odd 11-bit floating point arithmetic for * numerous occasions. It's a mystery to me why they did it this way - * instead of simply using 32bit integer arithmetic. + * instead of simply using 32-bit integer arithmetic. */ typedef struct Float11 { - uint8_t sign; /**< 1bit sign */ - uint8_t exp; /**< 4bit exponent */ - uint8_t mant; /**< 6bit mantissa */ + uint8_t sign; /**< 1 bit sign */ + uint8_t exp; /**< 4 bits exponent */ + uint8_t mant; /**< 6 bits mantissa */ } Float11; static inline Float11* i2f(int i, Float11* f) @@ -97,7 +97,7 @@ typedef struct G726Context { int code_size; } G726Context; -static const int quant_tbl16[] = /**< 16kbit/s 2bits per sample */ +static const int quant_tbl16[] = /**< 16kbit/s 2 bits per sample */ { 260, INT_MAX }; static const int16_t iquant_tbl16[] = { 116, 365, 365, 116 }; @@ -106,7 +106,7 @@ static const int16_t W_tbl16[] = static const uint8_t F_tbl16[] = { 0, 7, 7, 0 }; -static const int quant_tbl24[] = /**< 24kbit/s 3bits per sample */ +static const int quant_tbl24[] = /**< 24kbit/s 3 bits per sample */ { 7, 217, 330, INT_MAX }; static const int16_t iquant_tbl24[] = { INT16_MIN, 135, 273, 373, 373, 273, 135, INT16_MIN }; @@ -115,7 +115,7 @@ static const int16_t W_tbl24[] = static const uint8_t F_tbl24[] = { 0, 1, 2, 7, 7, 2, 1, 0 }; -static const int quant_tbl32[] = /**< 32kbit/s 4bits per sample */ +static const int quant_tbl32[] = /**< 32kbit/s 4 bits per sample */ { -125, 79, 177, 245, 299, 348, 399, INT_MAX }; static const int16_t iquant_tbl32[] = { INT16_MIN, 4, 135, 213, 273, 323, 373, 425, @@ -126,7 +126,7 @@ static const int16_t W_tbl32[] = static const uint8_t F_tbl32[] = { 0, 0, 0, 1, 1, 1, 3, 7, 7, 3, 1, 1, 1, 0, 0, 0 }; -static const int quant_tbl40[] = /**< 40kbit/s 5bits per sample */ +static const int quant_tbl40[] = /**< 40kbit/s 5 bits per sample */ { -122, -16, 67, 138, 197, 249, 297, 338, 377, 412, 444, 474, 501, 527, 552, INT_MAX }; static const int16_t iquant_tbl40[] = @@ -151,7 +151,7 @@ static const G726Tables G726Tables_pool[] = /** - * Para 4.2.2 page 18: Adaptive quantizer. + * Paragraph 4.2.2 page 18: Adaptive quantizer. */ static inline uint8_t quant(G726Context* c, int d) { @@ -177,14 +177,14 @@ static inline uint8_t quant(G726Context* c, int d) } /** - * Para 4.2.3 page 22: Inverse adaptive quantizer. + * Paragraph 4.2.3 page 22: Inverse adaptive quantizer. */ static inline int16_t inverse_quant(G726Context* c, int i) { int dql, dex, dqt; dql = c->tbls.iquant[i] + (c->y >> 2); - dex = (dql>>7) & 0xf; /* 4bit exponent */ + dex = (dql>>7) & 0xf; /* 4-bit exponent */ dqt = (1<<7) + (dql & 0x7f); /* log2 -> linear */ return (dql < 0) ? 0 : ((dqt<> 7); } diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 29e72059d3..b8debb9d02 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -92,7 +92,7 @@ typedef struct RL_VLC_ELEM { * * GET_CACHE(name, gb) * Will output the contents of the internal cache, - * next bit is MSB of 32 or 64 bit (FIXME 64bit). + * next bit is MSB of 32 or 64 bits (FIXME 64 bits). * * SHOW_UBITS(name, gb, num) * Will return the next num bits. @@ -207,7 +207,7 @@ static inline void skip_bits_long(GetBitContext *s, int n) } /** - * read mpeg1 dc style vlc (sign bit + mantisse with no MSB). + * Read MPEG-1 dc-style VLC (sign bit + mantisse with no MSB). * if MSB not set it is negative * @param n length in bits */ diff --git a/libavcodec/h261.c b/libavcodec/h261.c index bca7809773..320d6214a7 100644 --- a/libavcodec/h261.c +++ b/libavcodec/h261.c @@ -1,5 +1,5 @@ /* - * H261 common code + * H.261 common code * Copyright (c) 2002-2004 Michael Niedermayer * Copyright (c) 2004 Maarten Daniels * @@ -22,7 +22,7 @@ /** * @file - * h261codec. + * H.261 codec */ #include "avcodec.h" diff --git a/libavcodec/h261.h b/libavcodec/h261.h index ad7e28bb64..fdfe56098b 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -1,5 +1,5 @@ /* - * H261 decoder + * H.261 codec * Copyright (c) 2002-2004 Michael Niedermayer * Copyright (c) 2004 Maarten Daniels * @@ -22,7 +22,7 @@ /** * @file - * h261codec. + * H.261 codec. */ #ifndef AVCODEC_H261_H diff --git a/libavcodec/h261_parser.c b/libavcodec/h261_parser.c index 2469424c1a..59eed02f66 100644 --- a/libavcodec/h261_parser.c +++ b/libavcodec/h261_parser.c @@ -1,5 +1,5 @@ /* - * H261 parser + * H.261 parser * Copyright (c) 2002-2004 Michael Niedermayer * Copyright (c) 2004 Maarten Daniels * @@ -22,7 +22,7 @@ /** * @file - * h261codec. + * H.261 parser */ #include "parser.h" diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 95452f47b4..9a323ec7d1 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -1,5 +1,5 @@ /* - * H261 decoder + * H.261 decoder * Copyright (c) 2002-2004 Michael Niedermayer * Copyright (c) 2004 Maarten Daniels * @@ -580,7 +580,7 @@ retry: init_get_bits(&s->gb, buf, buf_size * 8); if (!s->context_initialized) - // we need the IDCT permutaton for reading a custom matrix + // we need the IDCT permutation for reading a custom matrix ff_mpv_idct_init(s); ret = h261_decode_picture_header(h); diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 94e8cec2a2..3cac88253f 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -1,5 +1,5 @@ /* - * H261 encoder + * H.261 encoder * Copyright (c) 2002-2004 Michael Niedermayer * Copyright (c) 2004 Maarten Daniels * diff --git a/libavcodec/h263.c b/libavcodec/h263.c index b6a68d017d..85d58cc3f0 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -1,7 +1,7 @@ /* - * H263/MPEG4 backend for encoder and decoder + * H.263/MPEG-4 backend for encoder and decoder * Copyright (c) 2000,2001 Fabrice Bellard - * H263+ support. + * H.263+ support. * Copyright (c) 2001 Juan J. Sierralta P * Copyright (c) 2002-2004 Michael Niedermayer * @@ -24,7 +24,7 @@ /** * @file - * h263/mpeg4 codec. + * H.263/MPEG-4 codec. */ #include @@ -320,7 +320,7 @@ int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir, A = mot_val[ - 1]; /* special case for first (slice) line */ if (s->first_slice_line && block<3) { - // we can't just change some MVs to simulate that as we need them for the B frames (and ME) + // we can't just change some MVs to simulate that as we need them for the B-frames (and ME) // and if we ever support non rectangular objects than we need to do a few ifs here anyway :( if(block==0){ //most common case if(s->mb_x == s->resync_mb_x){ //rare diff --git a/libavcodec/h263.h b/libavcodec/h263.h index e97718b85b..42c78f4c0e 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -1,5 +1,5 @@ /* - * H263 internal header + * H.263 internal header * * This file is part of Libav. * @@ -87,7 +87,7 @@ int ff_h263_decode_mb(MpegEncContext *s, int16_t block[6][64]); /** - * Return the value of the 3bit "source format" syntax element. + * Return the value of the 3-bit "source format" syntax element. * This represents some standard picture dimensions or indicates that * width&height are explicitly stored later. */ diff --git a/libavcodec/h263data.c b/libavcodec/h263data.c index ae322e03c0..b7f4f20e42 100644 --- a/libavcodec/h263data.c +++ b/libavcodec/h263data.c @@ -1,5 +1,5 @@ /* - * H263+ tables + * H.263+ tables * * This file is part of Libav. * diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h index c081bda1e8..a431d58f12 100644 --- a/libavcodec/h263data.h +++ b/libavcodec/h263data.h @@ -1,6 +1,6 @@ /* * copyright (c) 2000,2001 Fabrice Bellard - * H263+ support + * H.263+ support * copyright (c) 2001 Juan J. Sierralta P * copyright (c) 2002-2004 Michael Niedermayer * diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 10db4d9211..e4a7227575 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -117,7 +117,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) } s->codec_id = avctx->codec->id; - /* for h263, we allocate the images after having read the header */ + /* for H.263, we allocate the images after having read the header */ if (avctx->codec->id != AV_CODEC_ID_H263 && avctx->codec->id != AV_CODEC_ID_MPEG4) { avctx->pix_fmt = h263_get_format(avctx); @@ -422,7 +422,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return ret; if (!s->context_initialized) - // we need the idct permutaton for reading a custom matrix + // we need the idct permutation for reading a custom matrix ff_mpv_idct_init(s); /* let's go :-) */ @@ -494,9 +494,9 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c) } - /* After H263 & mpeg4 header decode we have the height, width, + /* After H.263 & MPEG-4 header decode we have the height, width, * and other parameters. So then we could init the picture. - * FIXME: By the way H263 decoder is evolving it should have + * FIXME: By the way H.263 decoder is evolving it should have * an H263EncContext */ if (s->width != avctx->coded_width || s->height != avctx->coded_height || diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d73b76a535..224ba2fa27 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 codec. + * H.264 / AVC / MPEG-4 part10 codec. * @author Michael Niedermayer */ diff --git a/libavcodec/h264.h b/libavcodec/h264.h index d1cd37dee9..bfbcc81b45 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 codec. + * H.264 / AVC / MPEG-4 part10 codec. * @author Michael Niedermayer */ @@ -418,7 +418,7 @@ typedef struct H264SliceContext { DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4]; - ///< as a dct coeffecient is int32_t in high depth, we need to reserve twice the space. + ///< as a DCT coefficient is int32_t in high depth, we need to reserve twice the space. DECLARE_ALIGNED(16, int16_t, mb)[16 * 48 * 2]; DECLARE_ALIGNED(16, int16_t, mb_luma_dc)[3][16 * 2]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either @@ -456,7 +456,7 @@ typedef struct H264Context { H2645Packet pkt; - int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264 + int pixel_shift; ///< 0 for 8-bit H.264, 1 for high-bit-depth H.264 /* coded dimensions -- 16 * mb w/h */ int width, height; @@ -534,7 +534,7 @@ typedef struct H264Context { int nal_unit_type; /** - * Used to parse AVC variant of h264 + * Used to parse AVC variant of H.264 */ int is_avc; ///< this flag is != 0 if codec is avc1 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) @@ -580,7 +580,7 @@ typedef struct H264Context { * @{ */ /** - * current slice number, used to initalize slice_num of each thread/context + * current slice number, used to initialize slice_num of each thread/context */ int current_slice; diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h index 651cf26795..9cc4441d9e 100644 --- a/libavcodec/h2645_parse.h +++ b/libavcodec/h2645_parse.h @@ -55,7 +55,7 @@ typedef struct H2645NAL { int temporal_id; /** - * H264 only, nal_ref_idc + * H.264 only, nal_ref_idc */ int ref_idc; } H2645NAL; diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index d0286960da..5e7f3e7768 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 cabac decoding. + * H.264 / AVC / MPEG-4 part10 cabac decoding. * @author Michael Niedermayer */ @@ -56,7 +56,7 @@ static const int8_t cabac_context_init_I[1024][2] = { 2, 54 }, { 3, 74 }, { -28,127 }, { -23, 104 }, { -6, 53 }, { -1, 54 }, { 7, 51 }, - /* 11 - 23 unsused for I */ + /* 11 - 23 unused for I */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index a4994dc752..1a80f76d96 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 cavlc bitstream decoding. + * H.264 / AVC / MPEG-4 part10 cavlc bitstream decoding. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 9b6bb44366..177ec10d55 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 direct mb/block decoding. + * H.264 / AVC / MPEG-4 part10 direct mb/block decoding. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index fccfc66c1c..36bdd71a5d 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 loop filter. + * H.264 / AVC / MPEG-4 part10 loop filter. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index b6773e63b6..6f3c719ce0 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 macroblock decoding + * H.264 / AVC / MPEG-4 part10 macroblock decoding */ #include @@ -90,7 +90,7 @@ static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl, /** * Wait until all reference frames are available for MC operations. * - * @param h the H264 context + * @param h the H.264 context */ static void await_references(const H264Context *h, H264SliceContext *sl) { diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index d97dac0e6a..e9d2b62208 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -1,5 +1,5 @@ /* - * H.26L/H.264/AVC/JVT/14496-10/... motion vector predicion + * H.26L/H.264/AVC/JVT/14496-10/... motion vector prediction * Copyright (c) 2003 Michael Niedermayer * * This file is part of Libav. @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 motion vector predicion. + * H.264 / AVC / MPEG-4 part10 motion vector prediction. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index e956790a79..fde1a45be9 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -33,7 +33,7 @@ typedef struct H264PredWeightTable { int chroma_log2_weight_denom; int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag - // The following 2 can be changed to int8_t but that causes 10cpu cycles speedloss + // The following 2 can be changed to int8_t but that causes a 10 CPU cycles speed loss int luma_weight[48][2][2]; int chroma_weight[48][2][2][2]; int implicit_weight[48][48][2]; diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 99ced4a8ef..b86bf2b9b7 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 parser. + * H.264 / AVC / MPEG-4 part10 parser. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 4777fd6f34..fb71faef0b 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 codec. + * H.264 / AVC / MPEG-4 part10 codec. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 99ede76920..f6cd1ca760 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 parameter set decoding. + * H.264 / AVC / MPEG-4 part10 parameter set decoding. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 855248781a..427930cfb1 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 reference picture handling. + * H.264 / AVC / MPEG-4 part10 reference picture handling. * @author Michael Niedermayer */ @@ -610,7 +610,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) av_log(h->avctx, AV_LOG_DEBUG, "mmco: unref long failure\n"); break; case MMCO_LONG: - // Comment below left from previous code as it is an interresting note. + // Comment below left from previous code as it is an interesting note. /* First field in pair is in short term list or * at a different long term index. * This is not allowed; see 7.4.3.3, notes 2 and 3. diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 5e794d6165..0e3952d2c9 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -1,5 +1,5 @@ /* - * H.26L/H.264/AVC/JVT/14496-10/... sei decoding + * H.26L/H.264/AVC/JVT/14496-10/... SEI decoding * Copyright (c) 2003 Michael Niedermayer * * This file is part of Libav. @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 sei decoding. + * H.264 / AVC / MPEG-4 part10 SEI decoding. * @author Michael Niedermayer */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9eb493ed69..7031ee2de6 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 codec. + * H.264 / AVC / MPEG-4 part10 codec. * @author Michael Niedermayer */ @@ -128,7 +128,7 @@ static int alloc_scratch_buffers(H264SliceContext *sl, int linesize) av_fast_malloc(&sl->bipred_scratchpad, &sl->bipred_scratchpad_allocated, 16 * 6 * alloc_size); // edge emu needs blocksize + filter length - 1 - // (= 21x21 for h264) + // (= 21x21 for H.264) av_fast_malloc(&sl->edge_emu_buffer, &sl->edge_emu_buffer_allocated, alloc_size * 2 * 21); av_fast_malloc(&sl->top_borders[0], &sl->top_borders_allocated[0], @@ -903,7 +903,7 @@ static int h264_slice_header_init(H264Context *h) /** * Decode a slice header. - * This will (re)intialize the decoder and call h264_frame_start() as needed. + * This will (re)initialize the decoder and call h264_frame_start() as needed. * * @param h h264context * diff --git a/libavcodec/h264addpx_template.c b/libavcodec/h264addpx_template.c index cdbfc67dfe..e3adfe2261 100644 --- a/libavcodec/h264addpx_template.c +++ b/libavcodec/h264addpx_template.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 DSP functions. + * H.264 / AVC / MPEG-4 part10 DSP functions. * @author Michael Niedermayer */ diff --git a/libavcodec/h264data.c b/libavcodec/h264data.c index 0729f5dd6d..79c5b57cbc 100644 --- a/libavcodec/h264data.c +++ b/libavcodec/h264data.c @@ -1,5 +1,5 @@ /* - * H26L/H264/AVC/JVT/14496-10/... encoder/decoder + * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder * Copyright (c) 2003 Michael Niedermayer * * This file is part of Libav. @@ -22,7 +22,7 @@ /** * @file * @brief - * H264 / AVC / MPEG4 part10 codec data table + * H.264 / AVC / MPEG-4 part10 codec data table * @author Michael Niedermayer */ diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index c8edbd08eb..684566ba01 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 DSP functions. + * H.264 / AVC / MPEG-4 part10 DSP functions. * @author Michael Niedermayer */ diff --git a/libavcodec/h264dsp.h b/libavcodec/h264dsp.h index c4be235519..3a5b25b4f3 100644 --- a/libavcodec/h264dsp.h +++ b/libavcodec/h264dsp.h @@ -70,7 +70,7 @@ typedef struct H264DSPContext { int stride, int alpha, int beta); void (*h264_h_loop_filter_chroma_mbaff_intra)(uint8_t *pix /*align 8*/, int stride, int alpha, int beta); - // h264_loop_filter_strength: simd only. the C version is inlined in h264.c + // h264_loop_filter_strength: simd only. the C version is inlined in h264_loopfilter.c void (*h264_loop_filter_strength)(int16_t bS[2][4][4], uint8_t nnz[40], int8_t ref[2][40], int16_t mv[2][40][2], int bidir, int edges, int step, diff --git a/libavcodec/h264dsp_template.c b/libavcodec/h264dsp_template.c index 3d99cfcfec..c2d139420c 100644 --- a/libavcodec/h264dsp_template.c +++ b/libavcodec/h264dsp_template.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 DSP functions. + * H.264 / AVC / MPEG-4 part10 DSP functions. * @author Michael Niedermayer */ diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 7c3876ad20..7627eb076d 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 prediction functions. + * H.264 / AVC / MPEG-4 part10 prediction functions. * @author Michael Niedermayer */ @@ -547,7 +547,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred16x16[TOP_DC_PRED8x8 ]= FUNCC(pred16x16_top_dc , depth);\ h->pred16x16[DC_128_PRED8x8 ]= FUNCC(pred16x16_128_dc , depth);\ \ - /* special lossless h/v prediction for h264 */ \ + /* special lossless h/v prediction for H.264 */ \ h->pred4x4_add [VERT_PRED ]= FUNCC(pred4x4_vertical_add , depth);\ h->pred4x4_add [ HOR_PRED ]= FUNCC(pred4x4_horizontal_add , depth);\ h->pred8x8l_add [VERT_PRED ]= FUNCC(pred8x8l_vertical_add , depth);\ diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h index 673f4cd882..60e74349c9 100644 --- a/libavcodec/h264pred.h +++ b/libavcodec/h264pred.h @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 prediction functions. + * H.264 / AVC / MPEG-4 prediction functions. * @author Michael Niedermayer */ @@ -75,7 +75,7 @@ #define TOP_DC_PRED8x8 5 #define DC_128_PRED8x8 6 -// H264/SVQ3 (8x8) specific +// H.264/SVQ3 (8x8) specific #define ALZHEIMER_DC_L0T_PRED8x8 7 #define ALZHEIMER_DC_0LT_PRED8x8 8 #define ALZHEIMER_DC_L00_PRED8x8 9 diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c index 48baec8f85..8492b2b0a2 100644 --- a/libavcodec/h264pred_template.c +++ b/libavcodec/h264pred_template.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 prediction functions. + * H.264 / AVC / MPEG-4 part10 prediction functions. * @author Michael Niedermayer */ diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index b99223c07b..446b83a762 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -109,7 +109,7 @@ static int check_prediction_block_available(HEVCContext *s, int log2_cb_size, return z_scan_block_avail(s, x0, y0, xA1, yA1); } -//check if the two luma locations belong to the same mostion estimation region +//check if the two luma locations belong to the same motion estimation region static int isDiffMER(HEVCContext *s, int xN, int yN, int xP, int yP) { uint8_t plevel = s->ps.pps->log2_parallel_merge_level; diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 590d9fd53a..17cef6743d 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -95,7 +95,7 @@ static int decode_nal_sei_frame_packing_arrangement(HEVCContext *s) if (!s->quincunx_subsampling && s->frame_packing_arrangement_type != 5) skip_bits(gb, 16); // frame[01]_grid_position_[xy] skip_bits(gb, 8); // frame_packing_arrangement_reserved_byte - skip_bits1(gb); // frame_packing_arrangement_persistance_flag + skip_bits1(gb); // frame_packing_arrangement_persistence_flag } skip_bits1(gb); // upsampled_aspect_ratio_flag return 0; diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 1a5a1c3a25..67dcf1c082 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -1,6 +1,6 @@ /* * id Quake II CIN Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 803ee9c8ff..9a6912dc13 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -69,7 +69,7 @@ typedef struct IMCChannel { int sumLenArr[BANDS]; ///< bits for all coeffs in band int skipFlagRaw[BANDS]; ///< skip flags are stored in raw form or not int skipFlagBits[BANDS]; ///< bits used to code skip flags - int skipFlagCount[BANDS]; ///< skipped coeffients per band + int skipFlagCount[BANDS]; ///< skipped coefficients per band int skipFlags[COEFFS]; ///< skip coefficient decoding or not int codewords[COEFFS]; ///< raw codewords read from bitstream diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 5a0d3a7d4b..f222a06c5a 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -52,7 +52,7 @@ enum { /* Some constants for parsing frame bitstream flags. */ -#define BS_8BIT_PEL (1 << 1) ///< 8bit pixel bitdepth indicator +#define BS_8BIT_PEL (1 << 1) ///< 8-bit pixel bitdepth indicator #define BS_KEYFRAME (1 << 2) ///< intra frame indicator #define BS_MV_Y_HALF (1 << 4) ///< vertical mv halfpel resolution indicator #define BS_MV_X_HALF (1 << 5) ///< horizontal mv halfpel resolution indicator @@ -307,7 +307,7 @@ static inline uint32_t replicate32(uint32_t a) { } -/* Fill n lines with 64bit pixel value pix */ +/* Fill n lines with 64-bit pixel value pix */ static inline void fill_64(uint8_t *dst, const uint64_t pix, int32_t n, int32_t row_offset) { diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h index 1ca1c47785..41a29e5c13 100644 --- a/libavcodec/indeo3data.h +++ b/libavcodec/indeo3data.h @@ -234,7 +234,7 @@ /** - * Pack two delta values (a,b) into one 16bit word + * Pack two delta values (a,b) into one 16-bit word * according with endianness of the host machine. */ #if HAVE_BIGENDIAN @@ -281,7 +281,7 @@ static const int16_t delta_tab_3_5[79] = { TAB_3_5 }; #undef PD /** - * Pack four delta values (a,a,b,b) into one 32bit word + * Pack four delta values (a,a,b,b) into one 32-bit word * according with endianness of the host machine. */ #if HAVE_BIGENDIAN diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index ec2553bdb1..cd1971f428 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -44,8 +44,8 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) return -1; /* marker */ } if (get_bits1(&s->gb) != 0) { - av_log(s->avctx, AV_LOG_ERROR, "Bad H263 id\n"); - return -1; /* h263 id */ + av_log(s->avctx, AV_LOG_ERROR, "Bad H.263 id\n"); + return -1; /* H.263 id */ } skip_bits1(&s->gb); /* split screen off */ skip_bits1(&s->gb); /* camera off */ @@ -53,7 +53,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) format = get_bits(&s->gb, 3); if (format == 0 || format == 6) { - av_log(s->avctx, AV_LOG_ERROR, "Intel H263 free format not supported\n"); + av_log(s->avctx, AV_LOG_ERROR, "Intel H.263 free format not supported\n"); return -1; } s->h263_plus = 0; @@ -78,7 +78,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) } else { format = get_bits(&s->gb, 3); if(format == 0 || format == 7){ - av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H263 format\n"); + av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H.263 format\n"); return -1; } if(get_bits(&s->gb, 2)) diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index f0a770a519..e41fc34579 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1,6 +1,6 @@ /* * Interplay MVE Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 4d8d5c8456..eb4c1effd8 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -217,7 +217,7 @@ static void x8_get_ac_rlf(IntraX8Context *const w, const int mode, int t, l; if (i < 0) { *level = - *final = // prevent 'may be used unilitialized' + *final = // prevent 'may be used uninitialized' *run = 64; // this would cause error exit in the ac loop return; } @@ -251,12 +251,12 @@ static void x8_get_ac_rlf(IntraX8Context *const w, const int mode, sm = ac_decode_table[i]; e = get_bits(w->gb, sm & 0xF); - sm >>= 8; // 3bits + sm >>= 8; // 3 bits mask = sm & 0xff; - sm >>= 8; // 1bit + sm >>= 8; // 1 bit - *run = (sm & 0xff) + (e & mask); // 6bits - *level = (sm >> 8) + (e & ~mask); // 5bits + *run = (sm & 0xff) + (e & mask); // 6 bits + *level = (sm >> 8) + (e & ~mask); // 5 bits *final = i > (58 - 46); } else if (i < 75) { // [73-74] static const uint8_t crazy_mix_runlevel[32] = { diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index b9189b2e4d..9199f5c28d 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1,7 +1,7 @@ /* - * ITU H263 bitstream decoder + * ITU H.263 bitstream decoder * Copyright (c) 2000,2001 Fabrice Bellard - * H263+ support. + * H.263+ support. * Copyright (c) 2001 Juan J. Sierralta P * Copyright (c) 2002-2004 Michael Niedermayer * @@ -24,7 +24,7 @@ /** * @file - * h263 decoder. + * H.263 decoder. */ #include @@ -298,7 +298,7 @@ int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code) if (!s->h263_long_vectors) { val = sign_extend(val, 5 + f_code); } else { - /* horrible h263 long vector mode */ + /* horrible H.263 long vector mode */ if (pred < -31 && val < -63) val += 64; if (pred > 32 && val > 63) @@ -866,7 +866,7 @@ end: return SLICE_OK; } -/* most is hardcoded. should extend to handle all h263 streams */ +/* Most is hardcoded; should extend to handle all H.263 streams. */ int ff_h263_decode_picture_header(MpegEncContext *s) { int format, width, height, i, ret; @@ -900,8 +900,8 @@ int ff_h263_decode_picture_header(MpegEncContext *s) return -1; } if (get_bits1(&s->gb) != 0) { - av_log(s->avctx, AV_LOG_ERROR, "Bad H263 id\n"); - return -1; /* h263 id */ + av_log(s->avctx, AV_LOG_ERROR, "Bad H.263 id\n"); + return -1; /* H.263 id */ } skip_bits1(&s->gb); /* split screen off */ skip_bits1(&s->gb); /* camera off */ @@ -926,7 +926,7 @@ int ff_h263_decode_picture_header(MpegEncContext *s) s->h263_long_vectors = get_bits1(&s->gb); if (get_bits1(&s->gb) != 0) { - av_log(s->avctx, AV_LOG_ERROR, "H263 SAC not supported\n"); + av_log(s->avctx, AV_LOG_ERROR, "H.263 SAC not supported\n"); return -1; /* SAC: off */ } s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ @@ -1017,7 +1017,7 @@ int ff_h263_decode_picture_header(MpegEncContext *s) height = get_bits(&s->gb, 9) * 4; ff_dlog(s->avctx, "\nH.263+ Custom picture: %dx%d\n",width,height); if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { - /* aspected dimensions */ + /* expected dimensions */ s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8); s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8); }else{ diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index f9986a4ad7..a62d20253a 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -1,7 +1,7 @@ /* - * ITU H263 bitstream encoder + * ITU H.263 bitstream encoder * Copyright (c) 2000,2001 Fabrice Bellard - * H263+ support. + * H.263+ support. * Copyright (c) 2001 Juan J. Sierralta P * Copyright (c) 2002-2004 Michael Niedermayer * @@ -24,7 +24,7 @@ /** * @file - * h263 bitstream encoder. + * H.263 bitstream encoder. */ #include @@ -135,7 +135,7 @@ void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number) put_sbits(&s->pb, 8, temp_ref); /* TemporalReference */ put_bits(&s->pb, 1, 1); /* marker */ - put_bits(&s->pb, 1, 0); /* h263 id */ + put_bits(&s->pb, 1, 0); /* H.263 id */ put_bits(&s->pb, 1, 0); /* split screen off */ put_bits(&s->pb, 1, 0); /* camera off */ put_bits(&s->pb, 1, 0); /* freeze picture release off */ @@ -151,7 +151,7 @@ void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number) put_bits(&s->pb, 1, 0); /* Unrestricted Motion Vector: off */ put_bits(&s->pb, 1, 0); /* SAC: off */ put_bits(&s->pb, 1, s->obmc); /* Advanced Prediction */ - put_bits(&s->pb, 1, 0); /* only I/P frames, no PB frame */ + put_bits(&s->pb, 1, 0); /* only I/P-frames, no PB-frame */ put_bits(&s->pb, 5, s->qscale); put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */ } else { @@ -270,7 +270,7 @@ void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line) } /** - * modify qscale so that encoding is acually possible in h263 (limit difference to -2..2) + * modify qscale so that encoding is actually possible in H.263 (limit difference to -2..2) */ void ff_clean_h263_qscales(MpegEncContext *s){ int i; @@ -782,7 +782,7 @@ av_cold void ff_h263_encode_init(MpegEncContext *s) init_mv_penalty_and_fcode(s); } - s->me.mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p + s->me.mv_penalty= mv_penalty; // FIXME exact table for MSMPEG4 & H.263+ s->intra_ac_vlc_length =s->inter_ac_vlc_length = uni_h263_inter_rl_len; s->intra_ac_vlc_last_length=s->inter_ac_vlc_last_length= uni_h263_inter_rl_len + 128*64; @@ -792,7 +792,7 @@ av_cold void ff_h263_encode_init(MpegEncContext *s) } s->ac_esc_length= 7+1+6+8; - // use fcodes >1 only for mpeg4 & h263 & h263p FIXME + // use fcodes >1 only for MPEG-4 & H.263 & H.263+ FIXME switch(s->codec_id){ case AV_CODEC_ID_MPEG4: s->fcode_tab= fcode_tab; @@ -808,7 +808,7 @@ av_cold void ff_h263_encode_init(MpegEncContext *s) s->max_qcoeff= 127; } break; - //Note for mpeg4 & h263 the dc-scale table will be set per frame as needed later + // Note for MPEG-4 & H.263 the dc-scale table will be set per frame as needed later case AV_CODEC_ID_FLV1: if (s->h263_flv > 1) { s->min_qcoeff= -1023; diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c index 7d1278431b..bf0bec152a 100644 --- a/libavcodec/ivi_dsp.c +++ b/libavcodec/ivi_dsp.c @@ -22,7 +22,7 @@ /** * @file - * DSP functions (inverse transforms, motion compensation, wavelet recompostions) + * DSP functions (inverse transforms, motion compensation, wavelet recompositions) * for Indeo Video Interactive codecs. */ diff --git a/libavcodec/ivi_dsp.h b/libavcodec/ivi_dsp.h index 45c8a18086..ac9dcbcab6 100644 --- a/libavcodec/ivi_dsp.h +++ b/libavcodec/ivi_dsp.h @@ -22,7 +22,7 @@ /** * @file - * DSP functions (inverse transforms, motion compensations, wavelet recompostion) + * DSP functions (inverse transforms, motion compensations, wavelet recomposition) * for Indeo Video Interactive codecs. */ diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index f5a844f26e..ef5ffa6ae4 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -236,7 +236,7 @@ static void init_band_stepsize(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Unknown quantization format\n"); break; } - /* FIXME: In openjepg code stespize = stepsize * 0.5. Why? + /* FIXME: In OpenJPEG code stespize = stepsize * 0.5. Why? * If not set output of entropic decoder is not correct. */ if (!av_codec_is_encoder(avctx->codec)) band->f_stepsize *= 0.5; @@ -487,7 +487,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, else reslevel->nbands = 3; - /* Number of precincts wich span the tile for resolution level reslevelno + /* Number of precincts which span the tile for resolution level reslevelno * see B.6 in ISO/IEC 15444-1:2002 eq. B-16 * num_precincts_x = |- trx_1 / 2 ^ log2_prec_width) -| - (trx_0 / 2 ^ log2_prec_width) * num_precincts_y = |- try_1 / 2 ^ log2_prec_width) -| - (try_0 / 2 ^ log2_prec_width) diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 8131d27311..cb9b71e4cd 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -387,7 +387,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_freep(&state); /* the specification says that after doing 0xff escaping unused bits in - * the last byte must be set to 0, so just append 7 "optional" zero-bits + * the last byte must be set to 0, so just append 7 "optional" zero bits * to avoid special-casing. */ put_bits(&pb2, 7, 0); size = put_bits_count(&pb2); diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 98765fd491..55e10bce55 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -59,11 +59,11 @@ typedef struct LagarithContext { } LagarithContext; /** - * Compute the 52bit mantissa of 1/(double)denom. + * Compute the 52-bit mantissa of 1/(double)denom. * This crazy format uses floats in an entropy coder and we have to match x86 * rounding exactly, thus ordinary floats aren't portable enough. * @param denom denominator - * @return 52bit mantissa + * @return 52-bit mantissa * @see softfloat_mul */ static uint64_t softfloat_reciprocal(uint32_t denom) @@ -80,9 +80,9 @@ static uint64_t softfloat_reciprocal(uint32_t denom) /** * (uint32_t)(x*f), where f has the given mantissa, and exponent 0 * Used in combination with softfloat_reciprocal computes x/(double)denom. - * @param x 32bit integer factor + * @param x 32-bit integer factor * @param mantissa mantissa of f with exponent 0 - * @return 32bit integer value (x*f) + * @return 32-bit integer value (x*f) * @see softfloat_reciprocal */ static uint32_t softfloat_mul(uint32_t x, uint64_t mantissa) @@ -226,7 +226,7 @@ static void add_lag_median_prediction(uint8_t *dst, uint8_t *src1, int *left_top) { /* This is almost identical to add_hfyu_median_pred in huffyuvdsp.h. - * However the &0xFF on the gradient predictor yealds incorrect output + * However the &0xFF on the gradient predictor yields incorrect output * for lagarith. */ int i; diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index d813e90d47..27ab7d202f 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -1,6 +1,6 @@ /* * AMR Audio decoder stub - * Copyright (c) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * @@ -152,7 +152,7 @@ typedef struct AMR_bitrates { /* Match desired bitrate */ static int get_bitrate_mode(int bitrate, void *log_ctx) { - /* make the correspondance between bitrate and mode */ + /* make the correspondence between bitrate and mode */ static const AMR_bitrates rates[] = { { 4750, MR475 }, { 5150, MR515 }, { 5900, MR59 }, { 6700, MR67 }, { 7400, MR74 }, { 7950, MR795 }, { 10200, MR102 }, { 12200, MR122 } diff --git a/libavcodec/libopus.c b/libavcodec/libopus.c index b511415962..9a0d5b0428 100644 --- a/libavcodec/libopus.c +++ b/libavcodec/libopus.c @@ -2,20 +2,20 @@ * libopus encoder/decoder common code * Copyright (c) 2012 Nicolas George * - * This file is part of libav. + * This file is part of Libav. * - * libav is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * libav is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with libav; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/libavcodec/libopus.h b/libavcodec/libopus.h index b08257df4a..2334c84c12 100644 --- a/libavcodec/libopus.h +++ b/libavcodec/libopus.h @@ -2,20 +2,20 @@ * libopus encoder/decoder common code * Copyright (c) 2012 Nicolas George * - * This file is part of libav. + * This file is part of Libav. * - * libav is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * libav is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with libav; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index c2f748b944..c6e1573880 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -73,7 +73,7 @@ static av_cold int libopus_decode_init(AVCodecContext *avc) const uint8_t *vorbis_offset = ff_vorbis_channel_layout_offsets[avc->channels - 1]; int ch; - /* Remap channels from vorbis order to libav order */ + /* Remap channels from Vorbis order to libav order */ for (ch = 0; ch < avc->channels; ch++) mapping_arr[ch] = mapping[vorbis_offset[ch]]; mapping = mapping_arr; diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 08f0f28ac8..1fb597bd33 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -2,20 +2,20 @@ * Opus encoder using libopus * Copyright (c) 2012 Nathan Caldwell * - * This file is part of libav. + * This file is part of Libav. * - * libav is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * libav is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with libav; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index e7c158aeaf..bf03cb78fc 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -351,7 +351,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avctx, AVPacket *pkt, p_frame_output->key_frame = 1; /* Parse the coded frame number from the bitstream. Bytes 14 - * through 17 represesent the frame number. */ + * through 17 represent the frame number. */ p_frame_output->frame_num = AV_RB32(enc_buf->data + 13); ff_schro_queue_push_back(&p_schro_params->enc_frame_queue, diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 88e5d2fea4..f3a31e9879 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -215,7 +215,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (s->vad) speex_encoder_ctl(s->enc_state, SPEEX_SET_VAD, &s->vad); - /* Activiting Discontinuous Transmission */ + /* Activating Discontinuous Transmission */ if (s->dtx) { speex_encoder_ctl(s->enc_state, SPEEX_SET_DTX, &s->dtx); if (!(s->abr || s->vad || s->header.vbr)) diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 9ed9a50493..b329ed3b34 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -250,7 +250,7 @@ static av_cold int encode_init(AVCodecContext* avc_context) Output first header packet consisting of theora header, comment, and tables. - Each one is prefixed with a 16bit size, then they + Each one is prefixed with a 16-bit size, then they are concatenated together into libavcodec's extradata. */ offset = 0; diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index da3941b312..5fc904cd8f 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -1,6 +1,6 @@ /* * AMR Audio encoder stub - * Copyright (c) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * @@ -51,7 +51,7 @@ static const AVClass class = { static int get_wb_bitrate_mode(int bitrate, void *log_ctx) { - /* make the correspondance between bitrate and mode */ + /* make the correspondence between bitrate and mode */ static const int rates[] = { 6600, 8850, 12650, 14250, 15850, 18250, 19850, 23050, 23850 }; int i, best = -1, min_diff = 0; diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 49952f57ca..9cbe9c17fa 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -1,5 +1,5 @@ /* - * Interface to xvidcore for mpeg4 encoding + * Interface to xvidcore for MPEG-4 encoding * Copyright (c) 2004 Adam Thayer * * This file is part of Libav. @@ -74,7 +74,7 @@ struct xvid_context { int ssim_acc; /**< SSIM accuracy. 0: accurate. 4: fast. */ int gmc; int me_quality; /**< Motion estimation quality. 0: fast 6: best. */ - int mpeg_quant; /**< Quantization type. 0: H263, 1: MPEG */ + int mpeg_quant; /**< Quantization type. 0: H.263, 1: MPEG */ }; /** @@ -134,7 +134,7 @@ static int xvid_ff_2pass_create(xvid_plg_create_t *param, void **handle) * Destroy the two-pass plugin context. * * @param ref Context pointer for the plugin - * @param param Destrooy context + * @param param Destroy context * @return Returns 0, success guaranteed */ static int xvid_ff_2pass_destroy(struct xvid_context *ref, @@ -664,7 +664,7 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->extradata = NULL; avctx->extradata_size = 0; if (xvid_flags & AV_CODEC_FLAG_GLOBAL_HEADER) { - /* In this case, we are claiming to be MPEG4 */ + /* In this case, we are claiming to be MPEG-4 */ x->quicktime_format = 1; avctx->codec_id = AV_CODEC_ID_MPEG4; } else { diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 8a05aede62..982c87eb1d 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -32,7 +32,7 @@ void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, in { int i, j; - /* sort lsfq in ascending order. float bubble agorithm, + /* sort lsfq in ascending order. float bubble algorithm, O(n) if data already sorted, O(n^2) - otherwise */ for(i=0; i=0 && lsfq[j] > lsfq[j+1]; j--) diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h index 4b955678ee..1f9481c1dd 100644 --- a/libavcodec/lsp.h +++ b/libavcodec/lsp.h @@ -102,7 +102,7 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd * @param lp_half_order half the number of the amount of LPCs to be * reconstructed, need to be smaller or equal to MAX_LP_HALF_ORDER * - * @note buffers should have a minimux size of 2*lp_half_order elements. + * @note buffers should have a minimum size of 2*lp_half_order elements. * * TIA/EIA/IS-733 2.4.3.3.5 */ diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index d8fc9defa3..5625929680 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -140,9 +140,9 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) len = get_bits(&s->gb, 16) - 2; while (len >= 65) { - /* only 8 bit precision handled */ + /* only 8-bit precision handled */ if (get_bits(&s->gb, 4) != 0) { - av_log(s->avctx, AV_LOG_ERROR, "dqt: 16bit precision\n"); + av_log(s->avctx, AV_LOG_ERROR, "dqt: 16-bit precision\n"); return -1; } index = get_bits(&s->gb, 4); @@ -155,7 +155,7 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) s->quant_matrixes[index][j] = get_bits(&s->gb, 8); } - // XXX FIXME finetune, and perhaps add dc too + // XXX FIXME fine-tune, and perhaps add dc too s->qscale[index] = FFMAX(s->quant_matrixes[index][s->scantable.permutated[1]], s->quant_matrixes[index][s->scantable.permutated[8]]) >> 1; av_log(s->avctx, AV_LOG_DEBUG, "qscale[%d]: %d\n", @@ -1271,9 +1271,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) av_log(s->avctx, AV_LOG_INFO, "Pegasus lossless jpeg header found\n"); skip_bits(&s->gb, 16); /* version ? */ - skip_bits(&s->gb, 16); /* unknwon always 0? */ - skip_bits(&s->gb, 16); /* unknwon always 0? */ - skip_bits(&s->gb, 16); /* unknwon always 0? */ + skip_bits(&s->gb, 16); /* unknown always 0? */ + skip_bits(&s->gb, 16); /* unknown always 0? */ + skip_bits(&s->gb, 16); /* unknown always 0? */ switch (get_bits(&s->gb, 8)) { case 1: s->rgb = 1; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index aa4703a24d..b80a47bd61 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -68,7 +68,7 @@ typedef struct MJpegDecodeContext { int maxval; int near; ///< near lossless bound (si 0 for lossless) int t1,t2,t3; - int reset; ///< context halfing intervall ?rename + int reset; ///< context halfing interval ?rename int width, height; int mb_width, mb_height; diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index aa8697edc8..bbb0f0ebce 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -40,7 +40,7 @@ #include "put_bits.h" typedef struct MJpegContext { - uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing + uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chroma, for easier addressing uint16_t huff_code_dc_luminance[12]; uint8_t huff_size_dc_chrominance[12]; uint16_t huff_code_dc_chrominance[12]; diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 06ab421ba9..8a2ae133b6 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -40,9 +40,9 @@ typedef struct MLPHeaderInfo int group1_samplerate; ///< Sample rate of first substream int group2_samplerate; ///< Sample rate of second substream (MLP only) - int channel_modifier_thd_stream0; ///< Channel modifier for substream 0 of TrueHD sreams ("2-channel presentation") - int channel_modifier_thd_stream1; ///< Channel modifier for substream 1 of TrueHD sreams ("6-channel presentation") - int channel_modifier_thd_stream2; ///< Channel modifier for substream 2 of TrueHD sreams ("8-channel presentation") + int channel_modifier_thd_stream0; ///< Channel modifier for substream 0 of TrueHD streams ("2-channel presentation") + int channel_modifier_thd_stream1; ///< Channel modifier for substream 1 of TrueHD streams ("6-channel presentation") + int channel_modifier_thd_stream2; ///< Channel modifier for substream 2 of TrueHD streams ("8-channel presentation") int channels_mlp; ///< Channel count for MLP streams int channels_thd_stream1; ///< Channel count for substream 1 of TrueHD streams ("6-channel presentation") diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 718ea14021..193df7e07d 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -657,7 +657,7 @@ static int ffmmal_read_frame(AVCodecContext *avctx, AVFrame *frame, int *got_fra // being busy from decoder waiting for input. So just poll at the start and // keep feeding new data to the buffer. // We are pretty sure the decoder will produce output if we sent more input - // frames than what a h264 decoder could logically delay. This avoids too + // frames than what a H.264 decoder could logically delay. This avoids too // excessive buffering. // We also wait if we sent eos, but didn't receive it yet (think of decoding // stream with a very low number of frames). diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index aa8b3226f7..1c0116c754 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -202,7 +202,7 @@ static av_always_inline int cmp_inline(MpegEncContext *s, const int x, const int cx= (cx>>1)|(cx&1); cy= (cy>>1)|(cy&1); uvdxy= (cx&1) + 2*(cy&1); - //FIXME x/y wrong, but mpeg4 qpel is sick anyway, we should drop as much of it as possible in favor for h264 + // FIXME x/y wrong, but MPEG-4 qpel is sick anyway, we should drop as much of it as possible in favor for H.264 } }else{ c->hpel_put[size][dxy](c->temp, ref[0] + x + y*stride, stride, h); @@ -547,7 +547,7 @@ static inline void get_limits(MpegEncContext *s, int x, int y) c->xmax = - x + s->mb_width *16; c->ymax = - y + s->mb_height*16; } else if (s->out_format == FMT_H261){ - // Search range of H261 is different from other codec standards + // Search range of H.261 is different from other codec standards c->xmin = (x > 15) ? - 15 : 0; c->ymin = (y > 15) ? - 15 : 0; c->xmax = (x < s->mb_width * 16 - 16) ? 15 : 0; @@ -936,7 +936,7 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, if (s->out_format == FMT_H263) { c->pred_x = P_MEDIAN[0]; c->pred_y = P_MEDIAN[1]; - } else { /* mpeg1 at least */ + } else { /* MPEG-1 at least */ c->pred_x = P_LEFT[0]; c->pred_y = P_LEFT[1]; } @@ -1506,7 +1506,7 @@ void ff_estimate_b_frame_motion(MpegEncContext * s, dmin= direct_search(s, mb_x, mb_y); else dmin= INT_MAX; -//FIXME penalty stuff for non mpeg4 +// FIXME penalty stuff for non-MPEG-4 c->skip=0; fmin = estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code) + 3 * penalty_factor; diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index c7d873bc6d..c655e199b7 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -432,7 +432,7 @@ static av_always_inline int small_diamond_search(MpegEncContext * s, int *best, { /* ensure that the best point is in the MAP as h/qpel refinement needs it */ const unsigned key = (best[1]< xmin && best[1] < ymax && best[1] > ymin){ int d; - //ensure that the refernece samples for hpel refinement are in the map + // ensure that the reference samples for hpel refinement are in the map CHECK_MV(best[0]-1, best[1]) CHECK_MV(best[0]+1, best[1]) CHECK_MV(best[0], best[1]-1) @@ -872,7 +872,7 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int unsigned map_generation; int penalty_factor; const int ref_mv_stride= s->mb_stride; //pass as arg FIXME - const int ref_mv_xy= s->mb_x + s->mb_y*ref_mv_stride; //add to last_mv beforepassing FIXME + const int ref_mv_xy = s->mb_x + s->mb_y * ref_mv_stride; // add to last_mv before passing FIXME me_cmp_func cmpf, chroma_cmpf; LOAD_COMMON @@ -973,7 +973,7 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int return dmin; } -//this function is dedicated to the braindamaged gcc +//this function is dedicated to the brain damaged gcc int ff_epzs_motion_search(MpegEncContext *s, int *mx_ptr, int *my_ptr, int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], int ref_mv_scale, diff --git a/libavcodec/motionpixels_tablegen.c b/libavcodec/motionpixels_tablegen.c index 410b76fb05..2f0df3c1ab 100644 --- a/libavcodec/motionpixels_tablegen.c +++ b/libavcodec/motionpixels_tablegen.c @@ -1,5 +1,5 @@ /* - * Generate a header file for hardcoded motionpixels RGB to YUV table + * Generate a header file for hardcoded motion pixels RGB to YUV table * * Copyright (c) 2009 Reimar Döffinger * diff --git a/libavcodec/motionpixels_tablegen.h b/libavcodec/motionpixels_tablegen.h index e6c32c7dec..2d0c0ffcde 100644 --- a/libavcodec/motionpixels_tablegen.h +++ b/libavcodec/motionpixels_tablegen.h @@ -1,5 +1,5 @@ /* - * Header file for hardcoded motionpixels RGB to YUV table + * Header file for hardcoded motion pixels RGB to YUV table * * Copyright (c) 2009 Reimar Döffinger * diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index c0a86b60bc..17f0b781e6 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -1,5 +1,5 @@ /* - * MPEG1/2 common code + * MPEG-1/2 common code * Copyright (c) 2007 Aurelien Jacobs * * This file is part of Libav. diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c index ccc3d2deb9..46e797f3c5 100644 --- a/libavcodec/mpeg12data.c +++ b/libavcodec/mpeg12data.c @@ -1,5 +1,5 @@ /* - * MPEG1/2 tables + * MPEG-1/2 tables * copyright (c) 2000,2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer * @@ -22,7 +22,7 @@ /** * @file - * MPEG1/2 tables. + * MPEG-1/2 tables. */ #include "mpeg12data.h" diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index 633a2915e6..c6750b8109 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -1,5 +1,5 @@ /* - * MPEG1/2 tables + * MPEG-1/2 tables * copyright (c) 2000,2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer * @@ -22,7 +22,7 @@ /** * @file - * MPEG1/2 tables. + * MPEG-1/2 tables. */ #ifndef AVCODEC_MPEG12DATA_H diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 6e1db1e803..2d9c99d63f 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -698,7 +698,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) if (get_bits1(&s->gb) == 0) { if (get_bits1(&s->gb) == 0) { av_log(s->avctx, AV_LOG_ERROR, - "invalid mb type in I Frame at %d %d\n", + "Invalid mb type in I-frame at %d %d\n", s->mb_x, s->mb_y); return AVERROR_INVALIDDATA; } @@ -711,7 +711,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) mb_type = get_vlc2(&s->gb, ff_mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1); if (mb_type < 0) { av_log(s->avctx, AV_LOG_ERROR, - "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y); + "Invalid mb type in P-frame at %d %d\n", s->mb_x, s->mb_y); return AVERROR_INVALIDDATA; } mb_type = ptype2mb_type[mb_type]; @@ -720,7 +720,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) mb_type = get_vlc2(&s->gb, ff_mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1); if (mb_type < 0) { av_log(s->avctx, AV_LOG_ERROR, - "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y); + "Invalid mb type in B-frame at %d %d\n", s->mb_x, s->mb_y); return AVERROR_INVALIDDATA; } mb_type = btype2mb_type[mb_type]; @@ -1882,7 +1882,7 @@ FF_ENABLE_DEPRECATION_WARNINGS int i; if (s->pict_type == AV_PICTURE_TYPE_I) { av_log(s->avctx, AV_LOG_ERROR, - "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); + "skipped MB in I-frame at %d %d\n", s->mb_x, s->mb_y); return AVERROR_INVALIDDATA; } @@ -2183,7 +2183,7 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, int cc_count = 0; int i; // There is a caption count field in the data, but it is often - // incorect. So count the number of captions present. + // incorrect. So count the number of captions present. for (i = 5; i + 6 <= buf_size && ((p[i] & 0xfe) == 0xfe); i += 6) cc_count++; // Transform the DVD format into A53 Part 4 format diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 78605c5f69..103f3aaa77 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1,5 +1,5 @@ /* - * MPEG1/2 encoder + * MPEG-1/2 encoder * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer * @@ -22,7 +22,7 @@ /** * @file - * MPEG1/2 encoder + * MPEG-1/2 encoder */ #include @@ -136,12 +136,12 @@ static av_cold int encode_init(AVCodecContext *avctx) if (find_frame_rate_index(s) < 0) { if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { - av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n", + av_log(avctx, AV_LOG_ERROR, "MPEG-1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num); return -1; } else { av_log(avctx, AV_LOG_INFO, - "MPEG1/2 does not support %d/%d fps, there may be AV sync issues\n", + "MPEG-1/2 does not support %d/%d fps, there may be AV sync issues\n", avctx->time_base.den, avctx->time_base.num); } } @@ -214,7 +214,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) if (s->current_picture.f->key_frame) { AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; - /* mpeg1 header repeated every gop */ + /* MPEG-1 header repeated every GOP */ put_header(s, SEQ_START_CODE); put_sbits(&s->pb, 12, s->width); @@ -375,7 +375,7 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) AVFrameSideData *side_data; mpeg1_encode_sequence_header(s); - /* mpeg1 picture header */ + /* MPEG-1 picture header */ put_header(s, PICTURE_START_CODE); /* temporal reference */ diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h index f15bebf9b5..bb854b0839 100644 --- a/libavcodec/mpeg12vlc.h +++ b/libavcodec/mpeg12vlc.h @@ -1,5 +1,5 @@ /* - * MPEG1/2 VLC + * MPEG-1/2 VLC * copyright (c) 2000,2001 Fabrice Bellard * copyright (c) 2002-2004 Michael Niedermayer * @@ -22,7 +22,7 @@ /** * @file - * MPEG1/2 VLC. + * MPEG-1/2 VLC. */ #ifndef AVCODEC_MPEG12VLC_H diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index 87bb5391b1..b428a5e6cc 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -1,6 +1,6 @@ /* * copyright (c) 2000,2001 Fabrice Bellard - * H263+ support + * H.263+ support * copyright (c) 2002-2004 Michael Niedermayer * * This file is part of Libav. @@ -22,7 +22,7 @@ /** * @file - * mpeg4 tables. + * MPEG-4 tables. */ #ifndef AVCODEC_MPEG4DATA_H @@ -31,7 +31,7 @@ #include #include "mpegvideo.h" -/* dc encoding for mpeg4 */ +/* dc encoding for MPEG-4 */ const uint8_t ff_mpeg4_DCtab_lum[13][2] = { {3,3}, {3,2}, {2,2}, {2,3}, {1,3}, {1,4}, {1,5}, {1,6}, {1,7}, diff --git a/libavcodec/mpeg4video.c b/libavcodec/mpeg4video.c index e37aafab38..b60cd4fd8a 100644 --- a/libavcodec/mpeg4video.c +++ b/libavcodec/mpeg4video.c @@ -1,5 +1,5 @@ /* - * MPEG4 decoder / encoder common code. + * MPEG-4 decoder / encoder common code * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2002-2010 Michael Niedermayer * @@ -57,7 +57,7 @@ void ff_mpeg4_clean_buffers(MpegEncContext *s) memset(s->ac_val[2] + c_xy, 0, (c_wrap + 1) * 16 * sizeof(int16_t)); /* clean MV */ - // we can't clear the MVs as they might be needed by a b frame + // we can't clear the MVs as they might be needed by a B-frame s->last_mv[0][0][0] = s->last_mv[0][0][1] = s->last_mv[1][0][0] = @@ -67,7 +67,7 @@ void ff_mpeg4_clean_buffers(MpegEncContext *s) #define tab_size ((signed)FF_ARRAY_ELEMS(s->direct_scale_mv[0])) #define tab_bias (tab_size / 2) -// used by mpeg4 and rv10 decoder +// used by MPEG-4 and rv10 decoder void ff_mpeg4_init_direct_mv(MpegEncContext *s) { int i; diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 867449b195..4a4995e219 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -1,5 +1,5 @@ /* - * MPEG4 encoder/decoder internal header. + * MPEG-4 encoder/decoder internal header. * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2002-2010 Michael Niedermayer * @@ -102,7 +102,7 @@ typedef struct Mpeg4DecContext { int cplx_estimation_trash_b; } Mpeg4DecContext; -/* dc encoding for mpeg4 */ +/* dc encoding for MPEG-4 */ extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index 246bb9ca4e..e2203f9de1 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -1,5 +1,5 @@ /* - * MPEG4 Video frame extraction + * MPEG-4 video frame extraction * Copyright (c) 2003 Fabrice Bellard * Copyright (c) 2003 Michael Niedermayer * diff --git a/libavcodec/mpeg4video_parser.h b/libavcodec/mpeg4video_parser.h index 0f56e7fd9e..030a276865 100644 --- a/libavcodec/mpeg4video_parser.h +++ b/libavcodec/mpeg4video_parser.h @@ -1,5 +1,5 @@ /* - * MPEG4 video parser prototypes + * MPEG-4 video parser prototypes * Copyright (c) 2003 Fabrice Bellard * Copyright (c) 2003 Michael Niedermayer * diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index ac9bb40b31..40d281bea7 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1,5 +1,5 @@ /* - * MPEG4 decoder. + * MPEG-4 decoder * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2002-2010 Michael Niedermayer * @@ -202,7 +202,7 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g while ((1 << alpha) < w) alpha++; while ((1 << beta) < h) - beta++; /* typo in the mpeg4 std for the definition of w' and h' */ + beta++; /* typo in the MPEG-4 std for the definition of w' and h' */ w2 = 1 << alpha; h2 = 1 << beta; @@ -225,7 +225,7 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g /* sprite_ref[3][0] = (a >> 1) * (2 * vop_ref[3][0] + d[0][0] + d[1][0] + d[2][0] + d[3][0]); * sprite_ref[3][1] = (a >> 1) * (2 * vop_ref[3][1] + d[0][1] + d[1][1] + d[2][1] + d[3][1]); */ - /* this is mostly identical to the mpeg4 std (and is totally unreadable + /* This is mostly identical to the MPEG-4 std (and is totally unreadable * because of that...). Perhaps it should be reordered to be more readable. * The idea behind this virtual_ref mess is to be able to use shifts later * per pixel instead of divides so the distance between points is converted @@ -1419,7 +1419,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) ff_thread_await_progress(&s->next_picture_ptr->tf, s->mb_y, 0); } - /* if we skipped it in the future P Frame than skip it now too */ + /* if we skipped it in the future P-frame than skip it now too */ s->mb_skipped = s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]; // Note, skiptab=0 if last was GMC if (s->mb_skipped) { @@ -1709,7 +1709,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) } } else { /* is setting low delay flag only once the smartest thing to do? - * low delay detection won't be overriden. */ + * low delay detection will not be overridden. */ if (s->picture_number == 0) s->low_delay = 0; } @@ -1765,7 +1765,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) s->interlaced_dct = 0; if (!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO)) av_log(s->avctx, AV_LOG_INFO, /* OBMC Disable */ - "MPEG4 OBMC not supported (very likely buggy encoder)\n"); + "MPEG-4 OBMC not supported (very likely buggy encoder)\n"); if (vo_ver_id == 1) ctx->vol_sprite_usage = get_bits1(gb); /* vol_sprite_usage */ else @@ -1892,7 +1892,7 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) ctx->cplx_estimation_trash_i += 8 * get_bits1(gb); /* intra_cae */ ctx->cplx_estimation_trash_i += 8 * get_bits1(gb); /* inter_cae */ ctx->cplx_estimation_trash_i += 8 * get_bits1(gb); /* no_update */ - ctx->cplx_estimation_trash_i += 8 * get_bits1(gb); /* upampling */ + ctx->cplx_estimation_trash_i += 8 * get_bits1(gb); /* upsampling */ } if (!get_bits1(gb)) { ctx->cplx_estimation_trash_i += 8 * get_bits1(gb); /* intra_blocks */ @@ -2022,7 +2022,7 @@ static int decode_user_data(Mpeg4DecContext *ctx, GetBitContext *gb) s->divx_packed = e == 3 && last == 'p'; if (s->divx_packed && !ctx->showed_packed_warning) { av_log(s->avctx, AV_LOG_WARNING, - "Invalid and inefficient vfw-avi packed B frames detected\n"); + "Invalid and inefficient vfw-avi packed B-frames detected\n"); ctx->showed_packed_warning = 1; } } @@ -2138,7 +2138,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) if (s->pp_time <= s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time <= 0) { - /* messed up order, maybe after seeking? skipping current b-frame */ + /* messed up order, maybe after seeking? skipping current B-frame */ return FRAME_SKIPPED; } ff_mpeg4_init_direct_mv(s); @@ -2237,7 +2237,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) s->chroma_qscale = s->qscale = get_bits(gb, s->quant_precision); if (s->qscale == 0) { av_log(s->avctx, AV_LOG_ERROR, - "Error, header damaged or not MPEG4 header (qscale=0)\n"); + "Error, header damaged or not MPEG-4 header (qscale=0)\n"); return -1; // makes no sense to continue, as there is nothing left from the image then } @@ -2245,7 +2245,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) s->f_code = get_bits(gb, 3); /* fcode_for */ if (s->f_code == 0) { av_log(s->avctx, AV_LOG_ERROR, - "Error, header damaged or not MPEG4 header (f_code=0)\n"); + "Error, header damaged or not MPEG-4 header (f_code=0)\n"); return -1; // makes no sense to continue, as there is nothing left from the image then } } else @@ -2285,7 +2285,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) } } /* detect buggy encoders which don't set the low_delay flag - * (divx4/xvid/opendivx). Note we cannot detect divx5 without b-frames + * (divx4/xvid/opendivx). Note we cannot detect divx5 without B-frames * easily (although it's buggy too) */ if (s->vo_type == 0 && ctx->vol_control_parameters == 0 && ctx->divx_version == -1 && s->picture_number == 0) { @@ -2308,7 +2308,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) } /** - * Decode mpeg4 headers. + * Decode MPEG-4 headers. * @return <0 if no VOP found (or a damaged one) * FRAME_SKIPPED if a not coded VOP is found * 0 if a VOP is found @@ -2491,7 +2491,7 @@ int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size) Mpeg4DecContext *ctx = avctx->priv_data; MpegEncContext *s = &ctx->m; - /* divx 5.01+ bistream reorder stuff */ + /* divx 5.01+ bitstream reorder stuff */ if (s->divx_packed) { int current_pos = get_bits_count(&s->gb) >> 3; int startcode_found = 0; @@ -2590,7 +2590,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } s->h263_pred = 1; - s->low_delay = 0; /* default, might be overriden in the vol header during header parsing */ + s->low_delay = 0; /* default, might be overridden in the vol header during header parsing */ s->decode_mb = mpeg4_decode_mb; ctx->time_increment_bits = 4; /* default value for broken headers */ diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index db7d3ad46b..b694935bb2 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1,5 +1,5 @@ /* - * MPEG4 encoder. + * MPEG-4 encoder * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2002-2010 Michael Niedermayer * @@ -29,7 +29,7 @@ #include "mpeg4video.h" /* The uni_DCtab_* tables below contain unified bits+length tables to encode DC - * differences in mpeg4. Unified in the sense that the specification specifies + * differences in MPEG-4. Unified in the sense that the specification specifies * this encoding in several steps. */ static uint8_t uni_DCtab_lum_len[512]; static uint8_t uni_DCtab_chrom_len[512]; @@ -47,7 +47,7 @@ static uint8_t uni_mpeg4_inter_rl_len[64 * 64 * 2 * 2]; //#define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 * 64 + (run) + (level) * 64) #define UNI_MPEG4_ENC_INDEX(last, run, level) ((last) * 128 * 64 + (run) * 128 + (level)) -/* mpeg4 +/* MPEG-4 * inter * max level: 24/6 * max run: 53/63 @@ -120,7 +120,7 @@ static inline void restore_ac_coeffs(MpegEncContext *s, int16_t block[6][64], } /** - * Return the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4. + * Return the optimal value (0 or 1) for the ac_pred element for the given MB in MPEG-4. * This function will also update s->block_last_index and s->ac_val. * @param[in,out] block MB coefficients, these will be updated if 1 is returned * @param[in] dir ac prediction direction for each 8x8 block @@ -208,7 +208,7 @@ static inline int decide_ac_pred(MpegEncContext *s, int16_t block[6][64], } /** - * modify mb_type & qscale so that encoding is acually possible in mpeg4 + * modify mb_type & qscale so that encoding is actually possible in MPEG-4 */ void ff_clean_mpeg4_qscales(MpegEncContext *s) { @@ -220,7 +220,7 @@ void ff_clean_mpeg4_qscales(MpegEncContext *s) if (s->pict_type == AV_PICTURE_TYPE_B) { int odd = 0; /* ok, come on, this isn't funny anymore, there's more code for - * handling this mpeg4 mess than for the actual adaptive quantization */ + * handling this MPEG-4 mess than for the actual adaptive quantization */ for (i = 0; i < s->mb_num; i++) { int mb_xy = s->mb_index2xy[i]; @@ -318,7 +318,7 @@ static inline void mpeg4_encode_block(MpegEncContext *s, const int last_index = s->block_last_index[n]; if (s->mb_intra) { // Note gcc (3.2.1 at least) will optimize this away - /* mpeg4 based DC predictor */ + /* MPEG-4 based DC predictor */ mpeg4_encode_dc(dc_pb, intra_dc, n); if (last_index < 1) return; @@ -378,7 +378,7 @@ static int mpeg4_get_block_length(MpegEncContext *s, int len = 0; if (s->mb_intra) { // Note gcc (3.2.1 at least) will optimize this away - /* mpeg4 based DC predictor */ + /* MPEG-4 based DC predictor */ len += mpeg4_get_dc_length(intra_dc, n); if (last_index < 1) return len; @@ -529,7 +529,7 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], assert((s->dquant & 1) == 0); assert(mb_type >= 0); - /* nothing to do if this MB was skipped in the next P Frame */ + /* nothing to do if this MB was skipped in the next P-frame */ if (s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { // FIXME avoid DCT & ... s->skip_count++; s->mv[0][0][0] = @@ -659,7 +659,7 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], if ((cbp | motion_x | motion_y | s->dquant) == 0 && s->mv_type == MV_TYPE_16X16) { - /* check if the B frames can skip it too, as we must skip it + /* Check if the B-frames can skip it too, as we must skip it * if we skip here why didn't they just compress * the skip-mb bits instead of reusing them ?! */ if (s->max_b_frames > 0) { @@ -876,7 +876,7 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], } /** - * add mpeg4 stuffing bits (01...1) + * add MPEG-4 stuffing bits (01...1) */ void ff_mpeg4_stuffing(PutBitContext *pbc) { @@ -1045,7 +1045,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, put_bits(&s->pb, 2, 0); /* sprite enable */ put_bits(&s->pb, 1, 0); /* not 8 bit == false */ - put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/ + put_bits(&s->pb, 1, s->mpeg_quant); /* quant type = (0 = H.263 style) */ if (s->mpeg_quant) { ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix); @@ -1076,7 +1076,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, } } -/* write mpeg4 VOP header */ +/* write MPEG-4 VOP header */ void ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number) { int time_incr; diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 820a7ae938..2518387162 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1397,7 +1397,7 @@ static int mp_decode_layer3(MPADecodeContext *s) uint8_t *sc; int slen, slen1, slen2; - /* MPEG1 scale factors */ + /* MPEG-1 scale factors */ slen1 = slen_table[0][g->scalefac_compress]; slen2 = slen_table[1][g->scalefac_compress]; ff_dlog(s->avctx, "slen1=%d slen2=%d\n", slen1, slen2); diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h index df829c14d6..089a508c4e 100644 --- a/libavcodec/mpegaudiodecheader.h +++ b/libavcodec/mpegaudiodecheader.h @@ -52,7 +52,7 @@ typedef struct MPADecodeHeader { that the frame size must be computed externally */ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header); -/* useful helper to get mpeg audio stream infos. Return -1 if error in +/* useful helper to get MPEG audio stream info. Return -1 if error in header, otherwise the coded frame size in bytes */ int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate); diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index 7b0261f2cc..2be8b7fd4c 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -583,7 +583,7 @@ static void compute_bit_allocation(MpegAudioContext *s, } /* - * Output the mpeg audio layer 2 frame. Note how the code is small + * Output the MPEG audio layer 2 frame. Note how the code is small * compared to other encoders :-) */ static void encode_frame(MpegAudioContext *s, @@ -598,7 +598,7 @@ static void encode_frame(MpegAudioContext *s, /* header */ put_bits(p, 12, 0xfff); - put_bits(p, 1, 1 - s->lsf); /* 1 = mpeg1 ID, 0 = mpeg2 lsf ID */ + put_bits(p, 1, 1 - s->lsf); /* 1 = MPEG-1 ID, 0 = MPEG-2 lsf ID */ put_bits(p, 2, 4-2); /* layer 2 */ put_bits(p, 1, 1); /* no error protection */ put_bits(p, 4, s->bitrate_index); diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index f3a9dd05af..1d9544b482 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -59,8 +59,8 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, int alloc_size = FFALIGN(FFABS(linesize) + 32, 32); // edge emu needs blocksize + filter length - 1 - // (= 17x17 for halfpel / 21x21 for h264) - // VC1 computes luma and chroma simultaneously and needs 19X19 + 9x9 + // (= 17x17 for halfpel / 21x21 for H.264) + // VC-1 computes luma and chroma simultaneously and needs 19X19 + 9x9 // at uvlinesize. It supports only YUV420 so 24x24 is enough // linesize * interlaced * MBsize FF_ALLOCZ_OR_GOTO(avctx, sc->edge_emu_buffer, alloc_size * 2 * 24, diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 5974e18b95..230154f02c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -61,7 +61,7 @@ static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, block[0] = block[0] * s->y_dc_scale; else block[0] = block[0] * s->c_dc_scale; - /* XXX: only mpeg1 */ + /* XXX: only MPEG-1 */ quant_matrix = s->intra_matrix; for(i=1;i<=nCoeffs;i++) { int j= s->intra_scantable.permutated[i]; @@ -529,7 +529,7 @@ do {\ s->next_p_frame_damaged = s1->next_p_frame_damaged; s->workaround_bugs = s1->workaround_bugs; - // MPEG4 timing info + // MPEG-4 timing info memcpy(&s->last_time_base, &s1->last_time_base, (char *) &s1->pb_field_time + sizeof(s1->pb_field_time) - (char *) &s1->last_time_base); @@ -555,7 +555,7 @@ do {\ AV_INPUT_BUFFER_PADDING_SIZE); } - // linesize dependend scratch buffer allocation + // linesize-dependent scratch buffer allocation if (!s->sc.edge_emu_buffer) if (s1->linesize) { if (ff_mpeg_framesize_alloc(s->avctx, &s->me, @@ -570,7 +570,7 @@ do {\ return AVERROR_BUG; } - // MPEG2/interlacing info + // MPEG-2/interlacing info memcpy(&s->progressive_sequence, &s1->progressive_sequence, (char *) &s1->rtp_mode - (char *) &s1->progressive_sequence); @@ -630,7 +630,7 @@ static int init_context_frame(MpegEncContext *s) mb_array_size = s->mb_height * s->mb_stride; mv_table_size = (s->mb_height + 2) * s->mb_stride + 1; - /* set default edge pos, will be overriden + /* set default edge pos, will be overridden * in decode_header if needed */ s->h_edge_pos = s->mb_width * 16; s->v_edge_pos = s->mb_height * 16; @@ -649,7 +649,7 @@ static int init_context_frame(MpegEncContext *s) yc_size = y_size + 2 * c_size; FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num + 1) * sizeof(int), - fail); // error ressilience code looks cleaner with this + fail); // error resilience code looks cleaner with this for (y = 0; y < s->mb_height; y++) for (x = 0; x < s->mb_width; x++) s->mb_index2xy[x + y * s->mb_width] = x + y * s->mb_stride; @@ -749,7 +749,7 @@ static int init_context_frame(MpegEncContext *s) /* init macroblock skip table */ FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size + 2, fail); - // Note the + 1 is for a quicker mpeg4 slice_end detection + // Note the + 1 is for a quicker MPEG-4 slice_end detection return ff_mpeg_er_init(s); fail: @@ -1063,7 +1063,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) } /* release forgotten pictures */ - /* if (mpeg124/h263) */ + /* if (MPEG-124 / H.263) */ for (i = 0; i < MAX_PICTURE_COUNT; i++) { if (&s->picture[i] != s->last_picture_ptr && &s->picture[i] != s->next_picture_ptr && @@ -1236,8 +1236,8 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) } /* set dequantizer, we can't do it during init as - * it might change for mpeg4 and we can't do it in the header - * decode as init is not called for mpeg4 there yet */ + * it might change for MPEG-4 and we can't do it in the header + * decode as init is not called for MPEG-4 there yet */ if (s->mpeg_quant || s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 2fd0dc2d8a..932a6f2b34 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -79,16 +79,16 @@ typedef struct MpegEncContext { int y_dc_scale, c_dc_scale; int ac_pred; int block_last_index[12]; ///< last non zero coefficient in block - int h263_aic; ///< Advanded INTRA Coding (AIC) + int h263_aic; ///< Advanced INTRA Coding (AIC) /* scantables */ - ScanTable inter_scantable; ///< if inter == intra then intra should be used to reduce tha cache usage + ScanTable inter_scantable; ///< if inter == intra then intra should be used to reduce the cache usage ScanTable intra_scantable; ScanTable intra_h_scantable; ScanTable intra_v_scantable; /* WARNING: changes above this line require updates to hardcoded - * offsets used in asm. */ + * offsets used in ASM. */ struct AVCodecContext *avctx; /* the following parameters must be initialized before encoding */ @@ -97,20 +97,20 @@ typedef struct MpegEncContext { int intra_only; ///< if true, only intra pictures are generated int bit_rate; ///< wanted bit rate enum OutputFormat out_format; ///< output format - int h263_pred; ///< use mpeg4/h263 ac/dc predictions - int pb_frame; ///< PB frame mode (0 = none, 1 = base, 2 = improved) + int h263_pred; ///< use MPEG-4/H.263 ac/dc predictions + int pb_frame; ///< PB-frame mode (0 = none, 1 = base, 2 = improved) /* the following codec id fields are deprecated in favor of codec_id */ - int h263_plus; ///< h263 plus headers - int h263_flv; ///< use flv h263 header + int h263_plus; ///< H.263+ headers + int h263_flv; ///< use flv H.263 header enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */ int fixed_qscale; ///< fixed qscale if non zero int encoding; ///< true if we are encoding (vs decoding) - int max_b_frames; ///< max number of b-frames for encoding + int max_b_frames; ///< max number of B-frames for encoding int luma_elim_threshold; int chroma_elim_threshold; - int strict_std_compliance; ///< strictly follow the std (MPEG4, ...) + int strict_std_compliance; ///< strictly follow the std (MPEG-4, ...) int workaround_bugs; ///< workaround bugs in encoders which cannot be detected automatically int codec_tag; ///< internal codec_tag upper case converted from avctx codec_tag /* the following fields are managed internally by the encoder */ @@ -130,7 +130,7 @@ typedef struct MpegEncContext { ptrdiff_t uvlinesize; ///< line size, for chroma in bytes, may be different from width Picture *picture; ///< main picture buffer Picture **input_picture; ///< next pictures on display order for encoding - Picture **reordered_input_picture; ///< pointer to the next pictures in codedorder for encoding + Picture **reordered_input_picture; ///< pointer to the next pictures in coded order for encoding int64_t user_specified_pts; ///< last non-zero pts from AVFrame which was passed into avcodec_encode_video2() /** @@ -177,19 +177,19 @@ typedef struct MpegEncContext { Picture *last_picture_ptr; ///< pointer to the previous picture. Picture *next_picture_ptr; ///< pointer to the next picture (for bidir pred) Picture *current_picture_ptr; ///< pointer to the current picture - int last_dc[3]; ///< last DC values for MPEG1 + int last_dc[3]; ///< last DC values for MPEG-1 int16_t *dc_val_base; - int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous + int16_t *dc_val[3]; ///< used for MPEG-4 DC prediction, all 3 arrays must be continuous const uint8_t *y_dc_scale_table; ///< qscale -> y_dc_scale table const uint8_t *c_dc_scale_table; ///< qscale -> c_dc_scale table - const uint8_t *chroma_qscale_table; ///< qscale -> chroma_qscale (h263) + const uint8_t *chroma_qscale_table; ///< qscale -> chroma_qscale (H.263) uint8_t *coded_block_base; uint8_t *coded_block; ///< used for coded block pattern prediction (msmpeg4v3, wmv1) int16_t (*ac_val_base)[16]; - int16_t (*ac_val[3])[16]; ///< used for for mpeg4 AC prediction, all 3 arrays must be continuous + int16_t (*ac_val[3])[16]; ///< used for for MPEG-4 AC prediction, all 3 arrays must be continuous int mb_skipped; ///< MUST BE SET only during DECODING uint8_t *mbskip_table; /**< used to avoid copy if macroblock skipped (for black regions for example) - and used for b-frame encoding & decoding (contains skip table of next P Frame) */ + and used for B-frame encoding & decoding (contains skip table of next P-frame) */ uint8_t *mbintra_table; ///< used to avoid setting {ac, dc, cbp}-pred stuff to zero on inter MB decoding uint8_t *cbp_table; ///< used to store cbp, ac_pred for partitioned decoding uint8_t *pred_dir_table; ///< used to store pred_dir for partitioned decoding @@ -198,14 +198,14 @@ typedef struct MpegEncContext { int qscale; ///< QP int chroma_qscale; ///< chroma QP - unsigned int lambda; ///< lagrange multipler used in rate distortion + unsigned int lambda; ///< Lagrange multiplier used in rate distortion unsigned int lambda2; ///< (lambda*lambda) >> FF_LAMBDA_SHIFT int *lambda_table; int adaptive_quant; ///< use adaptive quantization int dquant; ///< qscale difference to prev qscale int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... int last_pict_type; //FIXME removes - int last_non_b_pict_type; ///< used for mpeg4 gmc b-frames & ratecontrol + int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol int droppable; int frame_rate_index; int last_lambda_for[5]; ///< last lambda for a specific pict type @@ -213,7 +213,7 @@ typedef struct MpegEncContext { /* motion compensation */ int unrestricted_mv; ///< mv can point outside of the coded picture - int h263_long_vectors; ///< use horrible h263v1 long vector mode + int h263_long_vectors; ///< use horrible H.263v1 long vector mode BlockDSPContext bdsp; FDCTDSPContext fdsp; @@ -227,7 +227,7 @@ typedef struct MpegEncContext { VideoDSPContext vdsp; H263DSPContext h263dsp; int f_code; ///< forward MV resolution - int b_code; ///< backward MV resolution for B Frames (mpeg4) + int b_code; ///< backward MV resolution for B-frames (MPEG-4) int16_t (*p_mv_table_base)[2]; int16_t (*b_forw_mv_table_base)[2]; int16_t (*b_back_mv_table_base)[2]; @@ -236,14 +236,14 @@ typedef struct MpegEncContext { int16_t (*b_direct_mv_table_base)[2]; int16_t (*p_field_mv_table_base[2][2])[2]; int16_t (*b_field_mv_table_base[2][2][2])[2]; - int16_t (*p_mv_table)[2]; ///< MV table (1MV per MB) p-frame encoding - int16_t (*b_forw_mv_table)[2]; ///< MV table (1MV per MB) forward mode b-frame encoding - int16_t (*b_back_mv_table)[2]; ///< MV table (1MV per MB) backward mode b-frame encoding - int16_t (*b_bidir_forw_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding - int16_t (*b_bidir_back_mv_table)[2]; ///< MV table (1MV per MB) bidir mode b-frame encoding - int16_t (*b_direct_mv_table)[2]; ///< MV table (1MV per MB) direct mode b-frame encoding - int16_t (*p_field_mv_table[2][2])[2]; ///< MV table (2MV per MB) interlaced p-frame encoding - int16_t (*b_field_mv_table[2][2][2])[2];///< MV table (4MV per MB) interlaced b-frame encoding + int16_t (*p_mv_table)[2]; ///< MV table (1MV per MB) P-frame encoding + int16_t (*b_forw_mv_table)[2]; ///< MV table (1MV per MB) forward mode B-frame encoding + int16_t (*b_back_mv_table)[2]; ///< MV table (1MV per MB) backward mode B-frame encoding + int16_t (*b_bidir_forw_mv_table)[2]; ///< MV table (1MV per MB) bidir mode B-frame encoding + int16_t (*b_bidir_back_mv_table)[2]; ///< MV table (1MV per MB) bidir mode B-frame encoding + int16_t (*b_direct_mv_table)[2]; ///< MV table (1MV per MB) direct mode B-frame encoding + int16_t (*p_field_mv_table[2][2])[2]; ///< MV table (2MV per MB) interlaced P-frame encoding + int16_t (*b_field_mv_table[2][2][2])[2];///< MV table (4MV per MB) interlaced B-frame encoding uint8_t (*p_field_select_table[2]); uint8_t (*b_field_select_table[2][2]); #if FF_API_MOTION_EST @@ -255,10 +255,10 @@ typedef struct MpegEncContext { int mv_dir; #define MV_DIR_FORWARD 1 #define MV_DIR_BACKWARD 2 -#define MV_DIRECT 4 ///< bidirectional mode where the difference equals the MV of the last P/S/I-Frame (mpeg4) +#define MV_DIRECT 4 ///< bidirectional mode where the difference equals the MV of the last P/S/I-Frame (MPEG-4) int mv_type; #define MV_TYPE_16X16 0 ///< 1 vector for the whole mb -#define MV_TYPE_8X8 1 ///< 4 vectors (h263, mpeg4 4MV) +#define MV_TYPE_8X8 1 ///< 4 vectors (H.263, MPEG-4 4MV) #define MV_TYPE_16X8 2 ///< 2 vectors, one per 16x8 block #define MV_TYPE_FIELD 3 ///< 2 vectors, one per field #define MV_TYPE_DMV 4 ///< 2 vectors, special mpeg2 Dual Prime Vectors @@ -269,14 +269,14 @@ typedef struct MpegEncContext { */ int mv[2][4][2]; int field_select[2][2]; - int last_mv[2][2][2]; ///< last MV, used for MV prediction in MPEG1 & B-frame MPEG4 + int last_mv[2][2][2]; ///< last MV, used for MV prediction in MPEG-1 & B-frame MPEG-4 uint8_t *fcode_tab; ///< smallest fcode needed for each MV int16_t direct_scale_mv[2][64]; ///< precomputed to avoid divisions in ff_mpeg4_set_direct_mv MotionEstContext me; - int no_rounding; /**< apply no rounding to motion compensation (MPEG4, msmpeg4, ...) - for b-frames rounding mode is always 0 */ + int no_rounding; /**< apply no rounding to motion compensation (MPEG-4, msmpeg4, ...) + for B-frames rounding mode is always 0 */ /* macroblock layer */ int mb_x, mb_y; @@ -345,7 +345,7 @@ typedef struct MpegEncContext { int resync_mb_y; ///< y position of last resync marker GetBitContext last_resync_gb; ///< used to search for the next resync marker int mb_num_left; ///< number of MBs left in this video packet (for partitioned Slices only) - int next_p_frame_damaged; ///< set if the next p frame is damaged, to avoid showing trashed b frames + int next_p_frame_damaged; ///< set if the next p frame is damaged, to avoid showing trashed B-frames ParseContext parse_context; @@ -359,7 +359,7 @@ typedef struct MpegEncContext { int rc_strategy; /* H.263+ specific */ - int umvplus; ///< == H263+ && unrestricted_mv + int umvplus; ///< == H.263+ && unrestricted_mv int h263_aic_dir; ///< AIC direction: 0 = left, 1 = top int h263_slice_structured; int alt_inter_vlc; ///< alternative inter vlc @@ -367,7 +367,7 @@ typedef struct MpegEncContext { int loop_filter; int custom_pcf; - /* mpeg4 specific */ + /* MPEG-4 specific */ ///< number of bits to represent the fractional part of time (encoder only) int time_increment_bits; int last_time_base; @@ -388,12 +388,12 @@ typedef struct MpegEncContext { int sprite_warping_accuracy; int data_partitioning; ///< data partitioning flag from header int partitioned_frame; ///< is current frame partitioned - int low_delay; ///< no reordering needed / has no b-frames + int low_delay; ///< no reordering needed / has no B-frames int vo_type; PutBitContext tex_pb; ///< used for data partitioned VOPs PutBitContext pb2; ///< used for data partitioned VOPs int mpeg_quant; - int padding_bug_score; ///< used to detect the VERY common padding bug in MPEG4 + int padding_bug_score; ///< used to detect the VERY common padding bug in MPEG-4 /* divx specific, used to workaround (many) bugs in divx5 */ int divx_packed; @@ -416,7 +416,7 @@ typedef struct MpegEncContext { int dc_table_index; int use_skip_mb_code; int slice_height; ///< in macroblocks - int first_slice_line; ///< used in mpeg4 too to handle resync markers + int first_slice_line; ///< used in MPEG-4 too to handle resync markers int flipflop_rounding; int msmpeg4_version; ///< 0=not msmpeg4, 1=mp41, 2=mp42, 3=mp43/divx3 4=wmv1/7 5=wmv2/8 int per_mb_rl_table; @@ -430,9 +430,9 @@ typedef struct MpegEncContext { /* decompression specific */ GetBitContext gb; - /* Mpeg1 specific */ - int gop_picture_number; ///< index of the first picture of a GOP based on fake_pic_num & mpeg1 specific - int last_mv_dir; ///< last mv_dir, used for b frame encoding + /* MPEG-1 specific */ + int gop_picture_number; ///< index of the first picture of a GOP based on fake_pic_num & MPEG-1 specific + int last_mv_dir; ///< last mv_dir, used for B-frame encoding uint8_t *vbv_delay_ptr; ///< pointer to vbv_delay in the bitstream /* MPEG-2-specific - I wished not to have to support this mess. */ @@ -493,9 +493,9 @@ typedef struct MpegEncContext { int16_t *block/*align 16*/, int n, int qscale); void (*dct_unquantize_h263_inter)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale); - void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both) + void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) int16_t *block/*align 16*/, int n, int qscale); - void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both) + void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) int16_t *block/*align 16*/, int n, int qscale); int (*dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow); int (*fast_dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow); @@ -506,7 +506,7 @@ typedef struct MpegEncContext { /** * ratecontrol qmin qmax limiting method - * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax. + * 0-> clipping, 1-> use a nice continuous function to limit qscale within qmin/qmax. */ float rc_qsquish; float rc_qmod_amp; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 96f49ef4c9..17cdb87f2c 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -439,7 +439,7 @@ FF_ENABLE_DEPRECATION_WARNINGS s->codec_id != AV_CODEC_ID_MPEG4 && s->codec_id != AV_CODEC_ID_MPEG1VIDEO && s->codec_id != AV_CODEC_ID_MPEG2VIDEO) { - av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n"); + av_log(avctx, AV_LOG_ERROR, "B-frames not supported by codec\n"); return -1; } @@ -508,7 +508,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } if (s->max_b_frames != 0) { av_log(avctx, AV_LOG_ERROR, - "b frames cannot be used with low delay\n"); + "B-frames cannot be used with low delay\n"); return -1; } } @@ -850,7 +850,7 @@ FF_ENABLE_DEPRECATION_WARNINGS s->intra_matrix[j] = s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; } else { - /* mpeg1/2 */ + /* MPEG-1/2 */ s->intra_matrix[j] = ff_mpeg1_default_intra_matrix[i]; s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; } @@ -1158,7 +1158,7 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) return ret; pic->f->display_picture_number = display_picture_number; - pic->f->pts = pts; // we set this here to avoid modifiying pic_arg + pic->f->pts = pts; // we set this here to avoid modifying pic_arg } else { /* Flushing: When we have not received enough input frames, * ensure s->input_picture[0] contains the first picture */ @@ -1370,7 +1370,7 @@ static int select_input_picture(MpegEncContext *s) if (s->frame_skip_threshold || s->frame_skip_factor) { if (s->picture_in_gop_number < s->gop_size && skip_check(s, s->input_picture[0], s->next_picture_ptr)) { - // FIXME check that te gop check above is +-1 correct + // FIXME check that the gop check above is +-1 correct av_frame_unref(s->input_picture[0]->f); emms_c(); @@ -1438,7 +1438,7 @@ static int select_input_picture(MpegEncContext *s) if (s->input_picture[b_frames]->f->pict_type == AV_PICTURE_TYPE_B && b_frames == s->max_b_frames) { av_log(s->avctx, AV_LOG_ERROR, - "warning, too many b frames in a row\n"); + "warning, too many B-frames in a row\n"); } if (s->picture_in_gop_number + b_frames >= s->gop_size) { @@ -1482,7 +1482,7 @@ no_output_pic: return ret; if (s->reordered_input_picture[0]->shared || s->avctx->rc_buffer_size) { - // input is a shared pix, so we can't modifiy it -> alloc a new + // input is a shared pix, so we can't modify it -> allocate a new // one & ensure that the shared one is reuseable Picture *pic; @@ -1827,7 +1827,7 @@ FF_ENABLE_DEPRECATION_WARNINGS s->frame_bits = put_bits_count(&s->pb); } - /* update mpeg1/2 vbv_delay for CBR */ + /* update MPEG-1/2 vbv_delay for CBR */ if (s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1 && @@ -2396,7 +2396,7 @@ static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster than a loop? - /* mpeg1 */ + /* MPEG-1 */ d->mb_skip_run= s->mb_skip_run; for(i=0; i<3; i++) d->last_dc[i] = s->last_dc[i]; @@ -2425,7 +2425,7 @@ static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext * memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster than a loop? - /* mpeg1 */ + /* MPEG-1 */ d->mb_skip_run= s->mb_skip_run; for(i=0; i<3; i++) d->last_dc[i] = s->last_dc[i]; @@ -3264,7 +3264,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ff_mpv_decode_mb(s, s->block); } - /* clean the MV table in IPS frames for direct mode in B frames */ + /* clean the MV table in IPS frames for direct mode in B-frames */ if(s->mb_intra /* && I,P,S_TYPE */){ s->p_mv_table[xy][0]=0; s->p_mv_table[xy][1]=0; @@ -3420,7 +3420,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->me.mb_var_sum_temp = s->me.mc_mb_var_sum_temp = 0; - /* we need to initialize some time vars before we can encode b-frames */ + /* we need to initialize some time vars before we can encode B-frames */ // RAL: Condition added for MPEG1VIDEO if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || s->codec_id == AV_CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->msmpeg4_version)) set_frame_distances(s); @@ -3795,7 +3795,7 @@ static int dct_quantize_trellis_c(MpegEncContext *s, if(s->out_format == FMT_H263){ unquant_coeff= alevel*qmul + qadd; - }else{ //MPEG1 + } else { // MPEG-1 j = s->idsp.idct_permutation[scantable[i]]; // FIXME: optimize if(s->mb_intra){ unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3; @@ -3865,7 +3865,7 @@ static int dct_quantize_trellis_c(MpegEncContext *s, score_tab[i+1]= best_score; - //Note: there is a vlc code in mpeg4 which is 1 bit shorter then another one with a shorter run and the same level + // Note: there is a vlc code in MPEG-4 which is 1 bit shorter then another one with a shorter run and the same level if(last_non_zero <= 27){ for(; survivor_count; survivor_count--){ if(score_tab[ survivor[survivor_count-1] ] <= best_score) @@ -3885,7 +3885,8 @@ static int dct_quantize_trellis_c(MpegEncContext *s, last_score= 256*256*256*120; for(i= survivor[0]; i<=last_non_zero + 1; i++){ int score= score_tab[i]; - if(i) score += lambda*2; //FIXME exacter? + if (i) + score += lambda * 2; // FIXME more exact? if(score < last_score){ last_score= score; @@ -3916,7 +3917,7 @@ static int dct_quantize_trellis_c(MpegEncContext *s, if(s->out_format == FMT_H263){ unquant_coeff= (alevel*qmul + qadd)>>3; - }else{ //MPEG1 + } else { // MPEG-1 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; unquant_coeff = (unquant_coeff - 1) | 1; } @@ -4039,7 +4040,7 @@ static int messed_sign=0; #endif dc += (1<<(RECON_SHIFT-1)); for(i=0; i<64; i++){ - rem[i]= dc - (orig[i]< * diff --git a/libavcodec/mqc.h b/libavcodec/mqc.h index a65433e2b2..63261927c6 100644 --- a/libavcodec/mqc.h +++ b/libavcodec/mqc.h @@ -50,7 +50,7 @@ typedef struct MqcState { /** * Initialize MQ-decoder. * @param mqc MQ decoder state - * @param bp byte poiter + * @param bp byte pointer */ void ff_mqc_initdec(MqcState *mqc, uint8_t *bp); @@ -58,7 +58,7 @@ void ff_mqc_initdec(MqcState *mqc, uint8_t *bp); * MQ decoder. * @param mqc MQ decoder state * @param cxstate Context - * @return Decision (0 ot 1) + * @return Decision (0 to 1) */ int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate); diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 94bd86e0e3..3ab3bd5334 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -39,14 +39,14 @@ #include "vc1data.h" /* - * You can also call this codec : MPEG4 with a twist ! + * You can also call this codec: MPEG-4 with a twist! * * TODO: * - (encoding) select best mv table (two choices) * - (encoding) select best vlc/dc table */ -/* This table is practically identical to the one from h263 +/* This table is practically identical to the one from H.263 * except that it is inverted. */ static av_cold void init_h263_dc_for_msmpeg4(void) { @@ -67,7 +67,7 @@ static av_cold void init_h263_dc_for_msmpeg4(void) else l= level; - /* luminance h263 */ + /* luminance H.263 */ uni_code= ff_mpeg4_DCtab_lum[size][0]; uni_len = ff_mpeg4_DCtab_lum[size][1]; uni_code ^= (1<> 1)), scale); } #endif - /* XXX: WARNING: they did not choose the same test as MPEG4. This + /* XXX: WARNING: they did not choose the same test as MPEG-4. This is very important ! */ if(s->msmpeg4_version>3){ if(s->inter_intra_pred){ diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 67a8609cdd..1c55558545 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -69,7 +69,7 @@ static VLC v2_mb_type_vlc; static VLC v2_mv_vlc; VLC ff_inter_intra_vlc; -/* This is identical to h263 except that its range is multiplied by 2. */ +/* This is identical to H.263 except that its range is multiplied by 2. */ static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code) { int code, val, sign, shift; @@ -565,7 +565,7 @@ int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size) } else { - av_log(s->avctx, AV_LOG_ERROR, "I frame too long, ignoring ext header\n"); + av_log(s->avctx, AV_LOG_ERROR, "I-frame too long, ignoring ext header\n"); } return 0; diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 631c167811..21e38f9856 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -236,8 +236,8 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) } s->dc_table_index = 1; - s->mv_table_index = 1; /* only if P frame */ - s->use_skip_mb_code = 1; /* only if P frame */ + s->mv_table_index = 1; /* only if P-frame */ + s->use_skip_mb_code = 1; /* only if P-frame */ s->per_mb_rl_table = 0; if(s->msmpeg4_version==4) s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE && s->pict_type==AV_PICTURE_TYPE_P); @@ -577,9 +577,8 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr } } -/* Encoding of a block. Very similar to MPEG4 except for a different - escape coding (same as H263) and more vlc tables. - */ +/* Encoding of a block; very similar to MPEG-4 except for a different + * escape coding (same as H.263) and more VLC tables. */ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n) { int level, run, last, i, j, last_index; diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index e262f92c41..a7838ab790 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -1,6 +1,6 @@ /* * Microsoft RLE video decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index d56c56f479..37ea32df70 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -1,6 +1,6 @@ /* * Microsoft Video-1 Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 9db85fd93d..92c1fdaf90 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -174,7 +174,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, // codec data (rtjpeg quant tables) if (buf[0] == 'D' && buf[1] == 'R') { int ret; - // skip rest of the frameheader. + // Skip the rest of the frame header. buf = &buf[12]; buf_size -= 12; ret = get_quant(avctx, c, buf, buf_size); @@ -201,7 +201,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, keyframe = 1; break; } - // skip rest of the frameheader. + // Skip the rest of the frame header. buf = &buf[12]; buf_size -= 12; if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 4d17f989e6..54f030baf5 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -295,7 +295,7 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) ret = nvenc_check_cap(avctx, NV_ENC_CAPS_NUM_MAX_BFRAMES); if (ret < avctx->max_b_frames) { - av_log(avctx, AV_LOG_VERBOSE, "Max b-frames %d exceed %d\n", + av_log(avctx, AV_LOG_VERBOSE, "Max B-frames %d exceed %d\n", avctx->max_b_frames, ret); return AVERROR(ENOSYS); @@ -715,8 +715,8 @@ static int nvenc_setup_encoder(AVCodecContext *avctx) if (avctx->max_b_frames > 0) { /* 0 is intra-only, * 1 is I/P only, - * 2 is one B Frame, - * 3 two B frames, and so on. */ + * 2 is one B-Frame, + * 3 two B-frames, and so on. */ ctx->config.frameIntervalP = avctx->max_b_frames + 1; } else if (avctx->max_b_frames == 0) { ctx->config.frameIntervalP = 1; @@ -804,7 +804,7 @@ static int nvenc_alloc_surface(AVCodecContext *avctx, int idx) out_buffer.version = NV_ENC_CREATE_BITSTREAM_BUFFER_VER; /* 1MB is large enough to hold most output frames. - * NVENC increases this automaticaly if it's not enough. */ + * NVENC increases this automatically if it is not enough. */ out_buffer.size = BITSTREAM_BUFFER_SIZE; out_buffer.memoryHeap = NV_ENC_MEMORY_HEAP_SYSMEM_UNCACHED; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index c8f0745a19..866099789c 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -129,7 +129,7 @@ typedef struct NVENCContext { enum AVPixelFormat data_pix_fmt; /* timestamps of the first two frames, for computing the first dts - * when b-frames are present */ + * when B-frames are present */ int64_t initial_pts[2]; int first_packet_output; diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 7a5157e31b..1f886d1f1a 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -92,7 +92,7 @@ static const AVCodecDefault defaults[] = { AVCodec ff_h264_nvenc_encoder = { .name = "h264_nvenc", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H264 encoder"), + .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .init = ff_nvenc_encode_init, @@ -123,7 +123,7 @@ static const AVClass nvenc_h264_old_class = { AVCodec ff_nvenc_h264_encoder = { .name = "nvenc_h264", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H264 encoder"), + .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .init = nvenc_old_init, diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 01920cbd0c..961ff86764 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -690,7 +690,7 @@ static av_cold int omx_encode_init(AVCodecContext *avctx) goto fail; } if (avctx->codec->id == AV_CODEC_ID_H264) { - // For H264, the extradata can be returned in two separate buffers + // For H.264, the extradata can be returned in two separate buffers // (the videocore encoder on raspberry pi does this); // therefore check that we have got both SPS and PPS before continuing. int nals[32] = { 0 }; @@ -847,7 +847,7 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (buffer->nFlags & OMX_BUFFERFLAG_ENDOFFRAME) { ret = pkt->size; pkt->pts = av_rescale_q(from_omx_ticks(buffer->nTimeStamp), AV_TIME_BASE_Q, avctx->time_base); - // We don't currently enable b-frames for the encoders, so set + // We don't currently enable B-frames for the encoders, so set // pkt->dts = pkt->pts. (The calling code behaves worse if the encoder // doesn't set the dts). pkt->dts = pkt->pts; @@ -897,7 +897,7 @@ static const AVClass omx_mpeg4enc_class = { }; AVCodec ff_mpeg4_omx_encoder = { .name = "mpeg4_omx", - .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL MPEG4 video encoder"), + .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL MPEG-4 video encoder"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG4, .priv_data_size = sizeof(OMXCodecContext), @@ -918,7 +918,7 @@ static const AVClass omx_h264enc_class = { }; AVCodec ff_h264_omx_encoder = { .name = "h264_omx", - .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL H264 video encoder"), + .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL H.264 video encoder"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(OMXCodecContext), diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index c22c96d6f0..d2f6269201 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -113,7 +113,7 @@ static const AVOption avcodec_options[] = { {"qmin", "minimum video quantizer scale (VBR)", OFFSET(qmin), AV_OPT_TYPE_INT, {.i64 = 2 }, -1, 69, V|E}, {"qmax", "maximum video quantizer scale (VBR)", OFFSET(qmax), AV_OPT_TYPE_INT, {.i64 = 31 }, -1, 69, V|E}, {"qdiff", "maximum difference between the quantizer scales (VBR)", OFFSET(max_qdiff), AV_OPT_TYPE_INT, {.i64 = 3 }, INT_MIN, INT_MAX, V|E}, -{"bf", "use 'frames' B frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E}, +{"bf", "use 'frames' B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E}, {"b_qfactor", "QP factor between P- and B-frames", OFFSET(b_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, #if FF_API_RC_STRATEGY {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 1bc417b477..8e896dd5d4 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -264,7 +264,7 @@ int ff_opus_parse_packet(OpusPacket *pkt, const uint8_t *buf, int buf_size, } else { pkt->mode = OPUS_MODE_CELT; pkt->bandwidth = (pkt->config - 16) >> 2; - /* skip mediumband */ + /* skip medium band */ if (pkt->bandwidth) pkt->bandwidth++; } @@ -396,7 +396,7 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - /* check that we din't see this index yet */ + /* check that we did not see this index yet */ map->copy = 0; for (j = 0; j < i; j++) if (channel_map[channel_reorder(channels, j)] == idx) { diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 744b720c73..62aacf829a 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -32,7 +32,7 @@ typedef struct PCMDVDContext { uint32_t last_header; // Cached header to see if parsing is needed int block_size; // Size of a block of samples in bytes int samples_per_block; // Number of samples per channel per block - int groups_per_block; // Number of 20/24bit sample groups per block + int groups_per_block; // Number of 20/24-bit sample groups per block uint8_t *extra_samples; // Pointer to leftover samples from a frame int extra_sample_count; // Number of leftover samples in the buffer } PCMDVDContext; @@ -102,7 +102,7 @@ static int pcm_dvd_parse_header(AVCodecContext *avctx, const uint8_t *header) avctx->sample_rate * avctx->bits_per_coded_sample; - /* 4 samples form a group in 20/24bit PCM on DVD Video. + /* 4 samples form a group in 20/24-bit PCM on DVD Video. * A block is formed by the number of groups that are * needed to complete a set of samples for each channel. */ if (avctx->bits_per_coded_sample == 16) { diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index b52bf602e5..a6ab665624 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -639,7 +639,7 @@ skip_tag: } } exit_loop: - /* handle p-frames only if a predecessor frame is available */ + /* handle P-frames only if a predecessor frame is available */ if (s->prev->data[0]) { if (!(avpkt->flags & AV_PKT_FLAG_KEY)) { int i, j; diff --git a/libavcodec/pthread_internal.h b/libavcodec/pthread_internal.h index 5dfd0b2a26..fca9b100c0 100644 --- a/libavcodec/pthread_internal.h +++ b/libavcodec/pthread_internal.h @@ -21,7 +21,7 @@ #include "avcodec.h" -/* H264 slice threading seems to be buggy with more than 16 threads, +/* H.264 slice threading seems to be buggy with more than 16 threads, * limit the number of threads to 16 for automatic detection */ #define MAX_AUTO_THREADS 16 diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index 2eeefb8b4a..e9e73475c3 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -600,7 +600,7 @@ static qcelp_packet_rate buf_size2bitrate(const int buf_size) * * @param avctx the AV codec context * @param buf_size length of the buffer - * @param buf the bufffer + * @param buf the buffer * * @return the bitrate on success, * I_F_Q if the bitrate cannot be satisfactorily determined diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index bbd57124fa..b33e7c64c3 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -392,7 +392,7 @@ static int qdm2_get_se_vlc(VLC *vlc, GetBitContext *gb, int depth) /** * QDM2 checksum * - * @param data pointer to data to be checksum'ed + * @param data pointer to data to be checksummed * @param length data length * @param value checksum value * @@ -1947,7 +1947,7 @@ static int qdm2_decode(QDM2Context *q, const uint8_t *in, int16_t *out) q->sub_packet = (q->sub_packet + 1) % 16; - /* clip and convert output float[] to 16bit signed samples */ + /* clip and convert output float[] to 16-bit signed samples */ for (i = 0; i < frame_size; i++) { int value = (int)q->output_buffer[i]; diff --git a/libavcodec/qsvdec_mpeg2.c b/libavcodec/qsvdec_mpeg2.c index 5827ce4741..c319ac0df1 100644 --- a/libavcodec/qsvdec_mpeg2.c +++ b/libavcodec/qsvdec_mpeg2.c @@ -1,5 +1,5 @@ /* - * Intel MediaSDK QSV based MPEG2 decoder + * Intel MediaSDK QSV based MPEG-2 decoder * * copyright (c) 2015 Anton Khirnov * diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index d88144fede..70440d35d7 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -1,6 +1,6 @@ /* * Quicktime Animation (RLE) Video Decoder - * Copyright (C) 2004 the ffmpeg project + * Copyright (C) 2004 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index bfd988af5b..67c88e1960 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -130,7 +130,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui /* We will use it to compute the best bulk copy sequence */ unsigned int bulkcount; - /* This will be the number of pixels equal to the preivous frame one's + /* This will be the number of pixels equal to the previous frame one's * starting from the ith pixel */ unsigned int skipcount; /* This will be the number of consecutive equal pixels in the current @@ -214,7 +214,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui prev_line -= s->pixel_size; } - /* Good ! Now we have the best sequence for this line, let's ouput it */ + /* Good! Now we have the best sequence for this line, let's output it. */ /* We do a special case for the first pixel so that we avoid testing it in * the whole loop */ diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 355baddf33..ccaa149b0a 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -1,6 +1,6 @@ /* * Real Audio 1.0 (14.4K) - * Copyright (c) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index 81d6964abc..89d4fb5e02 100644 --- a/libavcodec/ra144.h +++ b/libavcodec/ra144.h @@ -1,6 +1,6 @@ /* * Real Audio 1.0 (14.4K) - * Copyright (c) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 1d1498bd32..678e6684ba 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -128,7 +128,7 @@ static void orthogonalize(float *v, const float *u) /** * Calculate match score and gain of an LPC-filtered vector with respect to - * input data, possibly othogonalizing it to up to 2 other vectors + * input data, possibly orthogonalizing it to up to two other vectors. * * @param work array used to calculate the filtered vector * @param coefs coefficients of the LPC filter @@ -229,8 +229,8 @@ static int adaptive_cb_search(const int16_t *adapt_cb, float *work, /** * Find the best vector of a fixed codebook by applying an LPC filter to - * codebook entries, possibly othogonalizing them to up to 2 other vectors and - * matching the results with input data + * codebook entries, possibly orthogonalizing them to up to two other vectors + * and matching the results with input data. * * @param work array used to calculate the filtered vectors * @param coefs coefficients of the LPC filter diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index a306231129..a9f1045301 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -1,6 +1,6 @@ /* * RealAudio 2.0 (28.8K) - * Copyright (c) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index 9f4beebbcf..3d6ed8d45f 100644 --- a/libavcodec/ra288.h +++ b/libavcodec/ra288.h @@ -1,6 +1,6 @@ /* * RealAudio 2.0 (28.8K) - * Copyright (c) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index c0eac6daf4..47a1490d02 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -175,8 +175,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!rcc->entry) return AVERROR(ENOMEM); - /* init all to skipped p frames - * (with b frames we might have a not encoded frame at the end FIXME) */ + /* init all to skipped P-frames + * (with B-frames we might have a not encoded frame at the end FIXME) */ for (i = 0; i < rcc->num_entries; i++) { RateControlEntry *rce = &rcc->entry[i]; @@ -196,7 +196,7 @@ FF_ENABLE_DEPRECATION_WARNINGS next = strchr(p, ';'); if (next) { - (*next) = 0; // sscanf in unbelievably slow on looong strings // FIXME copy / do not write + (*next) = 0; // sscanf is unbelievably slow on looong strings // FIXME copy / do not write next++; } e = sscanf(p, " in:%d ", &picture_number); @@ -638,9 +638,9 @@ static void adaptive_quantization(MpegEncContext *s, double q) int mb_distance; float mb_factor = 0.0; if (spat_cplx < 4) - spat_cplx = 4; // FIXME finetune + spat_cplx = 4; // FIXME fine-tune if (temp_cplx < 4) - temp_cplx = 4; // FIXME finetune + temp_cplx = 4; // FIXME fine-tune if ((s->mb_type[mb_xy] & CANDIDATE_MB_TYPE_INTRA)) { // FIXME hq mode cplx = spat_cplx; diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index 63ebeb2586..3bcf38eb08 100644 --- a/libavcodec/ratecontrol.h +++ b/libavcodec/ratecontrol.h @@ -68,7 +68,7 @@ typedef struct RateControlContext{ double short_term_qsum; ///< sum of recent qscales double short_term_qcount; ///< count of recent qscales double pass1_rc_eq_output_sum;///< sum of the output of the rc equation, this is used for normalization - double pass1_wanted_bits; ///< bits which should have been outputed by the pass1 code (including complexity init) + double pass1_wanted_bits; ///< bits which should have been output by the pass1 code (including complexity init) double last_qscale; double last_qscale_for[5]; ///< last qscale for a specific pict type, used for max_diff & ipb factor stuff int last_mc_mb_var_sum; diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h index 73e8b0abd1..616a637712 100644 --- a/libavcodec/rectangle.h +++ b/libavcodec/rectangle.h @@ -64,7 +64,7 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, *(uint32_t*)(p + 2*stride)= v; *(uint32_t*)(p + 3*stride)= v; }else if(w==8){ - //gcc can't optimize 64bit math on x86_32 + // gcc cannot optimize 64-bit math on x86_32 #if HAVE_FAST_64BIT const uint64_t v= size==2 ? val*0x0001000100010001ULL : val*0x0100000001ULL; *(uint64_t*)(p + 0*stride)= v; diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index ba539e7d3a..c42a1cd007 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -53,7 +53,7 @@ typedef struct Rl2Context { * @param s rl2 context * @param in input buffer * @param size input buffer size - * @param out ouput buffer + * @param out output buffer * @param stride stride of the output buffer * @param video_base offset of the rle data inside the frame */ diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index f7b32f5430..4f778dc98a 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 32dabae09c..eb021668a7 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1080,7 +1080,7 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } enc->out_buf = pkt->data; - /* Check for I frame */ + /* Check for I-frame */ if (enc->framesSinceKeyframe == avctx->gop_size) enc->framesSinceKeyframe = 0; diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index d1c959d6e1..f3f3fbcdfe 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -1,6 +1,6 @@ /* * Quicktime Video (RPZA) Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * @@ -92,7 +92,7 @@ static int rpza_decode_stream(RpzaContext *s) av_log(s->avctx, AV_LOG_ERROR, "First chunk byte is 0x%02x instead of 0xe1\n", bytestream2_peek_byte(&s->gb)); - /* Get chunk size, ingnoring first byte */ + /* Get chunk size, ignoring first byte */ chunk_size = bytestream2_get_be32(&s->gb) & 0x00FFFFFF; /* If length mismatch use size from MOV file and try to decode anyway */ diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 29a46399e2..3b5f4df084 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -265,7 +265,7 @@ static int rv10_decode_picture_header(MpegEncContext *s) ff_dlog(s->avctx, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); if (pb_frame) { - avpriv_request_sample(s->avctx, "pb frame"); + avpriv_request_sample(s->avctx, "PB-frame"); return AVERROR_PATCHWELCOME; } @@ -413,7 +413,7 @@ static int rv20_decode_picture_header(RVDecContext *rv) if (s->pp_time <= s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time <= 0) { av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible " - "from seeking? skipping current b frame\n"); + "from seeking? skipping current B-frame\n"); return FRAME_SKIPPED; } ff_mpeg4_init_direct_mv(s); diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 9f4f7380c3..765c57d16a 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -39,7 +39,7 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, 1, (s->pict_type == AV_PICTURE_TYPE_P)); - put_bits(&s->pb, 1, 0); /* not PB frame */ + put_bits(&s->pb, 1, 0); /* not PB-mframe */ put_bits(&s->pb, 5, s->qscale); diff --git a/libavcodec/rv30data.h b/libavcodec/rv30data.h index 5ee304802c..079204dd7a 100644 --- a/libavcodec/rv30data.h +++ b/libavcodec/rv30data.h @@ -58,7 +58,7 @@ static const uint8_t rv30_itype_code[9*9*2] = { * * This is really a three-dimensional matrix with dimensions * [-1..9][-1..9][0..9]. The first and second coordinates are - * detemined by the top and left neighbors (-1 if unavailable). + * determined by the top and left neighbors (-1 if unavailable). */ static const uint8_t rv30_itype_from_context[900] = { 0, 9, 9, 9, 9, 9, 9, 9, 9, diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 6c0a4a3b3b..5fa71d87c8 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -215,7 +215,7 @@ static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table) } /** - * Get one coefficient value from the bistream and store it. + * Get one coefficient value from the bitstream and store it. */ static inline void decode_coeff(int16_t *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q) { @@ -1464,7 +1464,7 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int return s->mb_y == s->mb_height; } -/** @} */ // recons group end +/** @} */ // reconstruction group end /** * Initialize decoder. diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h index c32c089cdd..0ac24bfaba 100644 --- a/libavcodec/rv34.h +++ b/libavcodec/rv34.h @@ -101,12 +101,12 @@ typedef struct RV34DecContext{ int is16; ///< current block has additional 16x16 specific features or not int dmv[4][2]; ///< differential motion vectors for the current macroblock - int rv30; ///< indicates which RV variasnt is currently decoded + int rv30; ///< indicates which RV variant is currently decoded int rpr; ///< one field size in RV30 slice header int cur_pts, last_pts, next_pts; int scaled_weight; - int weight1, weight2; ///< B frame distance fractions (0.14) used in motion compensation + int weight1, weight2; ///< B-frame distance fractions (0.14) used in motion compensation int mv_weight1, mv_weight2; uint16_t *cbp_luma; ///< CBP values for luma subblocks diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index 819bd600fb..eae0ae72e5 100644 --- a/libavcodec/screenpresso.c +++ b/libavcodec/screenpresso.c @@ -47,7 +47,7 @@ typedef struct ScreenpressoContext { AVFrame *current; - /* zlib interation */ + /* zlib interaction */ uint8_t *inflated_buf; uLongf inflated_size; } ScreenpressoContext; diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c index 171ae08254..9a5e38ac71 100644 --- a/libavcodec/simple_idct_template.c +++ b/libavcodec/simple_idct_template.c @@ -25,10 +25,8 @@ * simpleidct in C. */ -/* - based upon some outcommented c code from mpeg2dec (idct_mmx.c - written by Aaron Holtzman ) - */ +/* Based upon some commented-out C code from mpeg2dec (idct_mmx.c + * written by Aaron Holtzman ). */ #include "simple_idct.h" diff --git a/libavcodec/smc.c b/libavcodec/smc.c index b91e410196..92e522bc79 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -1,6 +1,6 @@ /* * Quicktime Graphics (SMC) Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/sp5x.h b/libavcodec/sp5x.h index 1577302e3c..090662b56d 100644 --- a/libavcodec/sp5x.h +++ b/libavcodec/sp5x.h @@ -1,6 +1,6 @@ /* * Sunplus JPEG tables - * Copyright (c) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c index 545df80974..b9922a7a7c 100644 --- a/libavcodec/svq1.c +++ b/libavcodec/svq1.c @@ -4,7 +4,7 @@ * ported to libavcodec by Nick Kurshev * * Copyright (C) 2002 the xine project - * Copyright (C) 2002 the ffmpeg project + * Copyright (C) 2002 The FFmpeg project * * SVQ1 Encoder (c) 2004 Mike Melanson * diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h index 70b5c37be2..988a0a098d 100644 --- a/libavcodec/svq1.h +++ b/libavcodec/svq1.h @@ -4,7 +4,7 @@ * ported to libavcodec by Nick Kurshev * * Copyright (C) 2002 the xine project - * Copyright (C) 2002 the ffmpeg project + * Copyright (C) 2002 The FFmpeg project * * SVQ1 Encoder (c) 2004 Mike Melanson * diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h index e22cd60e23..396cdf7b39 100644 --- a/libavcodec/svq1_cb.h +++ b/libavcodec/svq1_cb.h @@ -4,7 +4,7 @@ * ported to libavcodec by Nick Kurshev * * Copyright (C) 2002 the xine project - * Copyright (C) 2002 the ffmpeg project + * Copyright (C) 2002 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/svq1_vlc.h b/libavcodec/svq1_vlc.h index 834279dac4..073bb6d986 100644 --- a/libavcodec/svq1_vlc.h +++ b/libavcodec/svq1_vlc.h @@ -1,5 +1,5 @@ /* - * copyright (C) 2003 the ffmpeg project + * copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 841f945384..d6f4b43539 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -4,7 +4,7 @@ * ported to libavcodec by Nick Kurshev * * Copyright (C) 2002 the xine project - * Copyright (C) 2002 the ffmpeg project + * Copyright (C) 2002 The FFmpeg project * * SVQ1 Encoder (c) 2004 Mike Melanson * diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index a869c2478b..12a23d0612 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -150,7 +150,7 @@ static int encode_block(SVQ1EncContext *s, uint8_t *src, uint8_t *ref, vector = codebook + stage * size * 16 + i * size; sqr = s->ssd_int8_vs_int16(vector, block[stage], size); diff = block_sum[stage] - sum; - score = sqr - (diff * (int64_t)diff >> (level + 3)); // FIXME: 64bit slooow + score = sqr - (diff * (int64_t)diff >> (level + 3)); // FIXME: 64 bits slooow if (score < best_vector_score) { int mean = diff + (size >> 1) >> (level + 3); assert(mean > -300 && mean < 300); diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 094442b6d9..b11e6ffc0d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -135,7 +135,7 @@ typedef struct SVQ3Context { #define THIRDPEL_MODE 3 #define PREDICT_MODE 4 -/* dual scan (from some older h264 draft) +/* dual scan (from some older H.264 draft) * o-->o-->o o * | /| * o o o / o diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index 9e1ef2de87..c70c77fdfa 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -56,7 +56,7 @@ typedef struct TDSCContext { AVFrame *jpgframe; // decoded JPEG tile uint8_t *tilebuffer; // buffer containing tile data - /* zlib interation */ + /* zlib interaction */ uint8_t *deflatebuffer; uLongf deflatelen; @@ -365,7 +365,7 @@ static int tdsc_decode_jpeg_tile(AVCodecContext *avctx, int tile_size, return 0; } - /* Let's paint ont the buffer */ + /* Let's paint onto the buffer */ tdsc_blit(ctx->refframe->data[0] + x * 3 + ctx->refframe->linesize[0] * y, ctx->refframe->linesize[0], ctx->jpgframe->data[0], ctx->jpgframe->linesize[0], diff --git a/libavcodec/texturedsp.c b/libavcodec/texturedsp.c index 58446b1e69..7b54a5dd5e 100644 --- a/libavcodec/texturedsp.c +++ b/libavcodec/texturedsp.c @@ -166,7 +166,7 @@ static inline void dxt3_block_internal(uint8_t *dst, ptrdiff_t stride, } } -/** Convert a premultiplied alpha pixel to a straigth alpha pixel. */ +/** Convert a premultiplied alpha pixel to a straight alpha pixel. */ static av_always_inline void premult2straight(uint8_t *src) { int r = src[0]; diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c index d2d9a3441f..6fdf9c8c6b 100644 --- a/libavcodec/texturedspenc.c +++ b/libavcodec/texturedspenc.c @@ -213,7 +213,7 @@ static unsigned int match_colors(const uint8_t *block, ptrdiff_t stride, * the same inside that subinterval. * * Relying on this 1d approximation isn't always optimal in terms of - * euclidean distance, but it's very close and a lot faster. + * Euclidean distance, but it's very close and a lot faster. * * http://cbloomrants.blogspot.com/2008/12/12-08-08-dxtc-summary.html */ c0_point = (stops[1] + stops[3]) >> 1; @@ -309,7 +309,7 @@ static void optimize_colors(const uint8_t *block, ptrdiff_t stride, if (fabs(vfb) > magn) magn = fabs(vfb); - /* if magnitudo is too small, default to luminance */ + /* if magnitude is too small, default to luminance */ if (magn < 4.0f) { /* JPEG YCbCr luma coefs, scaled by 1000 */ v_r = 299; diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h index 3dc0ab46f8..e810565000 100644 --- a/libavcodec/twinvq.h +++ b/libavcodec/twinvq.h @@ -109,7 +109,7 @@ typedef struct TwinVQFrameData { * bitrate/sample rate */ typedef struct TwinVQModeTab { - struct TwinVQFrameMode fmode[3]; ///< frame type-dependant parameters + struct TwinVQFrameMode fmode[3]; ///< frame type-dependent parameters uint16_t size; ///< frame size in samples uint8_t n_lsp; ///< number of lsp coefficients diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index b340510192..56df10557a 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -149,7 +149,7 @@ static int very_broken_op(int a, int b) /** * Sum to data a periodic peak of a given period, width and shape. * - * @param period the period of the peak divised by 400.0 + * @param period the period of the peak divided by 400.0 */ static void add_peak(int period, int width, const float *shape, float ppc_gain, float *speech, int len) diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 7fb838e841..4eddd98e24 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -160,7 +160,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } - /* extradata size is 4 * 32bit */ + /* extradata size is 4 * 32 bits */ avctx->extradata_size = 16; avctx->extradata = av_mallocz(avctx->extradata_size + @@ -371,7 +371,7 @@ static int write_huff_codes(uint8_t *src, uint8_t *dst, int dst_size, src += width; } - /* Pad output to a 32bit boundary */ + /* Pad output to a 32-bit boundary */ count = put_bits_count(&pb) & 0x1F; if (count) @@ -611,7 +611,7 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } /* - * Write frame information (LE 32bit unsigned) + * Write frame information (LE 32-bit unsigned) * into the output packet. * Contains the prediction method. */ diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index c80e638cad..075c848f60 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -636,7 +636,7 @@ static int vaapi_encode_get_next(AVCodecContext *avctx, start = end = pic; if (pic->type != PICTURE_TYPE_IDR) { - // If that was not an IDR frame, add B frames display-before and + // If that was not an IDR frame, add B-frames display-before and // encode-after it. for (i = 0; i < ctx->b_per_p; i++) { @@ -708,7 +708,7 @@ static int vaapi_encode_mangle_end(AVCodecContext *avctx) if (last_pic->type == PICTURE_TYPE_B) { // Some fixing up is required. Change the type of this - // picture to P, then modify preceeding B references which + // picture to P, then modify preceding B references which // point beyond it to point at it instead. last_pic->type = PICTURE_TYPE_P; diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 9841a708b6..8690a8565b 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -697,7 +697,7 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, av_assert0(pic->nb_refs <= 2); if (pic->nb_refs >= 1) { - // Backward reference for P or B frame. + // Backward reference for P- or B-frame. av_assert0(pic->type == PICTURE_TYPE_P || pic->type == PICTURE_TYPE_B); @@ -705,7 +705,7 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, vslice->RefPicList0[0] = vpic->ReferenceFrames[0]; } if (pic->nb_refs >= 2) { - // Forward reference for B frame. + // Forward reference for B-frame. av_assert0(pic->type == PICTURE_TYPE_B); vslice->num_ref_idx_l1_active_minus1 = 0; @@ -793,7 +793,7 @@ static av_cold int vaapi_encode_h264_init_fixed_qp(AVCodecContext *avctx) priv->fixed_qp_b = priv->fixed_qp_p; av_log(avctx, AV_LOG_DEBUG, "Using fixed QP = " - "%d / %d / %d for IDR / P / B frames.\n", + "%d / %d / %d for IDR- / P- / B-frames.\n", priv->fixed_qp_idr, priv->fixed_qp_p, priv->fixed_qp_b); return 0; } @@ -930,7 +930,7 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) offsetof(VAAPIEncodeH264Options, x)) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_h264_options[] = { - { "qp", "Constant QP (for P frames; scaled by qfactor/qoffset for I/B)", + { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 20 }, 0, 52, FLAGS }, { "quality", "Set encode quality (trades off against speed, higher is faster)", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, FLAGS }, diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 917268a080..1b1cce70e0 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1075,7 +1075,7 @@ static int vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, av_assert0(pic->nb_refs <= 2); if (pic->nb_refs >= 1) { - // Backward reference for P or B frame. + // Backward reference for P- or B-frame. av_assert0(pic->type == PICTURE_TYPE_P || pic->type == PICTURE_TYPE_B); @@ -1083,7 +1083,7 @@ static int vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, vslice->ref_pic_list0[0] = vpic->reference_frames[0]; } if (pic->nb_refs >= 2) { - // Forward reference for B frame. + // Forward reference for B-frame. av_assert0(pic->type == PICTURE_TYPE_B); vslice->num_ref_idx_l1_active_minus1 = 0; @@ -1220,7 +1220,7 @@ static av_cold int vaapi_encode_h265_init_fixed_qp(AVCodecContext *avctx) priv->fixed_qp_b = priv->fixed_qp_p; av_log(avctx, AV_LOG_DEBUG, "Using fixed QP = " - "%d / %d / %d for IDR / P / B frames.\n", + "%d / %d / %d for IDR- / P- / B-frames.\n", priv->fixed_qp_idr, priv->fixed_qp_p, priv->fixed_qp_b); return 0; } @@ -1321,7 +1321,7 @@ static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx) offsetof(VAAPIEncodeH265Options, x)) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_h265_options[] = { - { "qp", "Constant QP (for P frames; scaled by qfactor/qoffset for I/B)", + { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 25 }, 0, 52, FLAGS }, { NULL }, }; diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 9292b32903..7a93e971bc 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -401,7 +401,7 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n" "LoopFilter=%i, MultiRes=%i, FastUVMC=%i, Extended MV=%i\n" "Rangered=%i, VSTransform=%i, Overlap=%i, SyncMarker=%i\n" - "DQuant=%i, Quantizer mode=%i, Max B frames=%i\n", + "DQuant=%i, Quantizer mode=%i, Max B-frames=%i\n", v->profile, v->frmrtq_postproc, v->bitrtq_postproc, v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv, v->rangered, v->vstransform, v->overlap, v->resync_marker, @@ -753,7 +753,7 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " "Imode: %i, Invert: %i\n", status>>1, status&1); - /* Hopefully this is correct for P frames */ + /* Hopefully this is correct for P-frames */ v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; @@ -1136,7 +1136,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: " "Imode: %i, Invert: %i\n", status>>1, status&1); - /* Hopefully this is correct for P frames */ + /* Hopefully this is correct for P-frames */ v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; } else if (v->fcm == ILACE_FRAME) { // frame interlaced diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 0c4958ca77..5087b7c611 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -73,7 +73,7 @@ enum DQDoubleEdge { }; //@} -/** MV modes for P frames */ +/** MV modes for P-frames */ //@{ enum MVModes { MV_PMODE_1MV_HPEL_BILIN, @@ -96,7 +96,7 @@ enum MBModesIntfr { }; //@} -/** @name MV types for B frames */ +/** @name MV types for B-frames */ //@{ enum BMVTypes { BMV_TYPE_BACKWARD, @@ -106,7 +106,7 @@ enum BMVTypes { }; //@} -/** @name Block types for P/B frames */ +/** @name Block types for P/B-frames */ //@{ enum TransformTypes { TT_8X8, @@ -179,18 +179,18 @@ typedef struct VC1Context{ /** Advanced Profile */ //@{ - int level; ///< 3bits, for Advanced/Simple Profile, provided by TS layer - int chromaformat; ///< 2bits, 2=4:2:0, only defined + int level; ///< 3 bits, for Advanced/Simple Profile, provided by TS layer + int chromaformat; ///< 2 bits, 2=4:2:0, only defined int postprocflag; ///< Per-frame processing suggestion flag present int broadcast; ///< TFF/RFF present int interlace; ///< Progressive/interlaced (RPTFTM syntax element) int tfcntrflag; ///< TFCNTR present int panscanflag; ///< NUMPANSCANWIN, TOPLEFT{X,Y}, BOTRIGHT{X,Y} present int refdist_flag; ///< REFDIST syntax element present in II, IP, PI or PP field picture headers - int extended_dmv; ///< Additional extended dmv range at P/B frame-level - int color_prim; ///< 8bits, chroma coordinates of the color primaries - int transfer_char; ///< 8bits, Opto-electronic transfer characteristics - int matrix_coef; ///< 8bits, Color primaries->YCbCr transform matrix + int extended_dmv; ///< Additional extended dmv range at P/B-frame-level + int color_prim; ///< 8 bits, chroma coordinates of the color primaries + int transfer_char; ///< 8 bits, Opto-electronic transfer characteristics + int matrix_coef; ///< 8 bits, Color primaries->YCbCr transform matrix int hrd_param_flag; ///< Presence of Hypothetical Reference ///< Decoder parameters int psf; ///< Progressive Segmented Frame @@ -200,22 +200,22 @@ typedef struct VC1Context{ * TODO: choose between ints, uint8_ts and monobit flags */ //@{ - int profile; ///< 2bits, Profile - int frmrtq_postproc; ///< 3bits, - int bitrtq_postproc; ///< 5bits, quantized framerate-based postprocessing strength + int profile; ///< 2 bits, Profile + int frmrtq_postproc; ///< 3 bits + int bitrtq_postproc; ///< 5 bits, quantized framerate-based postprocessing strength int fastuvmc; ///< Rounding of qpel vector to hpel ? (not in Simple) int extended_mv; ///< Ext MV in P/B (not in Simple) - int dquant; ///< How qscale varies with MBs, 2bits (not in Simple) + int dquant; ///< How qscale varies with MBs, 2 bits (not in Simple) int vstransform; ///< variable-size [48]x[48] transform type + info int overlap; ///< overlapped transforms in use - int quantizer_mode; ///< 2bits, quantizer mode used for sequence, see QUANT_* + int quantizer_mode; ///< 2 bits, quantizer mode used for sequence, see QUANT_* int finterpflag; ///< INTERPFRM present //@} /** Frame decoding info for all profiles */ //@{ - uint8_t mv_mode; ///< MV coding monde - uint8_t mv_mode2; ///< Secondary MV coding mode (B frames) + uint8_t mv_mode; ///< MV coding mode + uint8_t mv_mode2; ///< Secondary MV coding mode (B-frames) int k_x; ///< Number of bits for MVs (depends on MV range) int k_y; ///< Number of bits for MVs (depends on MV range) int range_x, range_y; ///< MV range diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 1ce0612c78..0e1018ce9b 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1602,7 +1602,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) int idx_mbmode = 0, mvbp; int stride_y, fieldtx; - mquant = v->pq; /* Loosy initialization */ + mquant = v->pq; /* Lossy initialization */ if (v->skip_is_raw) skipped = get_bits1(gb); @@ -1814,7 +1814,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) int block_cbp = 0, pat, block_tt = 0; int idx_mbmode = 0; - mquant = v->pq; /* Loosy initialization */ + mquant = v->pq; /* Lossy initialization */ idx_mbmode = get_vlc2(gb, v->mbmode_vlc->table, VC1_IF_MBMODE_VLC_BITS, 2); if (idx_mbmode <= 1) { // intra MB @@ -2091,7 +2091,7 @@ static void vc1_decode_b_mb_intfi(VC1Context *v) int bmvtype = BMV_TYPE_BACKWARD; int idx_mbmode, interpmvp; - mquant = v->pq; /* Loosy initialization */ + mquant = v->pq; /* Lossy initialization */ s->mb_intra = 0; idx_mbmode = get_vlc2(gb, v->mbmode_vlc->table, VC1_IF_MBMODE_VLC_BITS, 2); @@ -2583,7 +2583,7 @@ static void vc1_decode_i_blocks(VC1Context *v) uint8_t *coded_val; int mb_pos; - /* select codingmode used for VLC tables selection */ + /* select coding mode used for VLC tables selection */ switch (v->y_ac_table_index) { case 0: v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; @@ -2731,7 +2731,7 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) int mqdiff; GetBitContext *gb = &s->gb; - /* select codingmode used for VLC tables selection */ + /* select coding mode used for VLC tables selection */ switch (v->y_ac_table_index) { case 0: v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; @@ -2860,7 +2860,7 @@ static void vc1_decode_p_blocks(VC1Context *v) MpegEncContext *s = &v->s; int apply_loop_filter; - /* select codingmode used for VLC tables selection */ + /* select coding mode used for VLC tables selection */ switch (v->c_ac_table_index) { case 0: v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; @@ -2935,7 +2935,7 @@ static void vc1_decode_b_blocks(VC1Context *v) { MpegEncContext *s = &v->s; - /* select codingmode used for VLC tables selection */ + /* select coding mode used for VLC tables selection */ switch (v->c_ac_table_index) { case 0: v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA; diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c index 0faa6f26a9..f4632d6247 100644 --- a/libavcodec/vc1_mc.c +++ b/libavcodec/vc1_mc.c @@ -54,7 +54,7 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) mx = s->mv[dir][0][0]; my = s->mv[dir][0][1]; - // store motion vectors for further use in B frames + // store motion vectors for further use in B-frames if (s->pict_type == AV_PICTURE_TYPE_P) { for (i = 0; i < 4; i++) { s->current_picture.motion_val[1][s->block_index[i] + v->blocks_off][0] = mx; @@ -936,7 +936,7 @@ void ff_vc1_interp_mc(VC1Context *v) if (s->avctx->flags & AV_CODEC_FLAG_GRAY) return; - /* Chroma MC always uses qpel blilinear */ + /* Chroma MC always uses qpel bilinear */ uvmx = (uvmx & 3) << 1; uvmy = (uvmy & 3) << 1; if (!v->rnd) { diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c index 96426f53ea..25be78778a 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -470,7 +470,7 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, int A[2], B[2], C[2]; int px = 0, py = 0; int a_valid = 0, b_valid = 0, c_valid = 0; - int field_a, field_b, field_c; // 0: same, 1: opposit + int field_a, field_b, field_c; // 0: same, 1: opposite int total_valid, num_samefield, num_oppfield; int pos_c, pos_b, n_adj; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index d1ac5c309e..3d042d0b0d 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -409,7 +409,7 @@ av_cold void ff_vc1_init_transposed_scantables(VC1Context *v) /** Initialize a VC1/WMV3 decoder * @todo TODO: Handle VC-1 IDUs (Transport level?) - * @todo TODO: Decypher remaining bits in extra_data + * @todo TODO: Decipher remaining bits in extra_data */ static av_cold int vc1_decode_init(AVCodecContext *avctx) { diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index 62ad5e9f8d..8ae9792200 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -158,7 +158,7 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx, CFMutableDictionaryRef io_surface_properties; CFNumberRef cv_pix_fmt; - /* Each VCL NAL in the bistream sent to the decoder + /* Each VCL NAL in the bitstream sent to the decoder * is preceded by a 4 bytes length header. * Change the avcC atom header if needed, to signal headers of 4 bytes. */ if (extradata_size >= 4 && (extradata[4] & 0x03) != 0x03) { @@ -384,7 +384,7 @@ int ff_vda_default_init(AVCodecContext *avctx) // kCVPixelFormatType_420YpCbCr8Planar; - /* Each VCL NAL in the bistream sent to the decoder + /* Each VCL NAL in the bitstream sent to the decoder * is preceded by a 4 bytes length header. * Change the avcC atom header if needed, to signal headers of 4 bytes. */ if (avctx->extradata_size >= 4 && (avctx->extradata[4] & 0x03) != 0x03) { diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index d25ee1ce17..967c72838f 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -138,7 +138,7 @@ typedef struct AVVDPAUContext { * display preemption). * * @note get_format() must return AV_PIX_FMT_VDPAU if this function completes - * succesfully. + * successfully. * * @param avctx decoding context whose get_format() callback is invoked * @param device VDPAU device handle to use for hardware acceleration diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 5aeca67ccb..c34e323197 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -239,8 +239,8 @@ static int vdpau_h264_init(AVCodecContext *avctx) break; #endif case FF_PROFILE_H264_HIGH_10: - /* XXX: High 10 can be treated as High so long as only 8-bits per - * formats are supported. */ + /* XXX: High 10 can be treated as High so long as only 8 bits per + * format are supported. */ profile = VDP_DECODER_PROFILE_H264_HIGH; break; #ifdef VDP_DECODER_PROFILE_H264_HIGH_444_PREDICTIVE diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index c2fc3c90d9..26374cc5d3 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 the ffmpeg project + * Copyright (C) 2003-2004 The FFmpeg project * * This file is part of Libav. * @@ -932,14 +932,14 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, int num_coeffs = s->num_coded_frags[plane][coeff_index]; int16_t *dct_tokens = s->dct_tokens[plane][coeff_index]; - /* local references to structure members to avoid repeated deferences */ + /* local references to structure members to avoid repeated dereferences */ int *coded_fragment_list = s->coded_fragment_list[plane]; Vp3Fragment *all_fragments = s->all_fragments; VLC_TYPE(*vlc_table)[2] = table->table; if (num_coeffs < 0) av_log(s->avctx, AV_LOG_ERROR, - "Invalid number of coefficents at level %d\n", coeff_index); + "Invalid number of coefficients at level %d\n", coeff_index); if (eob_run > num_coeffs) { coeff_i = @@ -1021,7 +1021,7 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, if (blocks_ended > s->num_coded_frags[plane][coeff_index]) av_log(s->avctx, AV_LOG_ERROR, "More blocks ended than coded!\n"); - // decrement the number of blocks that have higher coeffecients for each + // decrement the number of blocks that have higher coefficients for each // EOB run at this level if (blocks_ended) for (i = coeff_index + 1; i < 64; i++) @@ -1110,7 +1110,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) c_tables[i] = &s->ac_vlc_4[ac_c_table]; } - /* decode all AC coefficents */ + /* decode all AC coefficients */ for (i = 1; i <= 63; i++) { residual_eob_run = unpack_vlcs(s, gb, y_tables[i], i, 0, residual_eob_run); @@ -1308,7 +1308,7 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, for (x = 0; x < width; x++) { /* This code basically just deblocks on the edges of coded blocks. * However, it has to be much more complicated because of the - * braindamaged deblock ordering used in VP3/Theora. Order matters + * brain damaged deblock ordering used in VP3/Theora. Order matters * because some pixels get filtered twice. */ if (s->all_fragments[fragment].coding_method != MODE_COPY) { /* do not perform left edge filter for left columns frags */ @@ -1581,7 +1581,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) /* Note, it is possible to implement all MC cases * with put_no_rnd_pixels_l2 which would look more * like the VP3 source but this would be slower as - * put_no_rnd_pixels_tab is better optimzed */ + * put_no_rnd_pixels_tab is better optimized */ if (motion_halfpel_index != 3) { s->hdsp.put_no_rnd_pixels_tab[1][motion_halfpel_index]( output_plane + first_pixel, diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h index da325c0345..5603d3bb1b 100644 --- a/libavcodec/vp3data.h +++ b/libavcodec/vp3data.h @@ -1,5 +1,5 @@ /* - * copyright (C) 2003 the ffmpeg project + * copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index af687ec5aa..ab65f2b763 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 the ffmpeg project + * Copyright (C) 2004 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index 2919a143af..ba5e62a045 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -223,7 +223,7 @@ typedef struct VP8Context { /** * These are all of the updatable probabilities for binary decisions. - * They are only implictly reset on keyframes, making it quite likely + * They are only implicitly reset on keyframes, making it quite likely * for an interframe to desync if a prior frame's header was corrupt * or missing outright! */ @@ -271,7 +271,7 @@ typedef struct VP8Context { /** * This describes the macroblock memory layout. * 0 -> Only width+height*2+1 macroblocks allocated (frame/single thread). - * 1 -> Macroblocks for entire frame alloced (sliced thread). + * 1 -> Macroblocks for entire frame allocated (sliced thread). */ int mb_layout; diff --git a/libavcodec/vp9.h b/libavcodec/vp9.h index c6f395e93a..b83bd618d4 100644 --- a/libavcodec/vp9.h +++ b/libavcodec/vp9.h @@ -141,7 +141,7 @@ typedef struct VP9DSPContext { */ // FIXME(rbultje) maybe replace left/top pointers with HAVE_TOP/ // HAVE_LEFT/HAVE_TOPRIGHT flags instead, and then handle it in-place? - // also needs to fit in with what h264/vp8/etc do + // also needs to fit in with what H.264/VP8/etc do void (*intra_pred[N_TXFM_SIZES][N_INTRA_PRED_MODES])(uint8_t *dst, ptrdiff_t stride, const uint8_t *left, diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index e58bb26f89..0d0d59a1dd 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -1,6 +1,6 @@ /* * Westwood Studios VQA Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 9f4e757f14..85193ff3d4 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -421,7 +421,7 @@ unsigned int ff_wma_get_large_val(GetBitContext *gb) * @param version 0 for wma1,2 1 for wmapro * @param ptr output buffer * @param offset offset in the output buffer - * @param num_coefs number of input coefficents + * @param num_coefs number of input coefficients * @param block_len input buffer length (2^n) * @param frame_len_bits number of bits for escaped run codes * @param coef_nb_bits number of bits for escaped level codes diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index b6be51ad4b..50c77dd100 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -79,7 +79,7 @@ static av_cold int wma_decode_init(AVCodecContext *avctx) s->avctx = avctx; - /* extract flag infos */ + /* extract flag info */ flags2 = 0; extradata = avctx->extradata; if (avctx->codec->id == AV_CODEC_ID_WMAV1 && avctx->extradata_size >= 4) @@ -338,7 +338,7 @@ static int decode_exp_vlc(WMACodecContext *s, int ch) av_log(s->avctx, AV_LOG_ERROR, "Exponent vlc invalid\n"); return -1; } - /* NOTE: this offset is the same as MPEG4 AAC ! */ + /* NOTE: this offset is the same as MPEG-4 AAC! */ last_exp += code - 60; if ((unsigned) last_exp + 60 >= FF_ARRAY_ELEMS(pow_tab)) { av_log(s->avctx, AV_LOG_ERROR, "Exponent out of range: %d\n", @@ -415,7 +415,7 @@ static void wma_window(WMACodecContext *s, float *out) /** * @return 0 if OK. 1 if last block of frame. return -1 if - * unrecorrable error. + * unrecoverable error. */ static int wma_decode_block(WMACodecContext *s) { diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index c176daa7c9..e991bb89d4 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -57,7 +57,7 @@ static av_cold int encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - /* extract flag infos */ + /* extract flag info */ flags1 = 0; flags2 = 1; if (avctx->codec->id == AV_CODEC_ID_WMAV1) { diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index e335db7f12..231a74d24f 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -101,8 +101,8 @@ typedef struct WmallDecodeCtx { uint32_t frame_num; ///< current frame number (not used for decoding) GetBitContext gb; ///< bitstream reader context int buf_bit_size; ///< buffer size in bits - int16_t *samples_16[WMALL_MAX_CHANNELS]; ///< current samplebuffer pointer (16-bit) - int32_t *samples_32[WMALL_MAX_CHANNELS]; ///< current samplebuffer pointer (24-bit) + int16_t *samples_16[WMALL_MAX_CHANNELS]; ///< current sample buffer pointer (16-bit) + int32_t *samples_32[WMALL_MAX_CHANNELS]; ///< current sample buffer pointer (24-bit) uint8_t drc_gain; ///< gain for the DRC tool int8_t skip_frame; ///< skip output step int8_t parsed_all_subframes; ///< all subframes decoded? @@ -1192,7 +1192,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, /* parse packet header */ init_get_bits(gb, buf, s->buf_bit_size); packet_sequence_number = get_bits(gb, 4); - skip_bits(gb, 1); // Skip seekable_frame_in_packet, currently ununused + skip_bits(gb, 1); // Skip seekable_frame_in_packet, currently unused spliced_packet = get_bits1(gb); if (spliced_packet) avpriv_request_sample(avctx, "Bitstream splicing"); diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index bdcf64eb2f..daeaa79a7b 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1455,7 +1455,7 @@ static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len, int buflen; /** when the frame data does not need to be concatenated, the input buffer - is resetted and additional bits from the previous frame are copyed + is reset and additional bits from the previous frame are copied and skipped later so that a fast byte copy is possible */ if (!append) { diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 92261b9a77..62b603c6aa 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1195,7 +1195,7 @@ static void aw_pulse_set1(WMAVoiceContext *s, GetBitContext *gb, /** * @} * - * Generate a random number from frame_cntr and block_idx, which will lief + * Generate a random number from frame_cntr and block_idx, which will live * in the range [0, 1000 - block_size] (so it can be used as an index in a * table of size 1000 of which you want to read block_size entries). * @@ -1518,7 +1518,7 @@ static int synth_frame(AVCodecContext *ctx, GetBitContext *gb, int frame_idx, /* Pitch is given per block. Per-block pitches are encoded as an * absolute value for the first block, and then delta values * relative to this value) for all subsequent blocks. The scale of - * this pitch value is semi-logaritmic compared to its use in the + * this pitch value is semi-logarithmic compared to its use in the * decoder, so we convert it to normal scale also. */ int block_pitch, t1 = (s->block_conv_table[1] - s->block_conv_table[0]) << 2, diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 06ad2b65cf..b09942ec35 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -81,7 +81,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, 5, s->qscale); s->dc_table_index = 1; - s->mv_table_index = 1; /* only if P frame */ + s->mv_table_index = 1; /* only if P-frame */ s->per_mb_rl_table = 0; s->mspel = 0; w->per_mb_abt = 0; diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index d1701bf071..40c29947eb 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -42,7 +42,7 @@ "sub "tmp" , "low" \n\t" #else /* HAVE_FAST_CMOV */ #define BRANCHLESS_GET_CABAC_UPDATE(ret, retq, low, range, tmp) \ -/* P4 Prescott has crappy cmov,sbb,64bit shift so avoid them */ \ +/* P4 Prescott has crappy cmov,sbb,64-bit shift so avoid them */ \ "sub "low" , "tmp" \n\t"\ "sar $31 , "tmp" \n\t"\ "sub %%ecx , "range" \n\t"\ diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm index cc41f00461..1447940857 100644 --- a/libavcodec/x86/h264_chromamc.asm +++ b/libavcodec/x86/h264_chromamc.asm @@ -1,5 +1,5 @@ ;****************************************************************************** -;* MMX/SSSE3-optimized functions for H264 chroma MC +;* MMX/SSSE3-optimized functions for H.264 chroma MC ;* Copyright (c) 2005 Zoltan Hidvegi , ;* 2005-2008 Loren Merritt ;* diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index bb881c35df..fb33e40784 100644 --- a/libavcodec/x86/h264_i386.h +++ b/libavcodec/x86/h264_i386.h @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 codec. + * H.264 / AVC / MPEG-4 part10 codec. * non-MMX i386-specific optimizations for H.264 * @author Michael Niedermayer */ diff --git a/libavcodec/x86/inline_asm.h b/libavcodec/x86/inline_asm.h index e4affabc87..fc554bfc8d 100644 --- a/libavcodec/x86/inline_asm.h +++ b/libavcodec/x86/inline_asm.h @@ -50,7 +50,7 @@ #endif // using regr as temporary and for the output result -// first argument is unmodifed and second is trashed +// first argument is unmodified and second is trashed // regfe is supposed to contain 0xfefefefefefefefe #define PAVGB_MMX_NO_RND(rega, regb, regr, regfe) \ "movq "#rega", "#regr" \n\t" \ diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c index b739a8f9a8..33d5cd814d 100644 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@ -1,6 +1,6 @@ /* * Optimized for ia32 CPUs by Nick Kurshev - * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer + * H.263, MPEG-1, MPEG-2 dequantizer & draw_edges by Michael Niedermayer * * This file is part of Libav. * @@ -179,7 +179,7 @@ static void dct_unquantize_mpeg1_intra_mmx(MpegEncContext *s, block0 = block[0] * s->y_dc_scale; else block0 = block[0] * s->c_dc_scale; - /* XXX: only mpeg1 */ + /* XXX: only MPEG-1 */ quant_matrix = s->intra_matrix; __asm__ volatile( "pcmpeqw %%mm7, %%mm7 \n\t" diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm index 0a242b54e3..77f6ddb25d 100644 --- a/libavcodec/x86/rv40dsp.asm +++ b/libavcodec/x86/rv40dsp.asm @@ -335,14 +335,14 @@ INIT_XMM ssse3 FILTER_SSSE3 put FILTER_SSSE3 avg -; %1=5bits weights?, %2=dst %3=src1 %4=src3 %5=stride if sse2 +; %1=5-bit weights?, %2=dst %3=src1 %4=src3 %5=stride if SSE2 %macro RV40_WCORE 4-5 movh m4, [%3 + r6 + 0] movh m5, [%4 + r6 + 0] %if %0 == 4 %define OFFSET r6 + mmsize / 2 %else - ; 8x8 block and sse2, stride was provided + ; 8x8 block and SSE2, stride was provided %define OFFSET r6 add r6, r5 %endif @@ -350,7 +350,7 @@ FILTER_SSSE3 avg movh m7, [%4 + OFFSET] %if %1 == 0 - ; 14bits weights + ; 14-bit weights punpcklbw m4, m0 punpcklbw m5, m0 punpcklbw m6, m0 @@ -368,7 +368,7 @@ FILTER_SSSE3 avg paddw m4, m5 paddw m6, m7 %else - ; 5bits weights + ; 5-bit weights %if cpuflag(ssse3) punpcklbw m4, m5 punpcklbw m6, m7 @@ -404,7 +404,7 @@ FILTER_SSSE3 avg packuswb m4, m6 %if %0 == 5 - ; Only called for 8x8 blocks and sse2 + ; Only called for 8x8 blocks and SSE2 sub r6, r5 movh [%2 + r6], m4 add r6, r5 diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 046affbc26..95f5ee42de 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -81,7 +81,7 @@ "movq %%mm"#R1", "#OFF"(%1) \n\t" \ "add %2, %0 \n\t" -/** Sacrifying mm6 allows to pipeline loads from src */ +/** Sacrificing mm6 allows to pipeline loads from src */ static void vc1_put_ver_16b_shift2_mmx(int16_t *dst, const uint8_t *src, x86_reg stride, int rnd, int64_t shift) @@ -165,7 +165,7 @@ VC1_HOR_16b_SHIFT2(OP_AVG, avg_) /** * Purely vertical or horizontal 1/2 shift interpolation. - * Sacrify mm6 for *9 factor. + * Sacrifice mm6 for *9 factor. */ #define VC1_SHIFT2(OP, OPNAME)\ static void OPNAME ## vc1_shift2_mmx(uint8_t *dst, const uint8_t *src,\ @@ -223,7 +223,7 @@ VC1_SHIFT2(OP_AVG, avg_) /** * Core of the 1/4 and 3/4 shift bicubic interpolation. * - * @param UNPACK Macro unpacking arguments from 8 to 16bits (can be empty). + * @param UNPACK Macro unpacking arguments from 8 to 16 bits (can be empty). * @param MOVQ "movd 1" or "movq 2", if data read is already unpacked. * @param A1 Address of 1st tap (beware of unpacked/packed). * @param A2 Address of 2nd tap @@ -263,7 +263,7 @@ VC1_SHIFT2(OP_AVG, avg_) "paddw %%mm2, %%mm4 \n\t" /* 4,53,18,-3 */ /** - * Macro to build the vertical 16bits version of vc1_put_shift[13]. + * Macro to build the vertical 16 bits version of vc1_put_shift[13]. * Here, offset=src_stride. Parameters passed A1 to A4 must use * %3 (src_stride) and %4 (3*src_stride). * @@ -320,8 +320,8 @@ vc1_put_ver_16b_ ## NAME ## _mmx(int16_t *dst, const uint8_t *src, \ } /** - * Macro to build the horizontal 16bits version of vc1_put_shift[13]. - * Here, offset=16bits, so parameters passed A1 to A4 should be simple. + * Macro to build the horizontal 16 bits version of vc1_put_shift[13]. + * Here, offset=16 bits, so parameters passed A1 to A4 should be simple. * * @param NAME Either 1 or 3 * @see MSPEL_FILTER13_CORE for information on A1->A4 @@ -357,7 +357,7 @@ OPNAME ## vc1_hor_16b_ ## NAME ## _mmx(uint8_t *dst, x86_reg stride, \ } /** - * Macro to build the 8bits, any direction, version of vc1_put_shift[13]. + * Macro to build the 8 bits, any direction, version of vc1_put_shift[13]. * Here, offset=src_stride. Parameters passed A1 to A4 must use * %3 (offset) and %4 (3*offset). * diff --git a/libavcodec/xan.c b/libavcodec/xan.c index e7bbe413b6..a46b58c7f1 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -1,6 +1,6 @@ /* * Wing Commander/Xan Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (C) 2003 The FFmpeg project * * This file is part of Libav. * diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 0dbf8a17c5..f945aea034 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -498,7 +498,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac return AVERROR_INVALIDDATA; } - if (c->comp == 0) { //Uncompressed data + if (c->comp == 0) { // uncompressed data if (c->decomp_size < len) { av_log(avctx, AV_LOG_ERROR, "Buffer too small\n"); return AVERROR_INVALIDDATA; -- cgit v1.2.3