diff options
320 files changed, 870 insertions, 871 deletions
@@ -914,8 +914,8 @@ version 0.8: - showinfo filter added - SMPTE 302M AES3 audio decoder - Apple Core Audio Format muxer -- 9bit and 10bit per sample support in the H.264 decoder -- 9bit and 10bit FFV1 encoding / decoding +- 9 bits and 10 bits per sample support in the H.264 decoder +- 9 bits and 10 bits FFV1 encoding / decoding - split filter added - select filter added - sdl output device added @@ -1208,7 +1208,7 @@ version 0.4.9-pre1: - rate distorted optimal lambda->qp support - AAC encoding with libfaac - Sunplus JPEG codec (SP5X) support -- use Lagrange multipler instead of QP for ratecontrol +- use Lagrange multiplier instead of QP for ratecontrol - Theora/VP3 decoding support - XA and ADX ADPCM codecs - export MPEG-2 active display area / pan scan diff --git a/doc/APIchanges b/doc/APIchanges index bc5bb5b..15d52fe 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -1175,7 +1175,7 @@ lavd 54.4.100 / 54.0.0, lavfi 3.5.0 * base -- is now stored in AVBufferRef * reference, type, buffer_hints -- are unnecessary in the new API * hwaccel_picture_private, owner, thread_opaque -- should not - have been acessed from outside of lavc + have been accessed from outside of lavc * qscale_table, qstride, qscale_type, mbskip_table, motion_val, mb_type, dct_coeff, ref_index -- mpegvideo-specific tables, which are not exported anymore. diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index 06a98a6..43a64c2 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -25,9 +25,9 @@ * libavcodec API use example. * * @example decoding_encoding.c - * Note that libavcodec only handles codecs (mpeg, mpeg4, etc...), - * not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the - * format handling + * Note that libavcodec only handles codecs (MPEG, MPEG-4, etc...), + * not file formats (AVI, VOB, MP4, MOV, MKV, MXF, FLV, MPEG-TS, MPEG-PS, etc...). + * See library 'libavformat' for the format handling */ #include <math.h> @@ -253,7 +253,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) printf("Decode audio file %s to %s\n", filename, outfilename); - /* find the mpeg audio decoder */ + /* find the MPEG audio decoder */ codec = avcodec_find_decoder(AV_CODEC_ID_MP2); if (!codec) { fprintf(stderr, "Codec not found\n"); @@ -356,7 +356,7 @@ static void video_encode_example(const char *filename, int codec_id) printf("Encode video file %s\n", filename); - /* find the mpeg1 video encoder */ + /* find the video encoder */ codec = avcodec_find_encoder(codec_id); if (!codec) { fprintf(stderr, "Codec not found\n"); @@ -475,7 +475,7 @@ static void video_encode_example(const char *filename, int codec_id) } } - /* add sequence end code to have a real mpeg file */ + /* add sequence end code to have a real MPEG file */ fwrite(endcode, 1, sizeof(endcode), f); fclose(f); @@ -543,12 +543,12 @@ static void video_decode_example(const char *outfilename, const char *filename) av_init_packet(&avpkt); - /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */ + /* set end of buffer to 0 (this ensures that no overreading happens for damaged MPEG streams) */ memset(inbuf + INBUF_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE); printf("Decode video file %s to %s\n", filename, outfilename); - /* find the mpeg1 video decoder */ + /* find the MPEG-1 video decoder */ codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO); if (!codec) { fprintf(stderr, "Codec not found\n"); @@ -613,9 +613,9 @@ static void video_decode_example(const char *outfilename, const char *filename) exit(1); } - /* some codecs, such as MPEG, transmit the I and P frame with a + /* Some codecs, such as MPEG, transmit the I- and P-frame with a latency of one frame. You must do the following to have a - chance to get the last frame of the video */ + chance to get the last frame of the video. */ avpkt.data = NULL; avpkt.size = 0; decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 1); diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index 2fc6f71..f1f5bb8 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -161,7 +161,7 @@ static void add_stream(OutputStream *ost, AVFormatContext *oc, c->gop_size = 12; /* emit one intra frame every twelve frames at most */ c->pix_fmt = STREAM_PIX_FMT; if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) { - /* just for testing, we also add B frames */ + /* just for testing, we also add B-frames */ c->max_b_frames = 2; } if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) { diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index e02807c..7368cdb 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -720,7 +720,7 @@ For DXVA2, this option should contain the number of the display adapter to use. If this option is not specified, the default adapter is used. @item qsv -For QSV, this option corresponds to the valus of MFX_IMPL_* . Allowed values +For QSV, this option corresponds to the values of MFX_IMPL_* . Allowed values are: @table @option @item auto diff --git a/doc/filters.texi b/doc/filters.texi index f47b0cc..7267b21 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5667,7 +5667,7 @@ It accepts the following parameters: @item limit Set higher black value threshold, which can be optionally specified -from nothing (0) to everything (255 for 8bit based formats). An intensity +from nothing (0) to everything (255 for 8-bit based formats). An intensity value greater to the set value is considered non-black. It defaults to 24. You can also specify a value between 0.0 and 1.0 which will be scaled depending on the bitdepth of the pixel format. @@ -8305,7 +8305,7 @@ geq=lum=255*gauss((X/W-0.5)*3)*gauss((Y/H-0.5)*3)/gauss(0)/gauss(0),format=gray @section gradfun Fix the banding artifacts that are sometimes introduced into nearly flat -regions by truncation to 8bit color depth. +regions by truncation to 8-bit color depth. Interpolate the gradients that should go where the bands are, and dither them. @@ -15588,7 +15588,7 @@ select=between(t\,10\,20) @end example @item -Select only I frames contained in the 10-20 time interval: +Select only I-frames contained in the 10-20 time interval: @example select=between(t\,10\,20)*eq(pict_type\,I) @end example diff --git a/doc/git-howto.texi b/doc/git-howto.texi index e5e3c81..2b4fb80 100644 --- a/doc/git-howto.texi +++ b/doc/git-howto.texi @@ -408,7 +408,7 @@ with @option{--dry-run} first. And then inspecting the commits listed with @command{git log -p 1234567..987654}. The @command{git status} command may help in finding local changes that have been forgotten to be added. -Next let the code pass through a full run of our testsuite. +Next let the code pass through a full run of our test suite. @itemize @item @command{make distclean} @@ -418,7 +418,7 @@ Next let the code pass through a full run of our testsuite. @end itemize Make sure all your changes have been checked before pushing them, the -testsuite only checks against regressions and that only to some extend. It does +test suite only checks against regressions and that only to some extend. It does obviously not check newly added features/code to be working unless you have added a test for that (which is recommended). diff --git a/doc/nut.texi b/doc/nut.texi index a02f86a..f9b18f5 100644 --- a/doc/nut.texi +++ b/doc/nut.texi @@ -34,7 +34,7 @@ NUT has some variants signaled by using the flags field in its main header. The BROADCAST variant provides a secondary time reference to facilitate detecting endpoint latency and network delays. -It assumes all the endpoint clocks are syncronized. +It assumes all the endpoint clocks are synchronized. To be used in real-time scenarios. @section PIPE diff --git a/doc/optimization.txt b/doc/optimization.txt index 1a0b98c..b4b0a06 100644 --- a/doc/optimization.txt +++ b/doc/optimization.txt @@ -7,7 +7,7 @@ If you plan to do non-x86 architecture specific optimizations (SIMD normally), then take a look in the x86/ directory, as most important functions are already optimized for MMX. -If you want to do x86 optimizations then you can either try to finetune the +If you want to do x86 optimizations then you can either try to fine-tune the stuff in the x86 directory or find some other functions in the C source to optimize, but there aren't many left. @@ -163,7 +163,7 @@ general x86 registers (e.g. eax) as well as XMM registers. This last one is particularly important on Win64, where xmm6-15 are callee-save, and not restoring their contents leads to undefined results. In external asm (e.g. yasm), you do this by using: -cglobal functon_name, num_args, num_regs, num_xmm_regs +cglobal function_name, num_args, num_regs, num_xmm_regs In inline asm, you specify clobbered registers at the end of your asm: __asm__(".." ::: "%eax"). If gcc is not set to support sse (-msse) it will not accept xmm registers diff --git a/doc/platform.texi b/doc/platform.texi index f7ee456..21b135f 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -63,7 +63,7 @@ bash ./configure @section Darwin (Mac OS X, iPhone) The toolchain provided with Xcode is sufficient to build the basic -unacelerated code. +unaccelerated code. Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from @url{https://github.com/FFmpeg/gas-preprocessor} or @@ -144,7 +144,7 @@ pacman -S make pkgconf diffutils pacman -S mingw-w64-x86_64-yasm mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL @end example -To target 32bit replace the @code{x86_64} with @code{i686} in the command above. +To target 32 bits replace @code{x86_64} with @code{i686} in the command above. @section Microsoft Visual C++ or Intel C++ Compiler for Windows diff --git a/doc/swscale.txt b/doc/swscale.txt index 2066009..dbb4e29 100644 --- a/doc/swscale.txt +++ b/doc/swscale.txt @@ -10,12 +10,12 @@ Current (simplified) Architecture: / \ special converter [Input to YUV converter] | | - | (8bit YUV 4:4:4 / 4:2:2 / 4:2:0 / 4:0:0 ) + | (8-bit YUV 4:4:4 / 4:2:2 / 4:2:0 / 4:0:0 ) | | | v | Horizontal scaler | | - | (15bit YUV 4:4:4 / 4:2:2 / 4:2:0 / 4:1:1 / 4:0:0 ) + | (15-bit YUV 4:4:4 / 4:2:2 / 4:2:0 / 4:1:1 / 4:0:0 ) | | | v | Vertical scaler and output converter @@ -1922,7 +1922,7 @@ int guess_input_channel_layout(InputStream *ist) return 0; av_get_channel_layout_string(layout_name, sizeof(layout_name), dec->channels, dec->channel_layout); - av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Input Stream " + av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Input Stream " "#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name); } return 1; @@ -2745,7 +2745,7 @@ static int stream_component_open(VideoState *is, int stream_index) /* init averaging filter */ is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB); is->audio_diff_avg_count = 0; - /* since we do not have a precise anough audio fifo fullness, + /* since we do not have a precise anough audio FIFO fullness, we correct audio sync only if larger than this threshold */ is->audio_diff_threshold = (double)(is->audio_hw_buf_size) / is->audio_tgt.bytes_per_sec; diff --git a/libavcodec/aarch64/mpegaudiodsp_neon.S b/libavcodec/aarch64/mpegaudiodsp_neon.S index 733fc84..97d2e1f 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 6abf3b7..fd63aba 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 FFmpeg. * diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 3c92fc6..46c63a2 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 fcbb70b..580db7d 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 FFmpeg. * diff --git a/libavcodec/adpcm_data.c b/libavcodec/adpcm_data.c index 655bfc4..52271be 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 FFmpeg. * diff --git a/libavcodec/adpcm_data.h b/libavcodec/adpcm_data.h index 3ae2784..5a68713 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 FFmpeg. * diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 9ceea09..36974fd 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 548f5bd..b9c3400 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 (10) - * 8bit rice param limit (14) - * 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 (10) + * 8 bits rice param limit (14) + * 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 <inttypes.h> diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index 2299a25..ea299ac 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -547,13 +547,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 8390582..e0152a6 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 21d5ae1..4808ea7 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -206,7 +206,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 1e89a7b..b99598b 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -339,10 +339,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<<shift - * @return the culmulative frequency + * @return the cumulative frequency */ static inline int range_decode_culfreq(APEContext *ctx, int tot_f) { diff --git a/libavcodec/arm/mlpdsp_armv6.S b/libavcodec/arm/mlpdsp_armv6.S index d98f807..b7ecf6c 100644 --- a/libavcodec/arm/mlpdsp_armv6.S +++ b/libavcodec/arm/mlpdsp_armv6.S @@ -240,7 +240,7 @@ DAT3 .req v4 DAT4 .req v5 DAT5 .req v6 DAT6 .req sl // use these rather than the otherwise unused -DAT7 .req fp // ip and lr so that we can load them usinf LDRD +DAT7 .req fp // ip and lr so that we can load them using LDRD .macro output4words tail, head, r0, r1, r2, r3, r4, r5, r6, r7, pointer_dead=0 .if \head diff --git a/libavcodec/arm/mpegvideo_armv5te.c b/libavcodec/arm/mpegvideo_armv5te.c index 88c5f4f..e20bb4c 100644 --- a/libavcodec/arm/mpegvideo_armv5te.c +++ b/libavcodec/arm/mpegvideo_armv5te.c @@ -29,7 +29,7 @@ void ff_dct_unquantize_h263_armv5te(int16_t *block, int qmul, int qadd, int coun #ifdef ENABLE_ARM_TESTS /** - * h263 dequantizer supplementary function, it is performance critical and needs to + * H.263 dequantizer supplementary function, it is performance critical and needs to * have optimized implementations for each architecture. Is also used as a reference * implementation in regression tests */ diff --git a/libavcodec/arm/simple_idct_arm.S b/libavcodec/arm/simple_idct_arm.S index c630073..42d79ab 100644 --- a/libavcodec/arm/simple_idct_arm.S +++ b/libavcodec/arm/simple_idct_arm.S @@ -64,7 +64,7 @@ function ff_simple_idct_arm, export=1 __row_loop: - @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimize ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :) + @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimize ldr accesses (i.e. split 32 bits in two 16-bit words), at least it gives more usable registers :) ldr r1, [r14, #0] @ R1=(int32)(R12)[0]=ROWr32[0] (relative row cast to a 32b pointer) ldr r2, [r14, #4] @ R2=(int32)(R12)[1]=ROWr32[1] ldr r3, [r14, #8] @ R3=ROWr32[2] @@ -234,8 +234,8 @@ __end_a_evaluation: @@ row[7] = (a0 - b0) >> 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 5319346..2e87fb0 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/avcodec.h b/libavcodec/avcodec.h index 0181eb1..682aa35 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -880,7 +880,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 */ @@ -997,7 +997,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. @@ -1177,7 +1177,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. @@ -1257,7 +1257,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 /** @@ -1751,9 +1751,9 @@ 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 problems if it is read with the bitstream reader. * The bytewise contents of extradata must not depend on the architecture or CPU endianness. @@ -1823,7 +1823,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. @@ -1839,7 +1839,7 @@ typedef struct AVCodecContext { * the decoded frame is cropped before being output or lowres is enabled. * * @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 @@ -1866,7 +1866,7 @@ typedef struct AVCodecContext { * 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. @@ -1976,8 +1976,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 @@ -2189,7 +2189,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 @@ -2280,14 +2280,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 */ @@ -2507,7 +2507,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 @@ -2851,7 +2851,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 @@ -2922,9 +2922,9 @@ typedef struct AVCodecContext { * - decoding: Set by user. */ 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 /** @@ -2952,7 +2952,7 @@ typedef struct AVCodecContext { /** - * 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. @@ -5950,7 +5950,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 131eaa1..dffcdee 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1240,7 +1240,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 ff9d013..9785ef7 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -150,7 +150,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.) @@ -248,7 +248,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 the 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 0ca64a7..3435df5 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 f1a4656..a2190d7 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 FFmpeg. * diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 1b38019..794a475 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -141,7 +141,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]; @@ -1187,7 +1187,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; @@ -1260,7 +1260,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 7b9cba3..dcdb912 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 c7ec008..8e6749b 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 FFmpeg. * diff --git a/libavcodec/dcadata.c b/libavcodec/dcadata.c index 39aea73..b2e0f6c 100644 --- a/libavcodec/dcadata.c +++ b/libavcodec/dcadata.c @@ -52,7 +52,7 @@ const uint8_t ff_dca_dmix_primary_nch[8] = { /* 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 }, @@ -4215,7 +4215,7 @@ const uint32_t ff_dca_quant_levels[32] = { 2097152, 4194304, 8388608, 0, 0, 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, @@ -4223,7 +4223,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/dct-test.c b/libavcodec/dct-test.c index e5ef837..df1b75d 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -442,7 +442,7 @@ static void help(void) printf("dct-test [-i] [<test-number>] [<bits>]\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" "bits Number of time domain bits to use, 8 is default\n" "-i test IDCT implementations\n" "-4 test IDCT248 implementations\n" diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 4f706b6..aee4323 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -36,8 +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 52a2c61..2edd4d5 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 FFmpeg. * diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index a6aa0f6..84a8e6c 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 4e202f9..bb0f005 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 23ae948..b6049c9 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -31,7 +31,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 @@ -199,7 +199,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 separate 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 b2e1465..23d43e2 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -1136,7 +1136,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 38a57b7..d444ec3 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's responsibility 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 1855400..75ada24 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -191,13 +191,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; @@ -1706,7 +1706,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; @@ -1718,7 +1718,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 53d1168..aa29a7b 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 7535a40..c9c6c24 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 FFmpeg. * @@ -133,7 +133,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 */ avpriv_request_sample(avctx, "24Bpp FLC/FLX"); return AVERROR_PATCHWELCOME; default : @@ -793,7 +793,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 a2cd399..15f794e 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 3e8c489..6f283b4 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -466,7 +466,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 @@ -914,7 +914,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 c3d018f..c7d138e 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 arithmetic 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) @@ -98,7 +98,7 @@ typedef struct G726Context { int little_endian; /**< little-endian bitstream as used in aiff and Sun AU */ } 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 }; @@ -107,7 +107,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 }; @@ -116,7 +116,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, @@ -127,7 +127,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[] = @@ -152,7 +152,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) { @@ -178,14 +178,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<<dex) >> 7); } diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 4cf61d6..48c3c44 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -91,7 +91,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. @@ -224,7 +224,7 @@ static inline void skip_bits_long(GetBitContext *s, int n) } /** - * read mpeg1 dc style vlc (sign bit + mantissa with no MSB). + * Read MPEG-1 dc-style VLC (sign bit + mantissa 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 f33d1a1..47bad4e 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 <michaelni@gmx.at> * 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 5586462..399a404 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -1,5 +1,5 @@ /* - * H261 decoder + * H.261 codec * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * 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 9c31557..2299c1c 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 <michaelni@gmx.at> * 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 df60ac5..7f2fff8 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -1,5 +1,5 @@ /* - * H261 decoder + * H.261 decoder * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * Copyright (c) 2004 Maarten Daniels * @@ -601,7 +601,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 24ef577..315762c 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -1,5 +1,5 @@ /* - * H261 encoder + * H.261 encoder * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * Copyright (c) 2004 Maarten Daniels * diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 800387d..4720c56 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 <michaelni@gmx.at> * @@ -24,7 +24,7 @@ /** * @file - * h263/mpeg4 codec. + * H.263/MPEG-4 codec. */ #include <limits.h> @@ -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 3c3f169..d154d36 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 FFmpeg. * @@ -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 ceda80f..f649d58 100644 --- a/libavcodec/h263data.c +++ b/libavcodec/h263data.c @@ -1,5 +1,5 @@ /* - * H263+ tables + * H.263+ tables * * This file is part of FFmpeg. * diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h index 0ad2ef4..3da0e37 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 <michaelni@gmx.at> * diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 628546b..d0da1d3 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -129,7 +129,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) if (avctx->extradata_size == 56 && avctx->extradata[0] == 1) s->ehc_mode = 1; - /* 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_H263P && avctx->codec->id != AV_CODEC_ID_MPEG4) { @@ -475,7 +475,7 @@ retry: 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 :-) */ @@ -536,9 +536,9 @@ retry: goto retry; } - /* 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 067f132..a61379c 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264.h b/libavcodec/h264.h index c4d2921..efe3555 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 <michaelni@gmx.at> */ @@ -433,7 +433,7 @@ typedef struct H264SliceContext { DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4]; - ///< as a dct coefficient 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 @@ -472,7 +472,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; @@ -563,7 +563,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) diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h index 3619192..a3c7e1f 100644 --- a/libavcodec/h2645_parse.h +++ b/libavcodec/h2645_parse.h @@ -58,7 +58,7 @@ typedef struct H2645NAL { int skipped_bytes_pos_size; int *skipped_bytes_pos; /** - * 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 85eeb7a..68d7282 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 <michaelni@gmx.at> */ @@ -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 a280a9c..d01586d 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 9da6745..e137ff9 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 7431b5e..0ef0c12 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index c9fdf7a..e33a59e 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 <stdint.h> @@ -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 2a01a27..be02e5a 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 <michaelni@gmx.at> * * This file is part of FFmpeg. @@ -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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 3ef640f..40d88ed 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 42ad932..ce4bab2 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index e2e324b..3e9b79a 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index fb05b05..943d953 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 01eb9db..2f80de1 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 <michaelni@gmx.at> */ @@ -674,7 +674,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 d0596dc..62561fb 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 <michaelni@gmx.at> * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 sei decoding. + * H.264 / AVC / MPEG-4 part10 SEI decoding. * @author Michael Niedermayer <michaelni@gmx.at> */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 6e7b940..474400b 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 <michaelni@gmx.at> */ @@ -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_mallocz(&sl->top_borders[0], &sl->top_borders_allocated[0], @@ -1022,7 +1022,7 @@ static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a) /** * 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 046b6c2..b71aaea 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264data.c b/libavcodec/h264data.c index 823db42..da203a9 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 <michaelni@gmx.at> * * This file is part of FFmpeg. @@ -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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index bfb6f1e..d26f552 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264dsp.h b/libavcodec/h264dsp.h index c232193..7f24376 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 9b2cc24..d9dcf6b 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 <michaelni@gmx.at> */ diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 8f15f71..5632a58 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 <michaelni@gmx.at> */ @@ -556,7 +556,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 091dcbb..2863dc9 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 <michaelni@gmx.at> */ @@ -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 f684433..2b30fff 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 <michaelni@gmx.at> */ diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 00da575..4a6dde0 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -81,7 +81,7 @@ static av_always_inline int z_scan_block_avail(HEVCContext *s, int xCurr, int yC } } -//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 av_always_inline int is_diff_mer(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 f598b63..148f246 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -122,7 +122,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 4a0a6fb..0870172 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 FFmpeg. * diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 850bc9d..ac20920 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -70,7 +70,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 3f31946..e161f83 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -53,7 +53,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 @@ -317,7 +317,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 fe8f0ba..fbe76af 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 fe8d185..6734d44 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -43,8 +43,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 */ @@ -52,7 +52,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; @@ -77,7 +77,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 1460741..88c610d 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 FFmpeg. * diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 9af6d1e..1e881fc 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -215,7 +215,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; } @@ -249,12 +249,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 00be202..e4a7ad4 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 <michaelni@gmx.at> * @@ -24,7 +24,7 @@ /** * @file - * h263 decoder. + * H.263 decoder. */ #define UNCHECKED_BITSTREAM_READER 1 @@ -277,7 +277,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) @@ -872,7 +872,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; @@ -908,8 +908,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 */ @@ -936,7 +936,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 */ @@ -1029,7 +1029,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 d9596c9..a8bfe91 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 <michaelni@gmx.at> * @@ -24,7 +24,7 @@ /** * @file - * h263 bitstream encoder. + * H.263 bitstream encoder. */ #include <limits.h> @@ -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 { @@ -262,7 +262,7 @@ void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line) } /** - * modify qscale so that encoding is actually 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; @@ -774,7 +774,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; @@ -784,7 +784,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; @@ -800,7 +800,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 4b97399..bc9de1a 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 f64c718..c38bb3b 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 b5b2dbf..94efc94 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -249,7 +249,7 @@ static void init_band_stepsize(AVCodecContext *avctx, band->i_stepsize = band->f_stepsize * (1 << 15); - /* FIXME: In openjepg code stespize = stepsize * 0.5. Why? + /* FIXME: In OpenJPEG code stepsize = 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; diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index cd16184..1208cda 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -386,7 +386,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 94d723d..93d1344 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) @@ -234,7 +234,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 14d6ccc..8545ffe 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 FFmpeg. * @@ -151,7 +151,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/libopusdec.c b/libavcodec/libopusdec.c index bdc948c..acc62f1 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -79,7 +79,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 ffmpeg order */ + /* Remap channels from Vorbis order to ffmpeg order */ for (ch = 0; ch < avc->channels; ch++) mapping_arr[ch] = mapping[vorbis_offset[ch]]; mapping = mapping_arr; diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index d5da6fc..cf4baa1 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -354,7 +354,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 65a84dc..4bdb961 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -216,7 +216,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 c581b34..fae55e8 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -253,7 +253,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 92fa185..2a15650 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 FFmpeg. * @@ -51,7 +51,7 @@ static const AVClass amrwb_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 32d5e48..d916f11 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 <krevnik@comcast.net> * * This file is part of FFmpeg. @@ -84,7 +84,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 */ }; /** @@ -145,7 +145,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, @@ -691,7 +691,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 17f59ea..9aba020 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -34,7 +34,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<lp_order-1; i++) for(j=i; j>=0 && lsfq[j] > lsfq[j+1]; j--) diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h index 46a2d47..621ebea 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 7d38fc2..d773329 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -190,7 +190,7 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) s->quant_matrixes[index][i] = get_bits(&s->gb, pr ? 16 : 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][1], s->quant_matrixes[index][8]) >> 1; av_log(s->avctx, AV_LOG_DEBUG, "qscale[%d]: %d\n", diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index 4d77e16..60cd566 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 0c0109e..c5a2883 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -42,9 +42,9 @@ typedef struct MLPHeaderInfo int channel_arrangement; - 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/motion_est.c b/libavcodec/motion_est.c index 77a07a5..257d00b 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -205,7 +205,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); @@ -556,7 +556,7 @@ static inline void get_limits(MpegEncContext *s, int x, int y) c->xmax = - x + s->width; c->ymax = - y + s->height; } 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; @@ -966,7 +966,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]; } @@ -1536,7 +1536,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 ec5e6ed..0c21bbf 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -429,7 +429,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 = ((unsigned)best[1]<<ME_MAP_MV_BITS) + best[0] + map_generation; const int index= (((unsigned)best[1]<<ME_MAP_SHIFT) + best[0])&(ME_MAP_SIZE-1); - if(map[index]!=key){ //this will be executed only very rarey + if (map[index] != key) { // this will be executed only very rarely score_map[index]= cmp(s, best[0], best[1], 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags); map[index]= key; } @@ -758,7 +758,7 @@ static int sab_diamond_search(MpegEncContext * s, int *best, int dmin, if( best[0] < xmax && best[0] > 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) @@ -871,7 +871,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 @@ -972,7 +972,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 14b7b9b..1bebaf1 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 <Reimar.Doeffinger@gmx.de> * diff --git a/libavcodec/motionpixels_tablegen.h b/libavcodec/motionpixels_tablegen.h index 4ffe74c..9239b6a 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 <Reimar.Doeffinger@gmx.de> * diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index a20ef92..ad9b00c 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 <aurel@gnuage.org> * * This file is part of FFmpeg. diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c index e8c4a5d..416bbb8 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 <michaelni@gmx.at> * @@ -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 65b9485..f51faf4 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 <michaelni@gmx.at> * @@ -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 b861358..54a70e3 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -708,7 +708,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; } @@ -721,7 +721,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]; @@ -730,7 +730,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]; @@ -1958,7 +1958,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, 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; } @@ -2266,7 +2266,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 ea45c07..f45598a 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 <michaelni@gmx.at> * @@ -22,7 +22,7 @@ /** * @file - * MPEG1/2 encoder + * MPEG-1/2 encoder */ #include <stdint.h> @@ -144,12 +144,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); } } @@ -249,7 +249,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 & 0xFFF); @@ -423,7 +423,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 31888fd..ca06e56 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 <michaelni@gmx.at> * @@ -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 1ac5840..b7c3fab 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 <michaelni@gmx.at> * * This file is part of FFmpeg. @@ -22,7 +22,7 @@ /** * @file - * mpeg4 tables. + * MPEG-4 tables. */ #ifndef AVCODEC_MPEG4DATA_H @@ -31,7 +31,7 @@ #include <stdint.h> #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 d7c6fe7..2aaa9f7 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 <michaelni@gmx.at> * @@ -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 5d896fa..515b008 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 <michaelni@gmx.at> * @@ -107,7 +107,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 aa5e87a..b7d6da1 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 50f8b44..8008e69 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 1fef372..4105ed6 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 <michaelni@gmx.at> * @@ -212,7 +212,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; @@ -235,7 +235,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 @@ -1459,7 +1459,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) { @@ -1753,7 +1753,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 overridden. */ + * low delay detection will not be overridden. */ if (s->picture_number == 0) { switch(s->vo_type) { case SIMPLE_VO_TYPE: @@ -1819,7 +1819,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 @@ -1962,7 +1962,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 */ @@ -2314,7 +2314,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); @@ -2428,7 +2428,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 AVERROR_INVALIDDATA; // makes no sense to continue, as there is nothing left from the image then } @@ -2436,7 +2436,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"); s->f_code = 1; return AVERROR_INVALIDDATA; // makes no sense to continue, as there is nothing left from the image then } @@ -2486,7 +2486,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) { @@ -2509,7 +2509,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 diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 1ba9238..3149310 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 <michaelni@gmx.at> * @@ -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 actually 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], av_assert2((s->dquant & 1) == 0); av_assert2(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) { @@ -886,7 +886,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) { @@ -1054,7 +1054,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); @@ -1085,7 +1085,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, } } -/* write mpeg4 VOP header */ +/* write MPEG-4 VOP header */ int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number) { uint64_t time_incr; diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 6300bb1..91c4051 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1429,7 +1429,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 55d5a15..952ba17 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(uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate, enum AVCodecID *codec_id); diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index b91d0a8..93363fe 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -599,7 +599,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, @@ -614,7 +614,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 16b8f52..6748fc2 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -71,8 +71,8 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, } // 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 // we also use this buffer for encoding in encode_mb_internal() needig an additional 32 lines diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ecb585f..eb14b8c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -59,7 +59,7 @@ static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, nCoeffs= s->block_last_index[n]; block[0] *= n < 4 ? s->y_dc_scale : 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]; @@ -567,7 +567,7 @@ do {\ s->workaround_bugs = s1->workaround_bugs; s->padding_bug_score = s1->padding_bug_score; - // 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); @@ -598,7 +598,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, @@ -612,7 +612,7 @@ do {\ "be allocated due to unknown size.\n"); } - // MPEG2/interlacing info + // MPEG-2/interlacing info memcpy(&s->progressive_sequence, &s1->progressive_sequence, (char *) &s1->rtp_mode - (char *) &s1->progressive_sequence); @@ -705,7 +705,8 @@ static int init_context_frame(MpegEncContext *s) if (s->mb_height & 1) yc_size += 2*s->b8_stride + 2*s->mb_stride; - FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num + 1) * sizeof(int), fail); // error ressilience code looks cleaner with this + FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num + 1) * sizeof(int), + 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; @@ -787,7 +788,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: @@ -1204,7 +1205,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 && @@ -1396,8 +1397,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 df5e4bf..a1f3d4b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -81,16 +81,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 */ @@ -99,20 +99,20 @@ typedef struct MpegEncContext { int intra_only; ///< if true, only intra pictures are generated int64_t 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 */ @@ -132,7 +132,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() /** @@ -179,19 +179,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 mpeg4 AC prediction, all 3 arrays must be continuous + int16_t (*ac_val[3])[16]; ///< used 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 @@ -200,7 +200,7 @@ 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 @@ -209,7 +209,7 @@ typedef struct MpegEncContext { int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... int vbv_delay; 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; AVRational mpeg2_frame_rate_ext; @@ -218,7 +218,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; @@ -233,7 +233,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]; @@ -242,14 +242,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 @@ -261,10 +261,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 @@ -275,14 +275,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; @@ -357,7 +357,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; @@ -372,7 +372,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 @@ -380,7 +380,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; @@ -401,12 +401,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; @@ -430,7 +430,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; @@ -444,9 +444,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. */ @@ -514,9 +514,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); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f8de028..2e12a3d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -538,7 +538,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; } if (s->max_b_frames < 0) { @@ -664,7 +664,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; } } @@ -1005,7 +1005,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->chroma_intra_matrix[j] = s->intra_matrix[j] = ff_mpeg1_default_intra_matrix[i]; s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; @@ -1327,7 +1327,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 */ @@ -1537,7 +1537,7 @@ static int select_input_picture(MpegEncContext *s) if (s->picture_in_gop_number < s->gop_size && s->next_picture_ptr && 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); ff_vbv_update(s, 0); @@ -1613,7 +1613,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) { @@ -1657,7 +1657,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; @@ -2008,7 +2008,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 && @@ -2606,7 +2606,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]; @@ -2635,7 +2635,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]; @@ -3526,7 +3526,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; @@ -3682,7 +3682,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); @@ -4120,7 +4120,7 @@ static int dct_quantize_trellis_c(MpegEncContext *s, } else if(s->out_format == FMT_MJPEG) { j = s->idsp.idct_permutation[scantable[i]]; unquant_coeff = alevel * matrix[j] * 8; - }else{ //MPEG1 + }else{ // MPEG-1 j = s->idsp.idct_permutation[scantable[i]]; // FIXME: optimize if(s->mb_intra){ unquant_coeff = (int)( alevel * mpeg2_qscale * matrix[j]) >> 4; @@ -4190,7 +4190,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) @@ -4210,7 +4210,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; @@ -4241,7 +4242,7 @@ static int dct_quantize_trellis_c(MpegEncContext *s, if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ unquant_coeff= (alevel*qmul + qadd)>>3; - }else{ //MPEG1 + } else{ // MPEG-1 unquant_coeff = ((( alevel << 1) + 1) * mpeg2_qscale * ((int) matrix[0])) >> 5; unquant_coeff = (unquant_coeff - 1) | 1; } @@ -4369,7 +4370,7 @@ static int messed_sign=0; #endif dc += (1<<(RECON_SHIFT-1)); for(i=0; i<64; i++){ - rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly instead of copying to rem[] + rem[i] = dc - (orig[i] << RECON_SHIFT); // FIXME use orig directly instead of copying to rem[] } #ifdef REFINE_STATS STOP_TIMER("memset rem[]")} @@ -4680,7 +4681,7 @@ STOP_TIMER("iterative search") } /** - * Permute an 8x8 block according to permuatation. + * Permute an 8x8 block according to permutation. * @param block the block which will be permuted according to * the given permutation vector * @param permutation the permutation vector diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 5deb2c8..c29810f 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -591,7 +591,7 @@ static inline void qpel_motion(MpegEncContext *s, } /** - * h263 chroma 4mv motion compensation. + * H.263 chroma 4mv motion compensation. */ static void chroma_4mv_motion(MpegEncContext *s, uint8_t *dest_cb, uint8_t *dest_cr, diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 1f74bfb..206f268 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -1,5 +1,5 @@ /* - * MPEG1 / MPEG2 video parser + * MPEG-1 / MPEG-2 video parser * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * diff --git a/libavcodec/mqc.h b/libavcodec/mqc.h index 39104b1..8bf7223 100644 --- a/libavcodec/mqc.h +++ b/libavcodec/mqc.h @@ -66,7 +66,7 @@ int ff_mqc_flush_to(MqcState *mqc, uint8_t *dst, int *dst_len); /** * Initialize MQ-decoder. * @param mqc MQ decoder state - * @param bp byte poiter + * @param bp byte pointer * @param raw raw mode * @param reset reset states */ @@ -76,7 +76,7 @@ void ff_mqc_initdec(MqcState *mqc, uint8_t *bp, int raw, int reset); * 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 c9a2108..920f50f 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -40,14 +40,14 @@ #include "libavutil/imgutils.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) { @@ -71,7 +71,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<<uni_len)-1; //M$ does not like compatibility @@ -87,7 +87,7 @@ static av_cold void init_h263_dc_for_msmpeg4(void) ff_v2_dc_lum_table[level + 256][0] = uni_code; ff_v2_dc_lum_table[level + 256][1] = uni_len; - /* chrominance h263 */ + /* chrominance H.263 */ uni_code= ff_mpeg4_DCtab_chrom[size][0]; uni_len = ff_mpeg4_DCtab_chrom[size][1]; uni_code ^= (1<<uni_len)-1; //M$ does not like compatibility @@ -252,7 +252,7 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, c = FASTDIV((c + (scale >> 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 aaadd9c..35aa15c 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -70,7 +70,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; @@ -572,7 +572,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 e1ade24..07241e8 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -235,8 +235,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 3090a91..c2f6242 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 FFmpeg. * diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index b6c45a0..1d14172 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 FFmpeg. * diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index ade3310..ad6c029 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -179,7 +179,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); @@ -207,7 +207,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, break; } retry: - // 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 ae1612f..984dd3b 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -300,7 +300,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); @@ -893,7 +893,7 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) if (avctx->gop_size > 0) { 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. */ + /* 0 is intra-only, 1 is I/P only, 2 is one B-Frame, 3 two B-frames, and so on. */ ctx->encode_config.frameIntervalP = avctx->max_b_frames + 1; } @@ -991,7 +991,8 @@ static av_cold int nvenc_alloc_surface(AVCodecContext *avctx, int idx) ctx->surfaces[idx].lockCount = 0; - /* 1MB is large enough to hold most output frames. NVENC increases this automaticaly if it's not enough. */ + /* 1MB is large enough to hold most output frames. + * NVENC increases this automaticaly if it is not enough. */ allocOut.size = 1024 * 1024; allocOut.memoryHeap = NV_ENC_MEMORY_HEAP_SYSMEM_CACHED; diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index cdb80f2..19103f9 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -108,7 +108,7 @@ static const AVClass nvenc_class = { AVCodec ff_nvenc_encoder = { .name = "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, @@ -134,7 +134,7 @@ static const AVClass nvenc_h264_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 = ff_nvenc_encode_init, diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 887fc56..674a0c3 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 262ea98..adfbe72 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -121,7 +121,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, 1024, 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", "set maximum number of B frames between non-B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E}, +{"bf", "set maximum number of B-frames between non-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 47f2657..703d2e8 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -265,7 +265,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++; } @@ -397,7 +397,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 a78c05d..04c321e 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -33,7 +33,7 @@ typedef struct PCMDVDContext { int block_size; // Size of a block of samples in bytes int last_block_size; // Size of the last 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; @@ -106,7 +106,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 24318fb..36275ae 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1258,7 +1258,7 @@ exit_loop: } } - /* handle p-frames only if a predecessor frame is available */ + /* handle P-frames only if a predecessor frame is available */ if (s->last_picture.f->data[0]) { if ( !(avpkt->flags & AV_PKT_FLAG_KEY) && avctx->codec_tag != AV_RL32("MPNG") && s->last_picture.f->width == p->width diff --git a/libavcodec/pthread_internal.h b/libavcodec/pthread_internal.h index 6a2f378..d2115cb 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 adb3e82..b4afda2 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -603,7 +603,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 52881cc..074aafd 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -235,7 +235,7 @@ static int qdm2_get_se_vlc(const 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 * @@ -1831,7 +1831,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 d9052e0..70ccbc5 100644 --- a/libavcodec/qsvdec_mpeg2.c +++ b/libavcodec/qsvdec_mpeg2.c @@ -1,5 +1,5 @@ /* - * Intel MediaSDK QSV based MPEG2 video decoder + * Intel MediaSDK QSV based MPEG-2 video decoder * * This file is part of FFmpeg. * diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 3f482f4..d9d27f0 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 FFmpeg. * diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index a4ed85a..5aa7420 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -138,7 +138,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui int i; signed char rlecode; - /* 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 @@ -264,7 +264,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 output 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 696a49e..ceec32d 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 FFmpeg. * diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index df74790..19a4ce0 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 FFmpeg. * diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 32755d2..d3a7fff 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 8f5a7f2..e141bb3 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 FFmpeg. * diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index d30e49a..fa0b528 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 FFmpeg. * diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6c2b4af..3a8ac22 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -182,8 +182,8 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(ENOMEM); rcc->num_entries = i; - /* 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]; @@ -203,7 +203,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); @@ -652,9 +652,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 eeb4bb9..c15f9e2 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 int64_t last_mc_mb_var_sum; diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h index 594a760..df7c18a 100644 --- a/libavcodec/rectangle.h +++ b/libavcodec/rectangle.h @@ -65,7 +65,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/roqvideodec.c b/libavcodec/roqvideodec.c index 5f0b204..4c5dec5 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 FFmpeg. * diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index b6ed1f9..038a63d 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1094,7 +1094,7 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; 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 315ad23..b71ebd1 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 FFmpeg. * @@ -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 b56bb58..81aa9ae 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; } @@ -431,7 +431,7 @@ static int rv20_decode_picture_header(RVDecContext *rv) if (s->pict_type == AV_PICTURE_TYPE_B) { 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"); + "messed up order, possible from seeking? skipping current B-frame\n"); #define ERROR_SKIP_FRAME -123 return ERROR_SKIP_FRAME; } diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index b17acbc..8691d18 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/rv34.c b/libavcodec/rv34.c index c2e84a3..18f1de7 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1478,7 +1478,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 e2f40c8..efff94a 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 max_rpr; 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; int orig_width, orig_height; diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index 15334a1..34efb03 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 4b7fb79..b73614b 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 <aholtzma@ess.engr.uvic.ca>) - */ +/* Based upon some commented-out C code from mpeg2dec (idct_mmx.c + * written by Aaron Holtzman <aholtzma@ess.engr.uvic.ca>). */ #include "simple_idct.h" diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 3adf6c8..69d78ad 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 FFmpeg. * diff --git a/libavcodec/sp5x.h b/libavcodec/sp5x.h index ecd6e8d..21c4571 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 FFmpeg. * diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c index 909b0bf..cc214f9 100644 --- a/libavcodec/svq1.c +++ b/libavcodec/svq1.c @@ -3,8 +3,8 @@ * ported to MPlayer by Arpi <arpi@thot.banki.hu> * ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> * - * Copyright (c) 2002 The Xine Project - * Copyright (c) 2002 The FFmpeg Project + * Copyright (c) 2002 The Xine project + * Copyright (c) 2002 The FFmpeg project * * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net> * diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h index 88d61d1..63c0479 100644 --- a/libavcodec/svq1.h +++ b/libavcodec/svq1.h @@ -3,8 +3,8 @@ * ported to MPlayer by Arpi <arpi@thot.banki.hu> * ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> * - * Copyright (c) 2002 The Xine Project - * Copyright (c) 2002 The FFmpeg Project + * Copyright (c) 2002 The Xine project + * Copyright (c) 2002 The FFmpeg project * * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net> * diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h index 41485d2..11f7969 100644 --- a/libavcodec/svq1_cb.h +++ b/libavcodec/svq1_cb.h @@ -3,8 +3,8 @@ * ported to MPlayer by Arpi <arpi@thot.banki.hu> * ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> * - * Copyright (c) 2002 The Xine Project - * Copyright (c) 2002 The FFmpeg Project + * Copyright (c) 2002 The Xine project + * Copyright (c) 2002 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavcodec/svq1_vlc.h b/libavcodec/svq1_vlc.h index f5d298d..06e3509 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 FFmpeg. * diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index dca99fa..2b72e08 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -3,8 +3,8 @@ * ported to MPlayer by Arpi <arpi@thot.banki.hu> * ported to libavcodec by Nick Kurshev <nickols_k@mail.ru> * - * Copyright (c) 2002 The Xine Project - * Copyright (c) 2002 The FFmpeg Project + * Copyright (c) 2002 The Xine project + * Copyright (c) 2002 The FFmpeg project * * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net> * diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index d968d36..cb7c4a1 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -152,7 +152,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); av_assert2(mean > -300 && mean < 300); diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 312c099..557f63a 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -138,7 +138,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 63cd443..d1265a0 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 c5e6cc6..5012245 100644 --- a/libavcodec/texturedsp.c +++ b/libavcodec/texturedsp.c @@ -167,7 +167,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 7160396..36506a6 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 228a489..24e5ebc 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 5f4dd35..c2353f5 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 00185cf..6240413 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) @@ -609,7 +609,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 329b33c..20b1e5e 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 2e2052b..4802929 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; @@ -799,7 +799,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; } @@ -936,7 +936,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 e4d21f0..c42c08e 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; @@ -1226,7 +1226,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; } @@ -1327,7 +1327,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 d0f8d09..48a2cc1 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -391,7 +391,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, @@ -764,7 +764,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)]; @@ -1152,7 +1152,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 eefb613..556906d 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, @@ -194,18 +194,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 @@ -215,23 +215,23 @@ 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 max_coded_width, max_coded_height; 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 96d2a9b..f9f26f7 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2492,7 +2492,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; @@ -2640,7 +2640,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; @@ -2768,7 +2768,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; @@ -2844,7 +2844,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 4467646..75c74ca 100644 --- a/libavcodec/vc1_mc.c +++ b/libavcodec/vc1_mc.c @@ -188,7 +188,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; @@ -867,7 +867,7 @@ void ff_vc1_interp_mc(VC1Context *v) if (CONFIG_GRAY && 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 13134e5..54712f6 100644 --- a/libavcodec/vc1_pred.c +++ b/libavcodec/vc1_pred.c @@ -468,7 +468,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 78affe6..4f78aa8 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -417,7 +417,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/vdpau_h264.c b/libavcodec/vdpau_h264.c index a915461..5ae3449 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 5bbf47b..fa749be 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 FFmpeg. * @@ -946,14 +946,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 = @@ -1124,7 +1124,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); @@ -1322,7 +1322,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 */ @@ -1595,7 +1595,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 da31f6d..3884bca 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 FFmpeg. * diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index d8a3e0a..814c78e 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 FFmpeg. * diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index cfd82aa..374e138 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/vp9dsp.h b/libavcodec/vp9dsp.h index 016a9bb..733f5bf 100644 --- a/libavcodec/vp9dsp.h +++ b/libavcodec/vp9dsp.h @@ -47,7 +47,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 3ed9652..81d50bb 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 FFmpeg. * diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 6d1c7e5..bc8e2d1 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -429,7 +429,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 7130bf6..78b51e5 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -80,7 +80,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) @@ -349,7 +349,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", @@ -426,7 +426,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 418e958..c68babd 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 eb94ed8..6b4edfc 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -105,8 +105,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? @@ -1200,7 +1200,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/wmavoice.c b/libavcodec/wmavoice.c index 029dfdd..ceac61f 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1193,7 +1193,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). * @@ -1516,7 +1516,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 3ed8b5f..74ae12b 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 3510336..4795f5b 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -62,7 +62,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 107ae51..fa698e5 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 <hzoli -a- hzoli -d- com>, ;* 2005-2008 Loren Merritt ;* diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index 49ad0e0..4dfbc30 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 <michaelni@gmx.at> */ diff --git a/libavcodec/x86/inline_asm.h b/libavcodec/x86/inline_asm.h index 3e65a76..0198746 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 af47422..1811326 100644 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@ -1,6 +1,6 @@ /* * Optimized for ia32 CPUs by Nick Kurshev <nickols_k@mail.ru> - * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at> + * H.263, MPEG-1, MPEG-2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at> * * This file is part of FFmpeg. * @@ -180,7 +180,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 fdd81a0..d0c3af0 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 8325648..da32a3e 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -76,7 +76,7 @@ void ff_vc1_avg_hor_16b_shift2_mmxext(uint8_t *dst, x86_reg stride, /** * 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,\ @@ -135,7 +135,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 @@ -175,7 +175,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). * @@ -233,8 +233,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 @@ -271,7 +271,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 662386a..9609f83 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 FFmpeg. * diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 25a1cd2..f126515 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -513,7 +513,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - 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; diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 4ffb4d4..5c8cfc1 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -77,7 +77,7 @@ typedef struct X11GrabContext { Display *dpy; /**< X11 display from which x11grab grabs frames */ XImage *image; /**< X11 image holding the grab */ int use_shm; /**< !0 when using XShm extension */ - XShmSegmentInfo shminfo; /**< When using XShm, keeps track of XShm infos */ + XShmSegmentInfo shminfo; /**< When using XShm, keeps track of XShm info */ int draw_mouse; /**< Set by a private option. */ int follow_mouse; /**< Set by a private option. */ int show_region; /**< set by a private option. */ diff --git a/libavfilter/interlace.h b/libavfilter/interlace.h index 44f1e06..da073ae 100644 --- a/libavfilter/interlace.h +++ b/libavfilter/interlace.h @@ -47,7 +47,7 @@ enum FieldType { typedef struct InterlaceContext { const AVClass *class; enum ScanMode scan; // top or bottom field first scanning - int lowpass; // enable or disable low pass filterning + int lowpass; // enable or disable low pass filtering AVFrame *cur, *next; // the two frames from which the new one is obtained void (*lowpass_line)(uint8_t *dstp, ptrdiff_t linesize, const uint8_t *srcp, const uint8_t *srcp_above, const uint8_t *srcp_below); diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c index e9af24f..f63128d 100644 --- a/libavfilter/vf_gradfun.c +++ b/libavfilter/vf_gradfun.c @@ -26,9 +26,9 @@ * * Apply a boxblur debanding algorithm (based on the gradfun2db * AviSynth filter by prunedtree). - * Foreach pixel, if it's within threshold of the blurred value, make it closer. - * So now we have a smoothed and higher bitdepth version of all the shallow - * gradients, while leaving detailed areas untouched. + * For each pixel, if it is within the threshold of the blurred value, make it + * closer. So now we have a smoothed and higher bitdepth version of all the + * shallow gradients, while leaving detailed areas untouched. * Dither it back to 8bit. */ diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 3fb69fc..d6c14bb 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -127,7 +127,7 @@ static int denoise_depth(HQDN3DContext *s, int w, int h, int sstride, int dstride, int16_t *spatial, int16_t *temporal, int depth) { - // FIXME: For 16bit depth, frame_ant could be a pointer to the previous + // FIXME: For 16-bit depth, frame_ant could be a pointer to the previous // filtered frame rather than a separate buffer. long x, y; uint16_t *frame_ant = *frame_ant_ptr; diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 37f19ea..c33b35d 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -108,7 +108,7 @@ enum OverlayFormat { typedef struct OverlayContext { const AVClass *class; - int x, y; ///< position of overlayed picture + int x, y; ///< position of overlaid picture int allow_packed_rgb; uint8_t main_is_packed_rgb; diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 2f2f6a6..8a50778 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -1,6 +1,6 @@ /* * 4X Technologies .4xm File Demuxer (no muxer) - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/aea.c b/libavformat/aea.c index f4f1363..f795495 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -32,7 +32,7 @@ static int aea_read_probe(AVProbeData *p) if (p->buf_size <= 2048+212) return 0; - /* Magic is '00 08 00 00' in Little Endian*/ + /* Magic is '00 08 00 00' in little-endian*/ if (AV_RL32(p->buf)==0x800) { int ch, i; ch = p->buf[264]; diff --git a/libavformat/amr.c b/libavformat/amr.c index c113e92..59963e1 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -1,6 +1,6 @@ /* * amr file format - * Copyright (c) 2001 ffmpeg project + * Copyright (c) 2001 FFmpeg project * * This file is part of FFmpeg. * @@ -121,7 +121,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EIO); } - // FIXME this is wrong, this should rather be in a AVParser + // FIXME this is wrong, this should rather be in an AVParser toc = avio_r8(s->pb); mode = (toc >> 3) & 0x0F; diff --git a/libavformat/asf.h b/libavformat/asf.h index 43288dd..1a5b338 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -48,7 +48,7 @@ typedef struct ASFMainHeader { * invalid if broadcasting (could be ignored) */ uint32_t preroll; /**< timestamp of the first packet, in milliseconds * if nonzero - subtract from time */ - uint32_t ignore; ///< preroll is 64bit - but let's just ignore it + uint32_t ignore; ///< preroll is 64 bits - but let's just ignore it uint32_t flags; /**< 0x01 - broadcast * 0x02 - seekable * rest is reserved should be 0 */ diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 64be1b6..9eefa5a 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -121,8 +121,8 @@ typedef struct ASFContext { int stream_index; // from packet header, for the subpayload case - // packet parameteres - uint64_t sub_header_offset; // offset of subplayload header + // packet parameters + uint64_t sub_header_offset; // offset of subpayload header int64_t sub_dts; uint8_t dts_delta; // for subpayloads uint32_t packet_size_internal; // packet size stored inside ASFPacket, can be 0 diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index cfa4fad..88f01e0 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -227,7 +227,7 @@ typedef struct ASFContext { const char *languages[128]; int nb_languages; int64_t creation_time; - /* non streamed additonnal info */ + /* non-streamed additional info */ uint64_t nb_packets; ///< how many packets are there in the file, invalid if broadcasting int64_t duration; ///< in 100ns units /* packet filling */ @@ -578,7 +578,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, } end_header(pb, hpos); - /* title and other infos */ + /* title and other info */ if (has_title) { int len; uint8_t *buf; diff --git a/libavformat/avc.c b/libavformat/avc.c index f7b8f38..094a958 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -106,7 +106,7 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { if (len > 6) { - /* check for h264 start code */ + /* check for H.264 start code */ if (AV_RB32(data) == 0x00000001 || AV_RB24(data) == 0x000001) { uint8_t *buf=NULL, *end, *start; diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 01d4a97..38ea86d 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -670,7 +670,7 @@ static int avi_read_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "crazy start time, iam scared, giving up\n"); ast->cum_len = 0; } - ast->sample_size = avio_rl32(pb); /* sample ssize */ + ast->sample_size = avio_rl32(pb); ast->cum_len *= FFMAX(1, ast->sample_size); av_log(s, AV_LOG_TRACE, "%"PRIu32" %"PRIu32" %d\n", ast->rate, ast->scale, ast->sample_size); diff --git a/libavformat/avio.h b/libavformat/avio.h index 2321403..3ea52ec 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -414,14 +414,14 @@ int avio_put_str16le(AVIOContext *s, const char *str); int avio_put_str16be(AVIOContext *s, const char *str); /** - * Passing this as the "whence" parameter to a seek function causes it to + * ORing this as the "whence" parameter to a seek function causes it to * return the filesize without seeking anywhere. Supporting this is optional. * If it is not supported then the seek function will return <0. */ #define AVSEEK_SIZE 0x10000 /** - * Oring this flag as into the "whence" parameter to a seek function causes it to + * Passing this flag as the "whence" parameter to a seek function causes it to * seek by any means (like reopening and linear reading) or other normally unreasonable * means that can be extremely slow. * This may be ignored by the seek code. diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 13a4cf9..d6167fa 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -1,6 +1,6 @@ /* * AviSynth/AvxSynth support - * Copyright (c) 2012 AvxSynth Team. + * Copyright (c) 2012 AvxSynth Team * * This file is part of FFmpeg * FFmpeg is free software; you can redistribute it and/or diff --git a/libavformat/avlanguage.h b/libavformat/avlanguage.h index 7fb8968..84bef58 100644 --- a/libavformat/avlanguage.h +++ b/libavformat/avlanguage.h @@ -26,7 +26,7 @@ */ enum AVLangCodespace { AV_LANG_ISO639_2_BIBL, /** 3-char bibliographic language codes as per ISO-IEC 639-2 */ - AV_LANG_ISO639_2_TERM, /** 3-char terminologic language codes as per ISO-IEC 639-2 */ + AV_LANG_ISO639_2_TERM, /** 3-char terminological language codes as per ISO-IEC 639-2 */ AV_LANG_ISO639_1 /** 2-char code of language as per ISO/IEC 639-1 */ }; diff --git a/libavformat/bink.c b/libavformat/bink.c index c3bf967..c214eb3 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -264,7 +264,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) pkt->pts = bink->audio_pts[bink->current_track - 1]; /* Each audio packet reports the number of decompressed samples - (in bytes). We use this value to calcuate the audio PTS */ + (in bytes). We use this value to calculate the audio PTS */ if (pkt->size >= 4) bink->audio_pts[bink->current_track -1] += AV_RL32(pkt->data) / (2 * s->streams[bink->current_track]->codecpar->channels); diff --git a/libavformat/bmv.c b/libavformat/bmv.c index c9580a2..ac567c2 100644 --- a/libavformat/bmv.c +++ b/libavformat/bmv.c @@ -1,6 +1,6 @@ /* * Discworld II BMV demuxer - * Copyright (c) 2011 Konstantin Shishkov. + * Copyright (c) 2011 Konstantin Shishkov * * This file is part of FFmpeg. * diff --git a/libavformat/dump.c b/libavformat/dump.c index 8e97197..bf61fdc 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -393,7 +393,7 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent) dump_paramchange(ctx, &sd); break; case AV_PKT_DATA_H263_MB_INFO: - av_log(ctx, AV_LOG_INFO, "h263 macroblock info"); + av_log(ctx, AV_LOG_INFO, "H.263 macroblock info"); break; case AV_PKT_DATA_REPLAYGAIN: av_log(ctx, AV_LOG_INFO, "replaygain: "); diff --git a/libavformat/dv.c b/libavformat/dv.c index c689d9b..89a9e10 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -110,11 +110,11 @@ static const int dv_audio_frequency[3] = { /* * There's a couple of assumptions being made here: - * 1. By default we silence erroneous (0x8000/16bit 0x800/12bit) audio samples. + * 1. By default we silence erroneous (0x8000/16-bit 0x800/12-bit) audio samples. * We can pass them upwards when libavcodec will be ready to deal with them. * 2. We don't do software emphasis. - * 3. Audio is always returned as 16bit linear samples: 12bit nonlinear samples - * are converted into 16bit linear ones. + * 3. Audio is always returned as 16-bit linear samples: 12-bit nonlinear samples + * are converted into 16-bit linear ones. */ static int dv_extract_audio(const uint8_t *frame, uint8_t **ppcm, const AVDVProfile *sys) @@ -130,7 +130,7 @@ static int dv_extract_audio(const uint8_t *frame, uint8_t **ppcm, smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ freq = as_pack[4] >> 3 & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ - quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ + quant = as_pack[4] & 0x07; /* 0 - 16-bit linear, 1 - 12-bit nonlinear */ if (quant > 1) return -1; /* unsupported quantization */ @@ -161,7 +161,7 @@ static int dv_extract_audio(const uint8_t *frame, uint8_t **ppcm, for (i = 0; i < sys->difseg_size; i++) { frame += 6 * 80; /* skip DIF segment header */ if (quant == 1 && i == half_ch) { - /* next stereo channel (12bit mode only) */ + /* next stereo channel (12-bit mode only) */ av_assert0(ipcm<4); pcm = ppcm[ipcm++]; if (!pcm) @@ -171,7 +171,7 @@ static int dv_extract_audio(const uint8_t *frame, uint8_t **ppcm, /* for each AV sequence */ for (j = 0; j < 9; j++) { for (d = 8; d < 80; d += 2) { - if (quant == 0) { /* 16bit quantization */ + if (quant == 0) { /* 16-bit quantization */ of = sys->audio_shuffle[i][j] + (d - 8) / 2 * sys->audio_stride; if (of * 2 >= size) @@ -184,7 +184,7 @@ static int dv_extract_audio(const uint8_t *frame, uint8_t **ppcm, if (pcm[of * 2 + 1] == 0x80 && pcm[of * 2] == 0x00) pcm[of * 2 + 1] = 0; - } else { /* 12bit quantization */ + } else { /* 12-bit quantization */ lc = ((uint16_t)frame[d] << 4) | ((uint16_t)frame[d + 2] >> 4); rc = ((uint16_t)frame[d + 1] << 4) | @@ -233,7 +233,7 @@ static int dv_extract_audio_info(DVDemuxContext *c, const uint8_t *frame) smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */ freq = as_pack[4] >> 3 & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */ stype = as_pack[3] & 0x1f; /* 0 - 2CH, 2 - 4CH, 3 - 8CH */ - quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */ + quant = as_pack[4] & 0x07; /* 0 - 16-bit linear, 1 - 12-bit nonlinear */ if (freq >= FF_ARRAY_ELEMS(dv_audio_frequency)) { av_log(c->fctx, AV_LOG_ERROR, diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 7ff2b72..422823c 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -41,7 +41,7 @@ #include "libavutil/opt.h" #include "libavutil/timecode.h" -#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio +#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio struct DVMuxContext { AVClass *av_class; @@ -125,7 +125,7 @@ static int dv_write_pack(enum dv_pack_type pack_id, DVMuxContext *c, uint8_t* bu buf[4] = (1 << 7) | /* emphasis: 1 -- off */ (0 << 6) | /* emphasis time constant: 0 -- reserved */ (audio_type << 3) | /* frequency: 0 -- 48kHz, 1 -- 44,1kHz, 2 -- 32kHz */ - 0; /* quantization: 0 -- 16bit linear, 1 -- 12bit nonlinear */ + 0; /* quantization: 0 -- 16-bit linear, 1 -- 12-bit nonlinear */ va_end(ap); break; diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index b27da65..80ce4c6 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -1,5 +1,5 @@ /* Electronic Arts Multimedia File Demuxer - * Copyright (c) 2004 The FFmpeg Project + * Copyright (c) 2004 The FFmpeg project * Copyright (c) 2006-2008 Peter Ross * * This file is part of FFmpeg. diff --git a/libavformat/flic.c b/libavformat/flic.c index 343b888..49f5d21 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -1,6 +1,6 @@ /* * FLI/FLC Animation File Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 51c4cd6..8d9e873 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -4,8 +4,8 @@ * * This demuxer will generate a 1 byte extradata for VP6F content. * It is composed of: - * - upper 4bits: difference between encoded width and visible width - * - lower 4bits: difference between encoded height and visible height + * - upper 4 bits: difference between encoded width and visible width + * - lower 4 bits: difference between encoded height and visible height * * This file is part of FFmpeg. * diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 0a40ded..79951b5 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -57,7 +57,7 @@ typedef struct GXFStreamContext { int pframes; int bframes; int p_per_gop; - int b_per_i_or_p; ///< number of B frames per I frame or P frame + int b_per_i_or_p; ///< number of B-frames per I-frame or P-frame int first_gop_closed; unsigned order; ///< interleaving order } GXFStreamContext; diff --git a/libavformat/httpauth.h b/libavformat/httpauth.h index 9c15a38..0e70859 100644 --- a/libavformat/httpauth.h +++ b/libavformat/httpauth.h @@ -62,7 +62,7 @@ typedef struct HTTPAuthState { */ char realm[200]; /** - * The parameters specifiec to digest authentication. + * The parameters specific to digest authentication. */ DigestParams digest_params; /** diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index 7819741..14de76a 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -84,7 +84,7 @@ static int id3v2_put_ttag(ID3v2EncContext *id3, AVIOContext *avioc, const char * len = avio_close_dyn_buf(dyn_buf, &pb); avio_wb32(avioc, tag); - /* ID3v2.3 frame size is not synchsafe */ + /* ID3v2.3 frame size is not sync-safe */ if (id3->version == 3) avio_wb32(avioc, len); else diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 3900e9e..cf69102 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -1,6 +1,6 @@ /* * id Quake II CIN File Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * @@ -33,7 +33,7 @@ * types. However, a CIN file does start with 5 32-bit numbers that * specify audio and video parameters. This demuxer gets around the lack * of file signature by performing sanity checks on those parameters. - * Probabalistically, this is a reasonable solution since the number of + * Probabilistically, this is a reasonable solution since the number of * valid combinations of the 5 parameters is a very small subset of the * total 160-bit number space. * diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c index fe8d5c6..b664279 100644 --- a/libavformat/idroqdec.c +++ b/libavformat/idroqdec.c @@ -1,6 +1,6 @@ /* * id RoQ (.roq) File Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/internal.h b/libavformat/internal.h index b6c2020..9901527 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -564,7 +564,7 @@ int ffio_open2_wrapper(struct AVFormatContext *s, AVIOContext **pb, const char * /* * A wrapper around AVFormatContext.io_close that should be used - * intead of calling the pointer directly. + * instead of calling the pointer directly. */ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb); diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index bb34aae..f9ab3e0 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -1,6 +1,6 @@ /* * Interplay MVE File Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/isom.c b/libavformat/isom.c index 9a65268..d412f06 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -38,15 +38,15 @@ const AVCodecTag ff_mp4_obj_type[] = { { AV_CODEC_ID_HEVC , 0x23 }, { AV_CODEC_ID_AAC , 0x40 }, { AV_CODEC_ID_MP4ALS , 0x40 }, /* 14496-3 ALS */ - { AV_CODEC_ID_MPEG2VIDEO , 0x61 }, /* MPEG2 Main */ - { AV_CODEC_ID_MPEG2VIDEO , 0x60 }, /* MPEG2 Simple */ - { AV_CODEC_ID_MPEG2VIDEO , 0x62 }, /* MPEG2 SNR */ - { AV_CODEC_ID_MPEG2VIDEO , 0x63 }, /* MPEG2 Spatial */ - { AV_CODEC_ID_MPEG2VIDEO , 0x64 }, /* MPEG2 High */ - { AV_CODEC_ID_MPEG2VIDEO , 0x65 }, /* MPEG2 422 */ - { AV_CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */ - { AV_CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */ - { AV_CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */ + { AV_CODEC_ID_MPEG2VIDEO , 0x61 }, /* MPEG-2 Main */ + { AV_CODEC_ID_MPEG2VIDEO , 0x60 }, /* MPEG-2 Simple */ + { AV_CODEC_ID_MPEG2VIDEO , 0x62 }, /* MPEG-2 SNR */ + { AV_CODEC_ID_MPEG2VIDEO , 0x63 }, /* MPEG-2 Spatial */ + { AV_CODEC_ID_MPEG2VIDEO , 0x64 }, /* MPEG-2 High */ + { AV_CODEC_ID_MPEG2VIDEO , 0x65 }, /* MPEG-2 422 */ + { AV_CODEC_ID_AAC , 0x66 }, /* MPEG-2 AAC Main */ + { AV_CODEC_ID_AAC , 0x67 }, /* MPEG-2 AAC Low */ + { AV_CODEC_ID_AAC , 0x68 }, /* MPEG-2 AAC SSR */ { AV_CODEC_ID_MP3 , 0x69 }, /* 13818-3 */ { AV_CODEC_ID_MP2 , 0x69 }, /* 11172-3 */ { AV_CODEC_ID_MPEG1VIDEO , 0x6A }, /* 11172-2 */ @@ -59,10 +59,10 @@ const AVCodecTag ff_mp4_obj_type[] = { { AV_CODEC_ID_AC3 , 0xA5 }, { AV_CODEC_ID_EAC3 , 0xA6 }, { AV_CODEC_ID_DTS , 0xA9 }, /* mp4ra.org */ - { AV_CODEC_ID_VP9 , 0xC0 }, /* non standard, update when there is a standard value */ - { AV_CODEC_ID_TSCC2 , 0xD0 }, /* non standard, camtasia uses it */ - { AV_CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */ - { AV_CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */ + { AV_CODEC_ID_VP9 , 0xC0 }, /* nonstandard, update when there is a standard value */ + { AV_CODEC_ID_TSCC2 , 0xD0 }, /* nonstandard, camtasia uses it */ + { AV_CODEC_ID_VORBIS , 0xDD }, /* nonstandard, gpac uses it */ + { AV_CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* nonstandard, see unsupported-embedded-subs-2.mp4 */ { AV_CODEC_ID_QCELP , 0xE1 }, { AV_CODEC_ID_MPEG4SYSTEMS, 0x01 }, { AV_CODEC_ID_MPEG4SYSTEMS, 0x02 }, @@ -72,10 +72,10 @@ const AVCodecTag ff_mp4_obj_type[] = { const AVCodecTag ff_codec_movvideo_tags[] = { /* { AV_CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */ - { AV_CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */ - { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */ - { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */ - { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* uncompressed RGB */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* uncompressed YUV422 */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* uncompressed 8-bit 4:2:2 */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2VUY but byte-swapped */ { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') }, @@ -94,18 +94,18 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */ - { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */ - { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */ - { AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */ + { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* uncompressed 10-bit RGB */ + { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'g') }, /* uncompressed 10-bit RGB */ + { AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* uncompressed 10-bit RGB */ { AV_CODEC_ID_AVUI, MKTAG('A', 'V', 'U', 'I') }, /* AVID Uncompressed deinterleaved UYVY422 */ { AV_CODEC_ID_AVRP, MKTAG('A', 'V', 'r', 'p') }, /* Avid 1:1 10-bit RGB Packer */ { AV_CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */ - { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ - { AV_CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10BIT 4:2:2 */ - { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4 */ - { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4:4 */ - { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */ - { AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* UNCOMPRESSED 12BIT 4:1:1 */ + { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* uncompressed 10-bit 4:2:2 */ + { AV_CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10-bit 4:2:2 */ + { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ + { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ + { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */ + { AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* uncompressed 12-bit 4:1:1 */ { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ { AV_CODEC_ID_TARGA_Y216, MKTAG('Y', '2', '1', '6') }, @@ -126,8 +126,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, { AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */ - { AV_CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */ - { AV_CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */ + { AV_CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H.263 */ + { AV_CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H.263 ?? works */ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ @@ -177,7 +177,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */ { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */ { AV_CODEC_ID_H264, MKTAG('A', 'V', 'i', 'n') }, /* AVC-Intra with implicit SPS/PPS */ - { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* XAVC 4:2:2 10bit */ + { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* XAVC 10-bit 4:2:2 */ { AV_CODEC_ID_H264, MKTAG('r', 'v', '6', '4') }, /* X-Com Radvision */ { AV_CODEC_ID_VP9, MKTAG('v', 'p', '0', '9') }, /* VP9 */ @@ -187,22 +187,22 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', '1', 'v') }, /* CoreMedia CMVideoCodecType */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '4') }, /* MPEG2 HDV 720p24 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '9') }, /* MPEG2 HDV 720p60 JVC */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', 'a') }, /* MPEG2 HDV 720p50 */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */ - { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG-2 HDV 720p30 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG-2 HDV 1080i60 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG-2 HDV 1080i50 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '4') }, /* MPEG-2 HDV 720p24 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG-2 HDV 720p25 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG-2 HDV 1080p24 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG-2 HDV 1080p25 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG-2 HDV 1080p30 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '9') }, /* MPEG-2 HDV 720p60 JVC */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', 'a') }, /* MPEG-2 HDV 720p50 */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG-2 IMX NTSC 525/60 50mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG-2 IMX PAL 625/50 50mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG-2 IMX NTSC 525/60 40mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG-2 IMX PAL 625/50 40mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG-2 IMX NTSC 525/60 30mb/s produced by FCP */ + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG-2 IMX PAL 625/50 30mb/s produced by FCP */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '1') }, /* XDCAM HD422 720p30 CBR */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '4') }, /* XDCAM HD422 720p24 CBR */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '5') }, /* XDCAM HD422 720p25 CBR */ @@ -357,7 +357,7 @@ const AVCodecTag ff_codec_movsubtitle_tags[] = { /* map numeric codes from mdhd atom to ISO 639 */ /* cf. QTFileFormat.pdf p253, qtff.pdf p205 */ /* http://developer.apple.com/documentation/mac/Text/Text-368.html */ -/* deprecated by putting the code as 3*5bit ascii */ +/* deprecated by putting the code as 3*5 bits ASCII */ static const char mov_mdhd_language_map[][4] = { /* 0-9 */ "eng", "fra", "ger", "ita", "dut", "sve", "spa", "dan", "por", "nor", @@ -395,7 +395,7 @@ int ff_mov_iso639_to_lang(const char lang[4], int mp4) /* handle undefined as such */ if (lang[0] == '\0') lang = "und"; - /* 5bit ascii */ + /* 5 bits ASCII */ for (i = 0; i < 3; i++) { uint8_t c = lang[i]; c -= 0x60; @@ -447,7 +447,7 @@ int ff_mp4_read_descr(AVFormatContext *fc, AVIOContext *pb, int *tag) int len; *tag = avio_r8(pb); len = ff_mp4_read_descr_len(pb); - av_log(fc, AV_LOG_TRACE, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len); + av_log(fc, AV_LOG_TRACE, "MPEG-4 description: tag=0x%02x len=%d\n", *tag, len); return len; } @@ -499,7 +499,7 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext av_log(fc, AV_LOG_TRACE, "esds object type id 0x%02x\n", object_type_id); len = ff_mp4_read_descr(fc, pb, &tag); if (tag == MP4DecSpecificDescrTag) { - av_log(fc, AV_LOG_TRACE, "Specific MPEG4 header len=%d\n", len); + av_log(fc, AV_LOG_TRACE, "Specific MPEG-4 header len=%d\n", len); if (!len || (uint64_t)len > (1<<30)) return -1; av_free(st->codecpar->extradata); diff --git a/libavformat/matroska.c b/libavformat/matroska.c index faa662d..c592fb0 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -1,6 +1,6 @@ /* * Matroska common data - * Copyright (c) 2003-2004 The FFmpeg Project + * Copyright (c) 2003-2004 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/matroska.h b/libavformat/matroska.h index e427c0e..1ff76e6 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -1,6 +1,6 @@ /* * Matroska constants - * Copyright (c) 2003-2004 The FFmpeg Project + * Copyright (c) 2003-2004 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/mms.c b/libavformat/mms.c index 807aade..17fa76a 100644 --- a/libavformat/mms.c +++ b/libavformat/mms.c @@ -97,7 +97,7 @@ int ff_mms_asf_header_parser(MMSContext *mms) flags = AV_RL16(p + sizeof(ff_asf_guid)*3 + 24); stream_id = flags & 0x7F; //The second condition is for checking CS_PKT_STREAM_ID_REQUEST packet size, - //we can calcuate the packet size by stream_num. + //we can calculate the packet size by stream_num. //Please see function send_stream_selection_request(). if (mms->stream_num < MMS_MAX_STREAMS && 46 + mms->stream_num * 6 < sizeof(mms->out_buffer)) { diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index b359da5..d18e2d8 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -41,7 +41,7 @@ // see Ref 2.2.1.8 #define USERAGENT "User-Agent: NSPlayer/4.1.0.3856\r\n" // see Ref 2.2.1.4.33 -// the guid value can be changed to any valid value. +// the GUID value can be changed to any valid value. #define CLIENTGUID "Pragma: xClientGUID={c77e7400-738a-11d2-9add-0020af0a3278}\r\n" // see Ref 2.2.3 for packet type define: diff --git a/libavformat/mmst.c b/libavformat/mmst.c index 1d13959..a97c2e0 100644 --- a/libavformat/mmst.c +++ b/libavformat/mmst.c @@ -427,7 +427,7 @@ static int send_startup_packet(MMSTContext *mmst) int ret; MMSContext *mms = &mmst->mms; // SubscriberName is defined in MS specification linked below. - // The guid value can be any valid value. + // The GUID value can be any valid value. // http://download.microsoft.com/ // download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-WMSP%5D.pdf snprintf(data_string, sizeof(data_string), @@ -524,7 +524,7 @@ static int mms_open(URLContext *h, const char *uri, int flags) sizeof(mmst->path), uri); if(port<0) - port = 1755; // defaut mms protocol port + port = 1755; // default MMS protocol port // establish tcp connection. ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, mmst->host, port, NULL); diff --git a/libavformat/mov.c b/libavformat/mov.c index 3d59c0f..ff41358 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1397,7 +1397,7 @@ static int64_t mov_read_atom_into_extradata(MOVContext *c, AVIOContext *pb, MOVA return result; } -/* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */ +/* FIXME modify QDM2/SVQ3/H.264 decoders to take full atom as extradata */ static int mov_read_extradata(MOVContext *c, AVIOContext *pb, MOVAtom atom, enum AVCodecID codec_id) { @@ -1769,7 +1769,7 @@ static int mov_codec_id(AVStream *st, uint32_t format) if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO && id > 0) { st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; } else if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO && - /* skip old asf mpeg4 tag */ + /* skip old ASF MPEG-4 tag */ format && format != MKTAG('m','p','4','s')) { id = ff_codec_get_id(ff_codec_movvideo_tags, format); if (id <= 0) @@ -1831,7 +1831,7 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, st->codecpar->width &= ~1; st->codecpar->height &= ~1; } - /* Flash Media Server uses tag H263 with Sorenson Spark */ + /* Flash Media Server uses tag H.263 with Sorenson Spark */ if (st->codecpar->codec_tag == MKTAG('H','2','6','3') && !memcmp(codec_name, "Sorenson H263", 13)) st->codecpar->codec_id = AV_CODEC_ID_FLV1; diff --git a/libavformat/movenc-test.c b/libavformat/movenc-test.c index e7928a6..6c7f0f6 100644 --- a/libavformat/movenc-test.c +++ b/libavformat/movenc-test.c @@ -349,7 +349,7 @@ int main(int argc, char **argv) finish(); close_out(); - // Write a similar file, but with b-frames and audio preroll, handled + // Write a similar file, but with B-frames and audio preroll, handled // via an edit list. init_out("non-empty-moov-elst"); av_dict_set(&opts, "movflags", "frag_keyframe", 0); @@ -359,7 +359,7 @@ int main(int argc, char **argv) finish(); close_out(); - // Use b-frames but no audio-preroll, but without an edit list. + // Use B-frames but no audio-preroll, but without an edit list. // Due to avoid_negative_ts == AVFMT_AVOID_NEG_TS_MAKE_ZERO, the dts // of the first audio packet is > 0, but it is set to zero since edit // lists aren't used, increasing the duration of the first packet instead. @@ -372,7 +372,7 @@ int main(int argc, char **argv) close_out(); format = "ismv"; - // Write an ISMV, with b-frames and audio preroll. + // Write an ISMV, with B-frames and audio preroll. init_out("ismv"); av_dict_set(&opts, "movflags", "frag_keyframe", 0); init(1, 1); @@ -558,7 +558,7 @@ int main(int argc, char **argv) finish(); - // Test discontinously written fragments with b-frames (where the + // Test discontinuously written fragments with B-frames (where the // assumption of starting at pts=0 works) but not with audio preroll // (which can't be guessed). av_dict_set(&opts, "movflags", "frag_custom+delay_moov+dash", 0); @@ -592,7 +592,7 @@ int main(int argc, char **argv) finish(); - // Test discontinously written fragments with b-frames and audio preroll, + // Test discontinuously written fragments with B-frames and audio preroll, // properly signaled. av_dict_set(&opts, "movflags", "frag_custom+delay_moov+dash", 0); init(1, 1); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 837e1e5..d4b5dc3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2561,7 +2561,7 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVMuxContext *mov, /* In the positive delay case, the delay includes the cts * offset, and the second edit list entry below trims out * the same amount from the actual content. This makes sure - * that the offsetted last sample is included in the edit + * that the offset last sample is included in the edit * list duration as well. */ if (version == 1) { avio_wb64(pb, delay); @@ -4512,8 +4512,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_WARNING, "aac bitstream error\n"); } if (par->codec_id == AV_CODEC_ID_H264 && trk->vos_len > 0 && *(uint8_t *)trk->vos_data != 1 && !TAG_IS_AVCI(trk->tag)) { - /* from x264 or from bytestream h264 */ - /* nal reformating needed */ + /* from x264 or from bytestream H.264 */ + /* NAL reformatting needed */ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) { ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data, &size); diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index c83c026..1c441c5 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -1,5 +1,5 @@ /* - * MPEG1/2 demuxer + * MPEG-1/2 demuxer * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * * This file is part of FFmpeg. @@ -371,7 +371,7 @@ redo: goto error_redo; c = avio_r8(s->pb); len--; - /* XXX: for mpeg1, should test only bit 7 */ + /* XXX: for MPEG-1, should test only bit 7 */ if (c != 0xff) break; } diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index b43517c..617e36c 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -1,5 +1,5 @@ /* - * MPEG1/2 muxer and demuxer common defines + * MPEG-1/2 muxer and demuxer common defines * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * * This file is part of FFmpeg. diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 358031d..878fa63 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1,5 +1,5 @@ /* - * MPEG1/2 muxer + * MPEG-1/2 muxer * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * * This file is part of FFmpeg. @@ -151,7 +151,7 @@ static int put_system_header(AVFormatContext *ctx, uint8_t *buf, put_bits(&pb, 1, 1); } else { put_bits(&pb, 1, 0); /* variable bitrate */ - put_bits(&pb, 1, 0); /* non constrainted bit stream */ + put_bits(&pb, 1, 0); /* nonconstrained bitstream */ } if (s->is_vcd || s->is_dvd) { @@ -1190,7 +1190,7 @@ static int mpeg_mux_end(AVFormatContext *ctx) break; } - /* End header according to MPEG1 systems standard. We do not write + /* End header according to MPEG-1 systems standard. We do not write * it as it is usually not needed by decoders and because it * complicates MPEG stream concatenation. */ // avio_wb32(ctx->pb, ISO_11172_END_CODE); diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 6ce169e..b31d233 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1,5 +1,5 @@ /* - * MPEG2 transport stream (aka DVB) demuxer + * MPEG-2 transport stream (aka DVB) demuxer * Copyright (c) 2002-2003 Fabrice Bellard * * This file is part of FFmpeg. @@ -38,8 +38,8 @@ #include "mpeg.h" #include "isom.h" -/* maximum size in which we look for synchronisation if - * synchronisation is lost */ +/* maximum size in which we look for synchronization if + * synchronization is lost */ #define MAX_RESYNC_SIZE 65536 #define MAX_PES_PAYLOAD 200 * 1024 @@ -1031,7 +1031,7 @@ static int mpegts_push_data(MpegTSFilter *filter, * decide */ if (pes->header[0] == 0x00 && pes->header[1] == 0x00 && pes->header[2] == 0x01) { - /* it must be an mpeg2 PES stream */ + /* it must be an MPEG-2 PES stream */ code = pes->header[3] | 0x100; av_log(pes->stream, AV_LOG_TRACE, "pid=%x pes_code=%#x\n", pes->pid, code); diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 88b504d..272e2be 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -1,5 +1,5 @@ /* - * MPEG2 transport stream defines + * MPEG-2 transport stream defines * Copyright (c) 2003 Fabrice Bellard * * This file is part of FFmpeg. diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 93cbac1..f8cd801 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1,5 +1,5 @@ /* - * MPEG2 transport stream (aka DVB) muxer + * MPEG-2 transport stream (aka DVB) muxer * Copyright (c) 2003 Fabrice Bellard * * This file is part of FFmpeg. @@ -49,7 +49,7 @@ typedef struct MpegTSSection { } MpegTSSection; typedef struct MpegTSService { - MpegTSSection pmt; /* MPEG2 pmt table context */ + MpegTSSection pmt; /* MPEG-2 PMT table context */ int sid; /* service ID */ char *name; char *provider_name; @@ -72,8 +72,8 @@ enum { }; typedef struct MpegTSWrite { const AVClass *av_class; - MpegTSSection pat; /* MPEG2 pat table */ - MpegTSSection sdt; /* MPEG2 sdt table context */ + MpegTSSection pat; /* MPEG-2 PAT table */ + MpegTSSection sdt; /* MPEG-2 SDT table context */ MpegTSService **services; int sdt_packet_count; int sdt_packet_period; @@ -1002,7 +1002,7 @@ fail: return ret; } -/* send SDT, PAT and PMT tables regulary */ +/* send SDT, PAT and PMT tables regularly */ static void retransmit_si_info(AVFormatContext *s, int force_pat, int64_t dts) { MpegTSWrite *ts = s->priv_data; diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 4d77ada..e9c48e8 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -41,7 +41,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* 422P@HL I-Frame */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03 }, 14, AV_CODEC_ID_MPEG4 }, /* XDCAM proxy_pal030926.mxf */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, 13, AV_CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, /* JPEG 2000 code stream */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x01,0x00,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC1 SP@LL */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x02,0x00,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC1 SP@ML */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x03,0x00,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC1 MP@LL */ @@ -52,8 +52,8 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x08,0x00,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC1 AP@L2 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x09,0x00,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC1 AP@L3 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x04,0x0A,0x00,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC1 AP@L4 */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, AV_CODEC_ID_RAWVIDEO }, /* Uncompressed */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }, 15, AV_CODEC_ID_RAWVIDEO }, /* Uncompressed 422 8-bit */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, AV_CODEC_ID_RAWVIDEO }, /* uncompressed */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }, 15, AV_CODEC_ID_RAWVIDEO }, /* uncompressed 422 8-bit */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 }, 13, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x04,0x01,0x00 }, 16, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD Legacy Avid Media Composer MXF */ @@ -62,8 +62,8 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 }, 16, AV_CODEC_ID_V210 }, /* V210 */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x11,0x00,0x00 }, 14, AV_CODEC_ID_PRORES }, /* Avid MC7 ProRes */ /* SoundEssenceCompression */ - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x03,0x04,0x02,0x02,0x02,0x03,0x03,0x01,0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG2 AAC ADTS (legacy) */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16LE }, /* Uncompressed */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x03,0x04,0x02,0x02,0x02,0x03,0x03,0x01,0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG-2 AAC ADTS (legacy) */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16LE }, /* uncompressed */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16LE }, { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00 }, 13, AV_CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00 }, 15, AV_CODEC_ID_PCM_ALAW }, /* XDCAM Proxy C0023S01.mxf */ diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 9bf676c..0affca9 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -592,7 +592,7 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size partition->previous_partition); } - /* some files don'thave FooterPartition set in every partition */ + /* some files don't have FooterPartition set in every partition */ if (footer_partition) { if (mxf->footer_partition && mxf->footer_partition != footer_partition) { av_log(mxf->fc, AV_LOG_ERROR, @@ -1123,12 +1123,12 @@ static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref, enum MXFMe static const MXFCodecUL mxf_picture_essence_container_uls[] = { // video essence container uls { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x10,0x60,0x01 }, 14, AV_CODEC_ID_H264 }, /* H264 Frame wrapped */ - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x12,0x01,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC-1 Frame wrapped */ - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x10,0x60,0x01 }, 14, AV_CODEC_ID_H264 }, /* H.264 frame wrapped */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x12,0x01,0x00 }, 14, AV_CODEC_ID_VC1 }, /* VC-1 frame wrapped */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MPEG-ES frame wrapped */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x01,0x04,0x01 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* Type D-10 mapping of 40Mbps 525/60-I */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, 14, AV_CODEC_ID_DVVIDEO }, /* DV 625 25mbps */ - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x05,0x00,0x00 }, 14, AV_CODEC_ID_RAWVIDEO }, /* Uncompressed Picture */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x05,0x00,0x00 }, 14, AV_CODEC_ID_RAWVIDEO }, /* uncompressed picture */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0a,0x0e,0x0f,0x03,0x01,0x02,0x20,0x01,0x01 }, 15, AV_CODEC_ID_HQ_HQA }, { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0a,0x0e,0x0f,0x03,0x01,0x02,0x20,0x02,0x01 }, 15, AV_CODEC_ID_HQX }, { { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0xff,0x4b,0x46,0x41,0x41,0x00,0x0d,0x4d,0x4f }, 14, AV_CODEC_ID_RAWVIDEO }, /* Legacy ?? Uncompressed Picture */ @@ -1137,14 +1137,14 @@ static const MXFCodecUL mxf_picture_essence_container_uls[] = { /* EC ULs for intra-only formats */ static const MXFCodecUL mxf_intra_only_essence_container_uls[] = { - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x01,0x00,0x00 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MXF-GC SMPTE D-10 Mappings */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x01,0x00,0x00 }, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MXF-GC SMPTE D-10 mappings */ { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; /* intra-only PictureEssenceCoding ULs, where no corresponding EC UL exists */ static const MXFCodecUL mxf_intra_only_picture_essence_coding_uls[] = { { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra Profiles */ - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, /* JPEG 2000 code stream */ { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; @@ -1163,7 +1163,7 @@ static const MXFCodecUL mxf_sound_essence_container_uls[] = { { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x04,0x40,0x01 }, 14, AV_CODEC_ID_MP2 }, /* MPEG-ES Frame wrapped, 0x40 ??? stream id */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, 14, AV_CODEC_ID_PCM_S16LE }, /* D-10 Mapping 50Mbps PAL Extended Template */ { { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0xff,0x4b,0x46,0x41,0x41,0x00,0x0d,0x4d,0x4F }, 14, AV_CODEC_ID_PCM_S16LE }, /* 0001GL00.MXF.A1.mxf_opatom.mxf */ - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x03,0x04,0x02,0x02,0x02,0x03,0x03,0x01,0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG2 AAC ADTS (legacy) */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x03,0x04,0x02,0x02,0x02,0x03,0x03,0x01,0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG-2 AAC ADTS (legacy) */ { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 36a43e4..0c04a39 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1496,7 +1496,7 @@ static void mxf_write_index_table_segment(AVFormatContext *s) for (i = 0; i < mxf->edit_units_count; i++) { int temporal_offset = 0; - if (!(mxf->index_entries[i].flags & 0x33)) { // I frame + if (!(mxf->index_entries[i].flags & 0x33)) { // I-frame mxf->last_key_index = key_index; key_index = i; } @@ -1523,7 +1523,7 @@ static void mxf_write_index_table_segment(AVFormatContext *s) mxf->last_key_index = key_index; } - if (!(mxf->index_entries[i].flags & 0x33) && // I frame + if (!(mxf->index_entries[i].flags & 0x33) && // I-frame mxf->index_entries[i].flags & 0x40 && !temporal_offset) mxf->index_entries[i].flags |= 0x80; // random access avio_w8(pb, mxf->index_entries[i].flags); @@ -1976,10 +1976,10 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, } else if (c == 0x100) { // pic int pict_type = (pkt->data[i+2]>>3) & 0x07; e->temporal_ref = (pkt->data[i+1]<<2) | (pkt->data[i+2]>>6); - if (pict_type == 2) { // P frame + if (pict_type == 2) { // P-frame e->flags |= 0x22; - sc->closed_gop = 0; // reset closed gop, don't matter anymore - } else if (pict_type == 3) { // B frame + sc->closed_gop = 0; // reset closed GOP, don't matter anymore + } else if (pict_type == 3) { // B-frame if (sc->closed_gop) e->flags |= 0x13; // only backward prediction else @@ -2447,7 +2447,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) if (st->index == 0) { if (!mxf->edit_unit_byte_count && (!mxf->edit_units_count || mxf->edit_units_count > EDIT_UNITS_PER_BODY) && - !(ie.flags & 0x33)) { // I frame, Gop start + !(ie.flags & 0x33)) { // I-frame, GOP start mxf_write_klv_fill(s); if ((err = mxf_write_partition(s, 1, 2, body_partition_key, 0)) < 0) return err; diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 7f89297..507fb39 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -57,14 +57,14 @@ * (that is the offset of the data table after the header). * After checking all samples from (S1) all confirms this. * - * Then, about NSVf[12-15], faster.nsf has 179700. When veiwing it in VLC, + * Then, about NSVf[12-15], faster.nsf has 179700. When viewing it in VLC, * I noticed there was about 1 NVSs chunk/s, so I ran * strings faster.nsv | grep NSVs | wc -l * which gave me 180. That leads me to think that NSVf[12-15] might be the * file length in milliseconds. * Let's try that: * for f in *.nsv; do HTIME="$(od -t x4 "$f" | head -1 | sed 's/.* //')"; echo "'$f' $((0x$HTIME))s = $((0x$HTIME/1000/60)):$((0x$HTIME/1000%60))"; done - * except for nstrailer (which doesn't have an NSVf header), it repports correct time. + * except for nsvtrailer (which doesn't have an NSVf header), it reports correct time. * * nsvtrailer.nsv (S1) does not have any NSVf header, only NSVs chunks, * so the header seems to not be mandatory. (for streaming). @@ -579,7 +579,7 @@ null_chunk_retry: ((auxtag >> 24) & 0x0ff), auxsize); avio_skip(pb, auxsize); - vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming braindead */ + vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming brain-dead */ } if (avio_feof(pb)) @@ -683,7 +683,7 @@ static int nsv_read_packet(AVFormatContext *s, AVPacket *pkt) } } - /* this restaurant is not approvisionned :^] */ + /* this restaurant is not provisioned :^] */ return -1; } diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index 9a67e25..74b9ba4 100644 --- a/libavformat/oggparsedirac.c +++ b/libavformat/oggparsedirac.c @@ -55,14 +55,14 @@ static int dirac_header(AVFormatContext *s, int idx) if (av_image_check_sar(st->codecpar->width, st->codecpar->height, dsh->sample_aspect_ratio) >= 0) st->sample_aspect_ratio = dsh->sample_aspect_ratio; - // dirac in ogg always stores timestamps as though the video were interlaced + // Dirac in Ogg always stores timestamps as though the video were interlaced avpriv_set_pts_info(st, 64, dsh->framerate.den, 2 * dsh->framerate.num); av_freep(&dsh); return 1; } -// various undocument things: granule is signed (only for dirac!) +// various undocumented things: granule is signed (only for Dirac!) static uint64_t dirac_gptopts(AVFormatContext *s, int idx, uint64_t granule, int64_t *dts_out) { diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index ca89fcf..63598fe 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -1,6 +1,6 @@ /* * Sony Playstation (PSX) STR File Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 6cb4d6a..8670ead 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -44,7 +44,7 @@ struct RDTDemuxContext { * in the AVFormatContext, and this variable points to the offset in * that array such that the first is the first stream of this set. */ AVStream **streams; - int n_streams; /**< streams with identifical content in this set */ + int n_streams; /**< streams with identical content in this set */ void *dynamic_protocol_context; DynamicPayloadPacketHandlerProc parse_packet; uint32_t prev_timestamp; diff --git a/libavformat/rl2.c b/libavformat/rl2.c index 69e8be2..0bec8f1 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -104,7 +104,7 @@ static av_cold int rl2_read_header(AVFormatContext *s) if(back_size > INT_MAX/2 || frame_count > INT_MAX / sizeof(uint32_t)) return AVERROR_INVALIDDATA; - avio_skip(pb, 2); /* encoding mentod */ + avio_skip(pb, 2); /* encoding method */ sound_rate = avio_rl16(pb); rate = avio_rl16(pb); channels = avio_rl16(pb); diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index a0cda92..3708f42 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -258,9 +258,9 @@ static int rv10_write_header(AVFormatContext *ctx, avio_wb16(s, stream->frame_rate.num / stream->frame_rate.den); /* unknown meaning */ avio_wb32(s,0); /* unknown meaning */ avio_wb16(s, 8); /* unknown meaning */ - /* Seems to be the codec version: only use basic H263. The next - versions seems to add a diffential DC coding as in - MPEG... nothing new under the sun */ + /* Seems to be the codec version: only use basic H.263. The next + versions seems to add a differential DC coding as in + MPEG... nothing new under the sun. */ if(stream->par->codec_id == AV_CODEC_ID_RV10) avio_wb32(s,0x10000000); else @@ -402,7 +402,7 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int write_packet_header(s, stream, size + 7 + (size >= 0x4000)*4, key_frame); /* bit 7: '1' if final packet of a frame converted in several packets */ avio_w8(pb, 0x81); - /* bit 7: '1' if I frame. bits 6..0 : sequence number in current + /* bit 7: '1' if I-frame. bits 6..0 : sequence number in current frame starting from 1 */ if (key_frame) { avio_w8(pb, 0x81); diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c index 2f78b15..31f5d43 100644 --- a/libavformat/rtmphttp.c +++ b/libavformat/rtmphttp.c @@ -129,7 +129,7 @@ static int rtmp_http_read(URLContext *h, uint8_t *buf, int size) } else { if (rt->nb_bytes_read == 0) { /* Wait 50ms before retrying to read a server reply in - * order to reduce the number of idle requets. */ + * order to reduce the number of idle requests. */ av_usleep(50000); } diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 18d915a..95d1c1d 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -451,7 +451,7 @@ static int read_connect(URLContext *s, RTMPContext *rt) tmpstr, rt->app); ff_rtmp_packet_destroy(&pkt); - // Send Window Acknowledgement Size (as defined in speficication) + // Send Window Acknowledgement Size (as defined in specification) if ((ret = ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_SERVER_BW, 0, 4)) < 0) return ret; @@ -581,7 +581,7 @@ static int gen_release_stream(URLContext *s, RTMPContext *rt) /** * Generate 'FCPublish' call and send it to the server. It should make - * the server preapare for receiving media streams. + * the server prepare for receiving media streams. */ static int gen_fcpublish_stream(URLContext *s, RTMPContext *rt) { @@ -2000,7 +2000,7 @@ static int send_invoke_response(URLContext *s, RTMPPacket *pkt) * successful response, we will return set the value to number (otherwise number * will not be changed). * - * @return 0 if reading the value succeeds, negative value otherwiss + * @return 0 if reading the value succeeds, negative value otherwise */ static int read_number_result(RTMPPacket *pkt, double *number) { @@ -2023,7 +2023,7 @@ static int read_number_result(RTMPPacket *pkt, double *number) // Value 3/4: Null if (ff_amf_read_null(&gbc)) return AVERROR_INVALIDDATA; - // Value 4/4: The resonse as AMF_NUMBER + // Value 4/4: The response as AMF_NUMBER if (ff_amf_read_number(&gbc, &numbuffer)) return AVERROR_INVALIDDATA; else @@ -2514,7 +2514,7 @@ static int rtmp_close(URLContext *h) */ static int inject_fake_duration_metadata(RTMPContext *rt) { - // We need to insert the metdata packet directly after the FLV + // We need to insert the metadata packet directly after the FLV // header, i.e. we need to move all other already read data by the // size of our fake metadata packet. diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index bf3680c..eef6160 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -504,7 +504,7 @@ int ff_rtp_send_rtcp_feedback(RTPDemuxContext *s, URLContext *fd, /** * open a new RTP parse context for stream 'st'. 'st' can be NULL for - * MPEG2-TS streams. + * MPEG-2 TS streams. */ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, int payload_type, int queue_size) diff --git a/libavformat/rtpdec_h263_rfc2190.c b/libavformat/rtpdec_h263_rfc2190.c index 33712e7..6ba2814 100644 --- a/libavformat/rtpdec_h263_rfc2190.c +++ b/libavformat/rtpdec_h263_rfc2190.c @@ -107,7 +107,7 @@ static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, /* Invalid src for this format, and bits that should be zero * according to RFC 2190 aren't zero. */ av_log(ctx, AV_LOG_WARNING, - "Interpreting H263 RTP data as RFC 2429/4629 even though " + "Interpreting H.263 RTP data as RFC 2429/4629 even though " "signalled with a static payload type.\n"); data->newformat = 1; return ff_h263_handle_packet(ctx, data, st, pkt, timestamp, buf, diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 4ab0eee..8dd56a5 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -1,5 +1,5 @@ /* - * RTP H264 Protocol (RFC3984) + * RTP H.264 Protocol (RFC3984) * Copyright (c) 2006 Ryan Martell * * This file is part of FFmpeg. @@ -289,7 +289,7 @@ static int h264_handle_packet_fu_a(AVFormatContext *ctx, PayloadContext *data, A uint8_t fu_indicator, fu_header, start_bit, nal_type, nal; if (len < 3) { - av_log(ctx, AV_LOG_ERROR, "Too short data for FU-A H264 RTP packet\n"); + av_log(ctx, AV_LOG_ERROR, "Too short data for FU-A H.264 RTP packet\n"); return AVERROR_INVALIDDATA; } @@ -319,14 +319,14 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data, int result = 0; if (!len) { - av_log(ctx, AV_LOG_ERROR, "Empty H264 RTP packet\n"); + av_log(ctx, AV_LOG_ERROR, "Empty H.264 RTP packet\n"); return AVERROR_INVALIDDATA; } nal = buf[0]; type = nal & 0x1f; - /* Simplify the case (these are all the nal types used internally by - * the h264 codec). */ + /* Simplify the case (these are all the NAL types used internally by + * the H.264 codec). */ if (type >= 1 && type <= 23) type = 1; switch (type) { diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index 3760292..304699e 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -22,7 +22,7 @@ /** * @file - * @brief MPEG4 / RTP Code + * @brief MPEG-4 / RTP Code * @author Fabrice Bellard * @author Romain Degez */ diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index f383afc..77a3ce4 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -93,7 +93,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, if (pos + 12 > len) return AVERROR_INVALIDDATA; - skip_bits(&gb, 2); // has non-I frames:1, is sparse:1 + skip_bits(&gb, 2); // has non-I-frames:1, is sparse:1 is_start = get_bits1(&gb); is_finish = get_bits1(&gb); if (!is_start || !is_finish) { diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index d1e355d..f0e457b 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -46,7 +46,7 @@ struct PayloadContext { int prev_pictureid; int broken_frame; /* If sequence_dirty is set, we have lost some data (critical or - * non-critical) and decoding will have some sort of artefacts, and + * non-critical) and decoding will have some sort of artifacts, and * we thus should request a new keyframe. */ int sequence_dirty; diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index db1ec81..efa63a5 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -189,7 +189,7 @@ static int rtp_write_header(AVFormatContext *s1) case AV_CODEC_ID_H261: if (s1->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(s, AV_LOG_ERROR, - "Packetizing H261 is experimental and produces incorrect " + "Packetizing H.261 is experimental and produces incorrect " "packetization for cases where GOBs don't fit into packets " "(even though most receivers may handle it just fine). " "Please set -f_strict experimental in order to enable it.\n"); @@ -205,7 +205,7 @@ static int rtp_write_header(AVFormatContext *s1) break; case AV_CODEC_ID_HEVC: /* Only check for the standardized hvcC version of extradata, keeping - * things simple and similar to the avcC/H264 case above, instead + * things simple and similar to the avcC/H.264 case above, instead * of trying to handle the pre-standardization versions (as in * libavcodec/hevc.c). */ if (st->codecpar->extradata_size > 21 && st->codecpar->extradata[0] == 1) { diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index 70f18ed..62dc9ab 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -76,7 +76,7 @@ typedef struct RTPMuxContext RTPMuxContext; { "latm", "Use MP4A-LATM packetization instead of MPEG4-GENERIC for AAC", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_MP4A_LATM}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "rfc2190", "Use RFC 2190 packetization instead of RFC 4629 for H.263", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_RFC2190}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "skip_rtcp", "Don't send RTCP sender reports", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_SKIP_RTCP}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ - { "h264_mode0", "Use mode 0 for H264 in RTP", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_H264_MODE0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ + { "h264_mode0", "Use mode 0 for H.264 in RTP", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_H264_MODE0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" }, \ { "send_bye", "Send RTCP BYE packets when finishing", 0, AV_OPT_TYPE_CONST, {.i64 = FF_RTP_FLAG_SEND_BYE}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "rtpflags" } \ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m); diff --git a/libavformat/rtpenc_h261.c b/libavformat/rtpenc_h261.c index fc50285..22461ca 100644 --- a/libavformat/rtpenc_h261.c +++ b/libavformat/rtpenc_h261.c @@ -72,12 +72,12 @@ void ff_rtp_send_h261(AVFormatContext *ctx, const uint8_t *frame_buf, int frame_ rtp_ctx->buf[2] = 0; /* quant=0, hmvd=5 */ rtp_ctx->buf[3] = 0; /* vmvd=0 */ if (frame_size < 2 || frame_buf[0] != 0 || frame_buf[1] != 1) { - /* A full, correct fix for this would be to make the H261 encoder + /* A full, correct fix for this would be to make the H.261 encoder * support inserting extra GOB headers (triggered by setting e.g. * "-ps 1"), and including information about macroblock boundaries * (such as for h263_rfc2190). */ av_log(ctx, AV_LOG_WARNING, - "RTP/H261 packet not cut at a GOB boundary, not signaled correctly\n"); + "RTP/H.261 packet not cut at a GOB boundary, not signaled correctly\n"); } cur_frame_size = FFMIN(rtp_ctx->max_payload_size - RTP_H261_HEADER_SIZE, frame_size); diff --git a/libavformat/rtpenc_h263_rfc2190.c b/libavformat/rtpenc_h263_rfc2190.c index 34b3906..3567202 100644 --- a/libavformat/rtpenc_h263_rfc2190.c +++ b/libavformat/rtpenc_h263_rfc2190.c @@ -114,7 +114,7 @@ void ff_rtp_send_h263_rfc2190(AVFormatContext *s1, const uint8_t *buf, int size, init_get_bits(&gb, buf, size*8); if (get_bits(&gb, 22) == 0x20) { /* Picture Start Code */ info.tr = get_bits(&gb, 8); - skip_bits(&gb, 2); /* PTYPE start, H261 disambiguation */ + skip_bits(&gb, 2); /* PTYPE start, H.261 disambiguation */ skip_bits(&gb, 3); /* Split screen, document camera, freeze picture release */ info.src = get_bits(&gb, 3); info.i = get_bits(&gb, 1); @@ -168,7 +168,7 @@ void ff_rtp_send_h263_rfc2190(AVFormatContext *s1, const uint8_t *buf, int size, mb_info_pos++; } } else { - av_log(s1, AV_LOG_ERROR, "Unable to split H263 packet, " + av_log(s1, AV_LOG_ERROR, "Unable to split H.263 packet, " "use -mb_info %d or -ps 1.\n", s->max_payload_size - 8); } diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 88acb37..38eb2e6 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -59,7 +59,7 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) return; } - /* preparse the header for getting some infos */ + /* preparse the header for getting some info */ for (i = 0; i < size; i++) { if (buf[i] != 0xff) continue; diff --git a/libavformat/rtpenc_xiph.c b/libavformat/rtpenc_xiph.c index b4d950b..00c29a7 100644 --- a/libavformat/rtpenc_xiph.c +++ b/libavformat/rtpenc_xiph.c @@ -68,7 +68,7 @@ void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size) // 0 - whole frame (possibly multiple frames) // 1 - first fragment // 2 - fragment continuation - // 3 - last fragmement + // 3 - last fragment frag = size <= max_pkt_size ? 0 : 1; if (!frag && !xdt) { // do we have a whole frame of raw data? diff --git a/libavformat/sdp.c b/libavformat/sdp.c index ea369e9..01b564b 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -261,7 +261,7 @@ static char *extradata2psets_hevc(AVCodecParameters *par) goto err; nalu_type = extradata[pos] & 0x3f; // Not including libavcodec/hevc.h to avoid confusion between - // NAL_* with the same name for both H264 and HEVC. + // NAL_* with the same name for both H.264 and HEVC. if (nalu_type == 32) // VPS ps_pos[0] = pos; else if (nalu_type == 33) // SPS diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 6ee2bd4..1fdef50 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -1,6 +1,6 @@ /* * Sega FILM Format (CPK) Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 882f70e..734a3f2 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -1,6 +1,6 @@ /* * Sierra VMD Format Demuxer - * Copyright (c) 2004 The FFmpeg Project + * Copyright (c) 2004 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/spdif.h b/libavformat/spdif.h index fee4ff71..0039fcf 100644 --- a/libavformat/spdif.h +++ b/libavformat/spdif.h @@ -54,8 +54,8 @@ enum IEC61937DataType { static const uint16_t spdif_mpeg_pkt_offset[2][3] = { //LAYER1 LAYER2 LAYER3 - { 3072, 9216, 4608 }, // MPEG2 LSF - { 1536, 4608, 4608 }, // MPEG1 + { 3072, 9216, 4608 }, // MPEG-2 LSF + { 1536, 4608, 4608 }, // MPEG-1 }; void ff_spdif_bswap_buf16(uint16_t *dst, const uint16_t *src, int w); diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 9788038..daf1c1f 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -32,7 +32,7 @@ /* * Terminology used in specification: * data-burst - IEC61937 frame, contains header and encapsuled frame - * burst-preambule - IEC61937 frame header, contains 16-bits words named Pa, Pb, Pc and Pd + * burst-preamble - IEC61937 frame header, contains 16-bit words named Pa, Pb, Pc and Pd * burst-payload - encapsuled frame * Pa, Pb - syncword - 0xF872, 0x4E1F * Pc - burst-info, contains data-type (bits 0-6), error flag (bit 7), data-type-dependent info (bits 8-12) @@ -147,7 +147,7 @@ static int spdif_header_eac3(AVFormatContext *s, AVPacket *pkt) * DTS type IV (DTS-HD) can be transmitted with various frame repetition * periods; longer repetition periods allow for longer packets and therefore * higher bitrate. Longer repetition periods mean that the constant bitrate of - * the outputted IEC 61937 stream is higher. + * the output IEC 61937 stream is higher. * The repetition period is measured in IEC 60958 frames (4 bytes). */ static int spdif_dts4_subtype(int period) @@ -319,8 +319,8 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt) static const enum IEC61937DataType mpeg_data_type[2][3] = { // LAYER1 LAYER2 LAYER3 - { IEC61937_MPEG2_LAYER1_LSF, IEC61937_MPEG2_LAYER2_LSF, IEC61937_MPEG2_LAYER3_LSF },//MPEG2 LSF - { IEC61937_MPEG1_LAYER1, IEC61937_MPEG1_LAYER23, IEC61937_MPEG1_LAYER23 }, //MPEG1 + { IEC61937_MPEG2_LAYER1_LSF, IEC61937_MPEG2_LAYER2_LSF, IEC61937_MPEG2_LAYER3_LSF }, // MPEG-2 LSF + { IEC61937_MPEG1_LAYER1, IEC61937_MPEG1_LAYER23, IEC61937_MPEG1_LAYER23 }, // MPEG-1 }; static int spdif_header_mpeg(AVFormatContext *s, AVPacket *pkt) diff --git a/libavformat/url.h b/libavformat/url.h index f19b91c..5c50245 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -261,7 +261,7 @@ int ffurl_get_multi_file_handle(URLContext *h, int **handles, int *numhandles); int ffurl_shutdown(URLContext *h, int flags); /** - * Check if the user has requested to interrup a blocking function + * Check if the user has requested to interrupt a blocking function * associated with cb. */ int ff_check_interrupt(AVIOInterruptCB *cb); diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index 6b4e41e..642dcbb 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -1,6 +1,6 @@ /* * Wing Commander III Movie (.mve) File Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index fe8bdb0..4750167 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -1,6 +1,6 @@ /* * Westwood Studios AUD Format Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c index 88bd7cd..3635c6a 100644 --- a/libavformat/westwood_vqa.c +++ b/libavformat/westwood_vqa.c @@ -1,6 +1,6 @@ /* * Westwood Studios VQA Format Demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The FFmpeg project * * This file is part of FFmpeg. * @@ -131,7 +131,7 @@ static int wsvqa_read_header(AVFormatContext *s) chunk_tag = AV_RB32(&scratch[0]); chunk_size = AV_RB32(&scratch[4]); - /* catch any unknown header tags, for curiousity */ + /* catch any unknown header tags, for curiosity */ switch (chunk_tag) { case CINF_TAG: case CINH_TAG: diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 39547f0..bd32d70 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -36,7 +36,7 @@ #include "wtv.h" #include "mpegts.h" -/* Macros for formating GUIDs */ +/* Macros for formatting GUIDs */ #define PRI_PRETTY_GUID \ "%08"PRIx32"-%04"PRIx16"-%04"PRIx16"-%02x%02x%02x%02x%02x%02x%02x%02x" #define ARG_PRETTY_GUID(g) \ @@ -320,7 +320,7 @@ typedef struct WtvContext { AVIOContext *pb; /**< timeline file */ int64_t epoch; int64_t pts; /**< pts for next data chunk */ - int64_t last_valid_pts; /**< latest valid pts, used for interative seeking */ + int64_t last_valid_pts; /**< latest valid pts, used for interactive seeking */ /* maintain private seek index, as the AVIndexEntry->pos is relative to the start of the 'timeline' file, not the file system (AVFormatContext->pb) */ diff --git a/libavresample/dither.h b/libavresample/dither.h index c53e822..72f09cb 100644 --- a/libavresample/dither.h +++ b/libavresample/dither.h @@ -37,8 +37,8 @@ typedef struct DitherDSPContext { */ void (*quantize)(int16_t *dst, const float *src, float *dither, int len); - int ptr_align; ///< src and dst constraits for quantize() - int samples_align; ///< len constraits for quantize() + int ptr_align; ///< src and dst constraints for quantize() + int samples_align; ///< len constraints for quantize() /** * Convert dither noise from int to float with triangular distribution. diff --git a/libavresample/resample.c b/libavresample/resample.c index 651670d..dc14cc2 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -46,7 +46,7 @@ #include "resample_template.c" -/* 0th order modified bessel function of the first kind. */ +/* 0th order modified Bessel function of the first kind. */ static double bessel(double x) { double v = 1; diff --git a/libavutil/avassert.h b/libavutil/avassert.h index 41f5e0e..f473637 100644 --- a/libavutil/avassert.h +++ b/libavutil/avassert.h @@ -45,7 +45,7 @@ /** * assert() equivalent, that does not lie in speed critical code. - * These asserts() thus can be enabled without fearing speedloss. + * These asserts() thus can be enabled without fearing speed loss. */ #if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 #define av_assert1(cond) av_assert0(cond) diff --git a/libavutil/avr32/intreadwrite.h b/libavutil/avr32/intreadwrite.h index c6fd3aa..95179f1 100644 --- a/libavutil/avr32/intreadwrite.h +++ b/libavutil/avr32/intreadwrite.h @@ -27,7 +27,7 @@ /* * AVR32 does not support unaligned memory accesses, except for the AP - * series which suppports unaligned 32-bit loads and stores. 16-bit + * series which supports unaligned 32-bit loads and stores. 16-bit * and 64-bit accesses must be aligned to 16 and 32 bits, respectively. * This means we cannot use the byte-swapping load/store instructions * here. diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 9bcf674..c1f76c1 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -266,7 +266,7 @@ enum AVPictureType { AV_PICTURE_TYPE_I, ///< Intra AV_PICTURE_TYPE_P, ///< Predicted AV_PICTURE_TYPE_B, ///< Bi-dir predicted - AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4 + AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG-4 AV_PICTURE_TYPE_SI, ///< Switching Intra AV_PICTURE_TYPE_SP, ///< Switching Predicted AV_PICTURE_TYPE_BI, ///< BI type diff --git a/libavutil/frame.h b/libavutil/frame.h index b30aa47..44adec4 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -328,7 +328,7 @@ typedef struct AVFrame { int palette_has_changed; /** - * reordered opaque 64bit (generally an integer or a double precision float + * reordered opaque 64 bits (generally an integer or a double precision float * PTS but can be anything). * The user sets AVCodecContext.reordered_opaque to represent the input at * that time, diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h index 44be197..7b93b20 100644 --- a/libavutil/hwcontext.h +++ b/libavutil/hwcontext.h @@ -169,7 +169,7 @@ typedef struct AVHWFramesContext { * A pool from which the frames are allocated by av_hwframe_get_buffer(). * This field may be set by the caller before calling av_hwframe_ctx_init(). * The buffers returned by calling av_buffer_pool_get() on this pool must - * have the properties described in the documentation in the correponding hw + * have the properties described in the documentation in the corresponding hw * type's header (hwcontext_*.h). The pool will be freed strictly before * this struct's free() callback is invoked. * @@ -377,7 +377,7 @@ void *av_hwdevice_hwconfig_alloc(AVBufferRef *device_ctx); /** * Get the constraints on HW frames given a device and the HW-specific * configuration to be used with that device. If no HW-specific - * confgiuration is provided, returns the maximum possible capabilities + * configuration is provided, returns the maximum possible capabilities * of the device. * * @param device_ctx a reference to the associated AVHWDeviceContext. diff --git a/libavutil/md5.c b/libavutil/md5.c index 057085b..8c36aa8 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -8,7 +8,7 @@ * * based on http://ubiqx.org/libcifs/source/Auth/MD5.c * from Christopher R. Hertel (crh@ubiqx.mn.org) - * Simplified, cleaned and IMO redundant comments removed by michael. + * Simplified, cleaned and IMO redundant comments removed by Michael. * * If you use gcc, then version 4.1 or later and -fomit-frame-pointer is * strongly recommended. diff --git a/libavutil/opt.h b/libavutil/opt.h index 753434d..9a76a47 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -281,7 +281,7 @@ typedef struct AVOption { #define AV_OPT_FLAG_VIDEO_PARAM 16 #define AV_OPT_FLAG_SUBTITLE_PARAM 32 /** - * The option is inteded for exporting values to the caller. + * The option is intended for exporting values to the caller. */ #define AV_OPT_FLAG_EXPORT 64 /** diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 0fc7848..0ed01c4 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -53,7 +53,7 @@ * to run on the IBM VGA graphics adapter use 6-bit palette components. * * @par - * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like + * For all the 8 bits per pixel formats, an RGB32 palette is in data[1] like * for pal8. This palette is filled in automatically by the function * allocating the picture. */ @@ -70,7 +70,7 @@ enum AVPixelFormat { AV_PIX_FMT_GRAY8, ///< Y , 8bpp AV_PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb AV_PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb - AV_PIX_FMT_PAL8, ///< 8 bit with AV_PIX_FMT_RGB32 palette + AV_PIX_FMT_PAL8, ///< 8 bits with AV_PIX_FMT_RGB32 palette AV_PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range AV_PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range AV_PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range @@ -143,7 +143,7 @@ enum AVPixelFormat { AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian #if FF_API_VDPAU - AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers + AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG-4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers #endif AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer @@ -151,7 +151,7 @@ enum AVPixelFormat { AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), big-endian, X=unused/undefined AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), little-endian, X=unused/undefined AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), big-endian, X=unused/undefined - AV_PIX_FMT_YA8, ///< 8bit gray, 8bit alpha + AV_PIX_FMT_YA8, ///< 8 bits gray, 8 bits alpha AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8 AV_PIX_FMT_GRAY8A= AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8 @@ -222,8 +222,8 @@ enum AVPixelFormat { AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef - AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) - AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) + AV_PIX_FMT_YA16BE, ///< 16 bits gray, 16 bits alpha (big-endian) + AV_PIX_FMT_YA16LE, ///< 16 bits gray, 16 bits alpha (little-endian) AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian @@ -420,9 +420,9 @@ enum AVColorTransferCharacteristic { AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4 AVCOL_TRC_BT1361_ECG = 12, ///< ITU-R BT1361 Extended Colour Gamut AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC) - AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10 bit system - AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12 bit system - AVCOL_TRC_SMPTEST2084 = 16, ///< SMPTE ST 2084 for 10, 12, 14 and 16 bit systems + AVCOL_TRC_BT2020_10 = 14, ///< ITU-R BT2020 for 10-bit system + AVCOL_TRC_BT2020_12 = 15, ///< ITU-R BT2020 for 12-bit system + AVCOL_TRC_SMPTEST2084 = 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems AVCOL_TRC_SMPTEST428_1 = 17, ///< SMPTE ST 428-1 AVCOL_TRC_ARIB_STD_B67 = 18, ///< ARIB STD-B67, known as "Hybrid log-gamma" AVCOL_TRC_NB, ///< Not part of ABI @@ -475,8 +475,8 @@ enum AVColorRange { */ enum AVChromaLocation { AVCHROMA_LOC_UNSPECIFIED = 0, - AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4 4:2:0, h264 default for 4:2:0 - AVCHROMA_LOC_CENTER = 2, ///< mpeg1 4:2:0, jpeg 4:2:0, h263 4:2:0 + AVCHROMA_LOC_LEFT = 1, ///< MPEG-2/4 4:2:0, H.264 default for 4:2:0 + AVCHROMA_LOC_CENTER = 2, ///< MPEG-1 4:2:0, JPEG 4:2:0, H.263 4:2:0 AVCHROMA_LOC_TOPLEFT = 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2 AVCHROMA_LOC_TOP = 4, AVCHROMA_LOC_BOTTOMLEFT = 5, diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index bb63daa..b9f239b 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -182,7 +182,7 @@ int ff_get_cpu_flags_x86(void) /* Similar to the above but for AVX functions on AMD processors. This is necessary only for functions using YMM registers on Bulldozer - and Jaguar based CPUs as they lack 256-bits execution units. SSE/AVX + and Jaguar based CPUs as they lack 256-bit execution units. SSE/AVX functions using XMM registers are always faster on them. AV_CPU_FLAG_AVX and AV_CPU_FLAG_AVXSLOW are both set so that AVX is used unless explicitly disabled by checking AV_CPU_FLAG_AVXSLOW. */ diff --git a/libswscale/output.c b/libswscale/output.c index e9bbb3d..de40e4b 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -722,7 +722,7 @@ yuv2rgba64_X_c_template(SwsContext *c, const int16_t *lumFilter, A2 += 0x20002000; } - // 8bit: 12+15=27; 16-bit: 12+19=31 + // 8 bits: 12+15=27; 16 bits: 12+19=31 Y1 >>= 14; // 10 Y1 += 0x10000; Y2 >>= 14; @@ -730,20 +730,20 @@ yuv2rgba64_X_c_template(SwsContext *c, const int16_t *lumFilter, U >>= 14; V >>= 14; - // 8bit: 27 -> 17bit, 16bit: 31 - 14 = 17bit + // 8 bits: 27 -> 17 bits, 16 bits: 31 - 14 = 17 bits Y1 -= c->yuv2rgb_y_offset; Y2 -= c->yuv2rgb_y_offset; Y1 *= c->yuv2rgb_y_coeff; Y2 *= c->yuv2rgb_y_coeff; Y1 += 1 << 13; // 21 Y2 += 1 << 13; - // 8bit: 17 + 13bit = 30bit, 16bit: 17 + 13bit = 30bit + // 8 bits: 17 + 13 bits = 30 bits, 16 bits: 17 + 13 bits = 30 bits R = V * c->yuv2rgb_v2r_coeff; G = V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff; B = U * c->yuv2rgb_u2b_coeff; - // 8bit: 30 - 22 = 8bit, 16bit: 30bit - 14 = 16bit + // 8 bits: 30 - 22 = 8 bits, 16 bits: 30 bits - 14 = 16 bits output_pixel(&dest[0], av_clip_uintp2(R_B + Y1, 30) >> 14); output_pixel(&dest[1], av_clip_uintp2( G + Y1, 30) >> 14); output_pixel(&dest[2], av_clip_uintp2(B_R + Y1, 30) >> 14); @@ -1294,7 +1294,7 @@ yuv2rgb_write(uint8_t *_dest, int i, int Y1, int Y2, dest[i * 2 + 0] = r[Y1 + dr1] + g[Y1 + dg1] + b[Y1 + db1]; dest[i * 2 + 1] = r[Y2 + dr2] + g[Y2 + dg2] + b[Y2 + db2]; - } else /* 8/4-bit */ { + } else /* 8/4 bits */ { uint8_t *dest = (uint8_t *) _dest; const uint8_t *r = (const uint8_t *) _r; const uint8_t *g = (const uint8_t *) _g; diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 87511a8..efcbef3 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -73,7 +73,7 @@ const char *swscale_license(void); #define SWS_PRINT_INFO 0x1000 //the following 3 flags are not completely implemented -//internal chrominace subsampling info +//internal chrominance subsampling info #define SWS_FULL_CHR_H_INT 0x2000 //input subsampling info #define SWS_FULL_CHR_H_INP 0x4000 diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 3f72f98..54cd85c 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -91,9 +91,9 @@ typedef int (*SwsFunc)(struct SwsContext *context, const uint8_t *src[], * Write one line of horizontally scaled data to planar output * without any additional vertical scaling (or point-scaling). * - * @param src scaled source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param dest pointer to the output plane. For >8bit + * @param src scaled source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param dest pointer to the output plane. For >8-bit * output, this is in uint16_t * @param dstW width of destination in pixels * @param dither ordered dither array of type int16_t and size 8 @@ -106,11 +106,11 @@ typedef void (*yuv2planar1_fn)(const int16_t *src, uint8_t *dest, int dstW, * Write one line of horizontally scaled data to planar output * with multi-point vertical scaling between input pixels. * - * @param filter vertical luma/alpha scaling coefficients, 12bit [0,4096] - * @param src scaled luma (Y) or alpha (A) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) + * @param filter vertical luma/alpha scaling coefficients, 12 bits [0,4096] + * @param src scaled luma (Y) or alpha (A) source data, 15 bits for + * 8-10-bit output, 19 bits for 16-bit output (in int32_t) * @param filterSize number of vertical input lines to scale - * @param dest pointer to output plane. For >8bit + * @param dest pointer to output plane. For >8-bit * output, this is in uint16_t * @param dstW width of destination pixels * @param offset Dither offset @@ -124,13 +124,13 @@ typedef void (*yuv2planarX_fn)(const int16_t *filter, int filterSize, * with multi-point vertical scaling between input pixels. * * @param c SWS scaling context - * @param chrFilter vertical chroma scaling coefficients, 12bit [0,4096] - * @param chrUSrc scaled chroma (U) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param chrVSrc scaled chroma (V) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) + * @param chrFilter vertical chroma scaling coefficients, 12 bits [0,4096] + * @param chrUSrc scaled chroma (U) source data, 15 bits for 8-10-bit + * output, 19 bits for 16-bit output (in int32_t) + * @param chrVSrc scaled chroma (V) source data, 15 bits for 8-10-bit + * output, 19 bits for 16-bit output (in int32_t) * @param chrFilterSize number of vertical chroma input lines to scale - * @param dest pointer to the output plane. For >8bit + * @param dest pointer to the output plane. For >8-bit * output, this is in uint16_t * @param dstW width of chroma planes */ @@ -147,15 +147,15 @@ typedef void (*yuv2interleavedX_fn)(struct SwsContext *c, * that this function may do chroma scaling, see the "uvalpha" argument. * * @param c SWS scaling context - * @param lumSrc scaled luma (Y) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param chrUSrc scaled chroma (U) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param chrVSrc scaled chroma (V) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param alpSrc scaled alpha (A) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param dest pointer to the output plane. For 16bit output, this is + * @param lumSrc scaled luma (Y) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param chrUSrc scaled chroma (U) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param chrVSrc scaled chroma (V) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param alpSrc scaled alpha (A) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param dest pointer to the output plane. For 16-bit output, this is * uint16_t * @param dstW width of lumSrc and alpSrc in pixels, number of pixels * to write into dest[] @@ -180,15 +180,15 @@ typedef void (*yuv2packed1_fn)(struct SwsContext *c, const int16_t *lumSrc, * output by doing bilinear scaling between two input lines. * * @param c SWS scaling context - * @param lumSrc scaled luma (Y) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param chrUSrc scaled chroma (U) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param chrVSrc scaled chroma (V) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param alpSrc scaled alpha (A) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param dest pointer to the output plane. For 16bit output, this is + * @param lumSrc scaled luma (Y) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param chrUSrc scaled chroma (U) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param chrVSrc scaled chroma (V) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param alpSrc scaled alpha (A) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param dest pointer to the output plane. For 16-bit output, this is * uint16_t * @param dstW width of lumSrc and alpSrc in pixels, number of pixels * to write into dest[] @@ -214,19 +214,19 @@ typedef void (*yuv2packed2_fn)(struct SwsContext *c, const int16_t *lumSrc[2], * output by doing multi-point vertical scaling between input pixels. * * @param c SWS scaling context - * @param lumFilter vertical luma/alpha scaling coefficients, 12bit [0,4096] - * @param lumSrc scaled luma (Y) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) + * @param lumFilter vertical luma/alpha scaling coefficients, 12 bits [0,4096] + * @param lumSrc scaled luma (Y) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) * @param lumFilterSize number of vertical luma/alpha input lines to scale - * @param chrFilter vertical chroma scaling coefficients, 12bit [0,4096] - * @param chrUSrc scaled chroma (U) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param chrVSrc scaled chroma (V) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) + * @param chrFilter vertical chroma scaling coefficients, 12 bits [0,4096] + * @param chrUSrc scaled chroma (U) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param chrVSrc scaled chroma (V) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) * @param chrFilterSize number of vertical chroma input lines to scale - * @param alpSrc scaled alpha (A) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param dest pointer to the output plane. For 16bit output, this is + * @param alpSrc scaled alpha (A) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param dest pointer to the output plane. For 16-bit output, this is * uint16_t * @param dstW width of lumSrc and alpSrc in pixels, number of pixels * to write into dest[] @@ -248,19 +248,19 @@ typedef void (*yuv2packedX_fn)(struct SwsContext *c, const int16_t *lumFilter, * output by doing multi-point vertical scaling between input pixels. * * @param c SWS scaling context - * @param lumFilter vertical luma/alpha scaling coefficients, 12bit [0,4096] - * @param lumSrc scaled luma (Y) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) + * @param lumFilter vertical luma/alpha scaling coefficients, 12 bits [0,4096] + * @param lumSrc scaled luma (Y) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) * @param lumFilterSize number of vertical luma/alpha input lines to scale - * @param chrFilter vertical chroma scaling coefficients, 12bit [0,4096] - * @param chrUSrc scaled chroma (U) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param chrVSrc scaled chroma (V) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) + * @param chrFilter vertical chroma scaling coefficients, 12 bits [0,4096] + * @param chrUSrc scaled chroma (U) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param chrVSrc scaled chroma (V) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) * @param chrFilterSize number of vertical chroma input lines to scale - * @param alpSrc scaled alpha (A) source data, 15bit for 8-10bit output, - * 19-bit for 16bit output (in int32_t) - * @param dest pointer to the output planes. For 16bit output, this is + * @param alpSrc scaled alpha (A) source data, 15 bits for 8-10-bit output, + * 19 bits for 16-bit output (in int32_t) + * @param dest pointer to the output planes. For 16-bit output, this is * uint16_t * @param dstW width of lumSrc and alpSrc in pixels, number of pixels * to write into dest[] @@ -554,7 +554,7 @@ typedef struct SwsContext { * Scale one horizontal line of input data using a bilinear filter * to produce one line of output data. Compared to SwsContext->hScale(), * please take note of the following caveats when using these: - * - Scaling is done using only 7bit instead of 14bit coefficients. + * - Scaling is done using only 7 bits instead of 14-bit coefficients. * - You can use no more than 5 input pixels to produce 4 output * pixels. Therefore, this filter should not be used for downscaling * by more than ~20% in width (because that equals more than 5/4th @@ -585,15 +585,15 @@ typedef struct SwsContext { * @param dst pointer to destination buffer for horizontally scaled * data. If the number of bits per component of one * destination pixel (SwsContext->dstBpc) is <= 10, data - * will be 15bpc in 16bits (int16_t) width. Else (i.e. + * will be 15 bpc in 16 bits (int16_t) width. Else (i.e. * SwsContext->dstBpc == 16), data will be 19bpc in - * 32bits (int32_t) width. + * 32 bits (int32_t) width. * @param dstW width of destination image * @param src pointer to source data to be scaled. If the number of * bits per component of a source pixel (SwsContext->srcBpc) - * is 8, this is 8bpc in 8bits (uint8_t) width. Else + * is 8, this is 8bpc in 8 bits (uint8_t) width. Else * (i.e. SwsContext->dstBpc > 8), this is native depth - * in 16bits (uint16_t) width. In other words, for 9-bit + * in 16 bits (uint16_t) width. In other words, for 9-bit * YUV input, this is 9bpc, for 10-bit YUV input, this is * 10bpc, and for 16-bit RGB or YUV, this is 16bpc. * @param filter filter coefficients to be used per output pixel for diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 133817c..db3e993 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -50,17 +50,17 @@ SECTION .text ; const uint8_t *dither, int offset) ; ; Scale one or $filterSize lines of source data to generate one line of output -; data. The input is 15-bit in int16_t if $output_size is [8,10] and 19-bit in -; int32_t if $output_size is 16. $filter is 12-bits. $filterSize is a multiple +; data. The input is 15 bits in int16_t if $output_size is [8,10] and 19 bits in +; int32_t if $output_size is 16. $filter is 12 bits. $filterSize is a multiple ; of 2. $offset is either 0 or 3. $dither holds 8 values. ;----------------------------------------------------------------------------- %macro yuv2planeX_mainloop 2 .pixelloop_%2: %assign %%i 0 - ; the rep here is for the 8bit output mmx case, where dither covers + ; the rep here is for the 8-bit output MMX case, where dither covers ; 8 pixels but we can only handle 2 pixels per register, and thus 4 ; pixels per iteration. In order to not have to keep track of where - ; we are w.r.t. dithering, we unroll the mmx/8bit loop x2. + ; we are w.r.t. dithering, we unroll the MMX/8-bit loop x2. %if %1 == 8 %assign %%repcnt 16/mmsize %else diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm index 7af92f7..f978170 100644 --- a/libswscale/x86/scale.asm +++ b/libswscale/x86/scale.asm @@ -39,10 +39,10 @@ SECTION .text ; const int16_t *filter, ; const int32_t *filterPos, int filterSize); ; -; Scale one horizontal line. Input is either 8-bits width or 16-bits width +; Scale one horizontal line. Input is either 8-bit width or 16-bit width ; ($source_width can be either 8, 9, 10 or 16, difference is whether we have to -; downscale before multiplying). Filter is 14-bits. Output is either 15bits -; (in int16_t) or 19bits (in int32_t), as given in $intermediate_nbits. Each +; downscale before multiplying). Filter is 14 bits. Output is either 15 bits +; (in int16_t) or 19 bits (in int32_t), as given in $intermediate_nbits. Each ; output pixel is generated from $filterSize input pixels, the position of ; the first pixel is given in filterPos[nOutputPixel]. ;----------------------------------------------------------------------------- diff --git a/tests/checkasm/h264pred.c b/tests/checkasm/h264pred.c index 4028405..59dcb2f 100644 --- a/tests/checkasm/h264pred.c +++ b/tests/checkasm/h264pred.c @@ -29,7 +29,7 @@ static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 }; static const char * const pred4x4_modes[4][15] = { - { /* H264 */ + { /* H.264 */ [VERT_PRED ] = "vertical", [HOR_PRED ] = "horizontal", [DC_PRED ] = "dc", @@ -65,7 +65,7 @@ static const char * const pred4x4_modes[4][15] = { }; static const char * const pred8x8_modes[4][11] = { - { /* H264 */ + { /* H.264 */ [DC_PRED8x8 ] = "dc", [HOR_PRED8x8 ] = "horizontal", [VERT_PRED8x8 ] = "vertical", @@ -92,7 +92,7 @@ static const char * const pred8x8_modes[4][11] = { }; static const char * const pred16x16_modes[4][9] = { - { /* H264 */ + { /* H.264 */ [DC_PRED8x8 ] = "dc", [HOR_PRED8x8 ] = "horizontal", [VERT_PRED8x8 ] = "vertical", |
