Browse code

misc typo fixes

Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk

Diego Biurrun authored on 2007/06/13 03:50:50
Showing 26 changed files
... ...
@@ -184,10 +184,10 @@ Neighboring Blocks:
184 184
 left and top are set to the respective blocks unless they are outside of
185 185
 the image in which case they are set to the Null block
186 186
 
187
-top-left is set to the top left block unless its outside of the image in
187
+top-left is set to the top left block unless it is outside of the image in
188 188
 which case it is set to the left block
189 189
 
190
-if this block has no larger parent block or its at the left side of its
190
+if this block has no larger parent block or it is at the left side of its
191 191
 parent block and the top right block is not outside of the image then the
192 192
 top right block is used for top-right else the top-left block is used
193 193
 
... ...
@@ -1272,7 +1272,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
1272 1272
 
1273 1273
         init_get_bits(&gb, buf, size);
1274 1274
 
1275
-        //read bits & inital values
1275
+        //read bits & initial values
1276 1276
         nb_bits = get_bits(&gb, 2)+2;
1277 1277
         //av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits);
1278 1278
         table = swf_index_tables[nb_bits-2];
... ...
@@ -3139,7 +3139,7 @@ void ff_block_permute(DCTELEM *block, uint8_t *permutation, const uint8_t *scant
3139 3139
     DCTELEM temp[64];
3140 3140
 
3141 3141
     if(last<=0) return;
3142
-    //if(permutation[1]==1) return; //FIXME its ok but not clean and might fail for some perms
3142
+    //if(permutation[1]==1) return; //FIXME it is ok but not clean and might fail for some permutations
3143 3143
 
3144 3144
     for(i=0; i<=last; i++){
3145 3145
         const int j= scantable[i];
... ...
@@ -68,7 +68,7 @@ typedef struct ff_expr_s AVEvalExpr;
68 68
  * @param func1_name NULL terminated array of zero terminated strings of func1 identifers
69 69
  * @param func2_name NULL terminated array of zero terminated strings of func2 identifers
70 70
  * @param error pointer to a char* which is set to an error message if something goes wrong
71
- * @return AVEvalExpr which must be freed with ff_eval_free by the user when its not needed anymore
71
+ * @return AVEvalExpr which must be freed with ff_eval_free by the user when it is not needed anymore
72 72
  *         NULL if anything went wrong
73 73
  */
74 74
 AVEvalExpr * ff_parse(char *s, const char **const_name,
... ...
@@ -584,7 +584,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
584 584
                  * a second pass over the line here, swapping the bytes.
585 585
                  */
586 586
                 pixel = 0xFF00;
587
-                if (0xFF00 != AV_RL16(&pixel)) /* Check if its not an LE Target */
587
+                if (0xFF00 != AV_RL16(&pixel)) /* Check if it is not an LE target */
588 588
                 {
589 589
                   pixel_ptr = y_ptr;
590 590
                   pixel_countdown = s->avctx->width;
... ...
@@ -164,7 +164,7 @@ static int ff_h261_resync(H261Context *h){
164 164
             if(ret>=0)
165 165
                 return 0;
166 166
         }
167
-        //ok, its not where its supposed to be ...
167
+        //OK, it is not where it is supposed to be ...
168 168
         s->gb= s->last_resync_gb;
169 169
         align_get_bits(&s->gb);
170 170
         left= s->gb.size_in_bits - get_bits_count(&s->gb);
... ...
@@ -3386,7 +3386,7 @@ int ff_h263_resync(MpegEncContext *s){
3386 3386
         if(ret>=0)
3387 3387
             return 0;
3388 3388
     }
3389
-    //ok, it's not where its supposed to be ...
3389
+    //OK, it's not where it is supposed to be ...
3390 3390
     s->gb= s->last_resync_gb;
3391 3391
     align_get_bits(&s->gb);
3392 3392
     left= s->gb.size_in_bits - get_bits_count(&s->gb);
... ...
@@ -4720,7 +4720,7 @@ retry:
4720 4720
         i += run;
4721 4721
         if (i >= 64){
4722 4722
             if(s->alt_inter_vlc && rl == &rl_inter && !s->mb_intra){
4723
-                //looks like a hack but no, it's the way its supposed to work ...
4723
+                //Looks like a hack but no, it's the way it is supposed to work ...
4724 4724
                 rl = &rl_intra_aic;
4725 4725
                 i = 0;
4726 4726
                 s->gb= gb;
... ...
@@ -1446,7 +1446,7 @@ static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *c
1446 1446
 
1447 1447
     *dst_length= di;
1448 1448
     *consumed= si + 1;//+1 for the header
1449
-//FIXME store exact number of bits in the getbitcontext (its needed for decoding)
1449
+//FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
1450 1450
     return dst;
1451 1451
 }
1452 1452
 
... ...
@@ -34,7 +34,7 @@
34 34
 #include "mpegvideo.h"
35 35
 
36 36
 #define interlaced_dct interlaced_dct_is_a_bad_name
37
-#define mb_intra mb_intra_is_not_initalized_see_mb_type
37
+#define mb_intra mb_intra_is_not_initialized_see_mb_type
38 38
 
39 39
 #define LUMA_DC_BLOCK_INDEX   25
40 40
 #define CHROMA_DC_BLOCK_INDEX 26
... ...
@@ -1169,7 +1169,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
1169 1169
                 decode_bgr_bitstream(s, width-1);
1170 1170
                 add_left_prediction_bgr32(p->data[0] + last_line+4, s->temp[0], width-1, &leftr, &leftg, &leftb);
1171 1171
 
1172
-                for(y=s->height-2; y>=0; y--){ //yes its stored upside down
1172
+                for(y=s->height-2; y>=0; y--){ //Yes it is stored upside down.
1173 1173
                     decode_bgr_bitstream(s, width);
1174 1174
 
1175 1175
                     add_left_prediction_bgr32(p->data[0] + p->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb);
... ...
@@ -33,7 +33,7 @@
33 33
 #define rounder(bias) {round (bias), round (bias)}
34 34
 
35 35
 #if 0
36
-/* C row IDCT - its just here to document the MMXEXT and MMX versions */
36
+/* C row IDCT - it is just here to document the MMXEXT and MMX versions */
37 37
 static inline void idct_row (int16_t * row, int offset,
38 38
                              int16_t * table, int32_t * rounder)
39 39
 {
... ...
@@ -313,7 +313,7 @@ static inline void mmx_row_mid (int16_t * row, int store,
313 313
 
314 314
 
315 315
 #if 0
316
-// C column IDCT - its just here to document the MMXEXT and MMX versions
316
+// C column IDCT - it is just here to document the MMXEXT and MMX versions
317 317
 static inline void idct_col (int16_t * col, int offset)
318 318
 {
319 319
 /* multiplication - as implemented on mmx */
... ...
@@ -96,7 +96,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
96 96
                             int qscale, int *overflow)
97 97
 {
98 98
     long last_non_zero_p1;
99
-    int level=0, q; //=0 is cuz gcc says uninitalized ...
99
+    int level=0, q; //=0 is cuz gcc says uninitialized ...
100 100
     const uint16_t *qmat, *bias;
101 101
     DECLARE_ALIGNED_16(int16_t, temp_block[64]);
102 102
 
... ...
@@ -1807,7 +1807,7 @@ static inline int direct_search(MpegEncContext * s, int mb_x, int mb_y)
1807 1807
     P_LEFT[1]        = av_clip(mv_table[mot_xy - 1][1], ymin<<shift, ymax<<shift);
1808 1808
 
1809 1809
     /* special case for first line */
1810
-    if (!s->first_slice_line) { //FIXME maybe allow this over thread boundary as its clipped
1810
+    if (!s->first_slice_line) { //FIXME maybe allow this over thread boundary as it is clipped
1811 1811
         P_TOP[0]      = av_clip(mv_table[mot_xy - mot_stride             ][0], xmin<<shift, xmax<<shift);
1812 1812
         P_TOP[1]      = av_clip(mv_table[mot_xy - mot_stride             ][1], ymin<<shift, ymax<<shift);
1813 1813
         P_TOPRIGHT[0] = av_clip(mv_table[mot_xy - mot_stride + 1         ][0], xmin<<shift, xmax<<shift);
... ...
@@ -3205,7 +3205,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
3205 3205
                         return -1;
3206 3206
                     }
3207 3207
                 if(!s2->current_picture_ptr){
3208
-                    av_log(avctx, AV_LOG_ERROR, "current_picture not initalized\n");
3208
+                    av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n");
3209 3209
                     return -1;
3210 3210
                 }
3211 3211
 
... ...
@@ -145,7 +145,8 @@ static RLTable rl_intra = {
145 145
     intra_level,
146 146
 };
147 147
 
148
-static const uint16_t inter_rvlc[170][2]={ //note this is identical to the intra rvlc except that its reordered
148
+/* Note this is identical to the intra rvlc except that it is reordered. */
149
+static const uint16_t inter_rvlc[170][2]={
149 150
 {0x0006,  3},{0x0001,  4},{0x0004,  5},{0x001C,  7},
150 151
 {0x003C,  8},{0x003D,  8},{0x007C,  9},{0x00FC, 10},
151 152
 {0x00FD, 10},{0x01FC, 11},{0x01FD, 11},{0x03FC, 12},
... ...
@@ -441,11 +441,12 @@ static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
441 441
         CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan))
442 442
     }
443 443
 
444
-    //it might be nicer if the application would keep track of these but it would require a API change
444
+    /* It might be nicer if the application would keep track of these
445
+     * but it would require an API change. */
445 446
     memmove(s->prev_pict_types+1, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE-1);
446 447
     s->prev_pict_types[0]= s->pict_type;
447 448
     if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == B_TYPE)
448
-        pic->age= INT_MAX; // skipped MBs in b frames are quite rare in mpeg1/2 and its a bit tricky to skip them anyway
449
+        pic->age= INT_MAX; // Skipped MBs in B-frames are quite rare in MPEG-1/2 and it is a bit tricky to skip them anyway.
449 450
 
450 451
     return 0;
451 452
 fail: //for the CHECKED_ALLOCZ macro
... ...
@@ -88,7 +88,7 @@ int frame_count = 0;
88 88
 #include "msmpeg4data.h"
89 89
 #include "msmpeg4tab.h"
90 90
 
91
-#ifdef CONFIG_ENCODERS //strangely gcc includes this even if its not references
91
+#ifdef CONFIG_ENCODERS //strangely gcc includes this even if it is not references
92 92
 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];
93 93
 #endif //CONFIG_ENCODERS
94 94
 
... ...
@@ -454,7 +454,7 @@ static void msmpeg4_encode_motion(MpegEncContext * s,
454 454
              mv->table_mv_bits[code],
455 455
              mv->table_mv_code[code]);
456 456
     if (code == mv->n) {
457
-        /* escape : code litterally */
457
+        /* escape : code literally */
458 458
         put_bits(&s->pb, 6, mx);
459 459
         put_bits(&s->pb, 6, my);
460 460
     }
... ...
@@ -983,7 +983,8 @@ static VLC v1_intra_cbpc_vlc;
983 983
 static VLC v1_inter_cbpc_vlc;
984 984
 static VLC inter_intra_vlc;
985 985
 
986
-/* this table is practically identical to the one from h263 except that its inverted */
986
+/* This table is practically identical to the one from h263
987
+ * except that it is inverted. */
987 988
 static void init_h263_dc_for_msmpeg4(void)
988 989
 {
989 990
         int level, uni_code, uni_len;
... ...
@@ -1380,7 +1381,7 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
1380 1380
 }
1381 1381
 #endif
1382 1382
 
1383
-/* this is identical to h263 except that its range is multiplied by 2 */
1383
+/* This is identical to h263 except that its range is multiplied by 2. */
1384 1384
 static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code)
1385 1385
 {
1386 1386
     int code, val, sign, shift;
... ...
@@ -177,8 +177,8 @@ void av_build_filter(FELEM *filter, double factor, int tap_count, int phase_coun
177 177
 }
178 178
 
179 179
 /**
180
- * initalizes a audio resampler.
181
- * note, if either rate is not a integer then simply scale both rates up so they are
180
+ * Initializes an audio resampler.
181
+ * Note, if either rate is not an integer then simply scale both rates up so they are.
182 182
  */
183 183
 AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff){
184 184
     AVResampleContext *c= av_mallocz(sizeof(AVResampleContext));
... ...
@@ -259,7 +259,7 @@ typedef struct AVIndexEntry {
259 259
     int64_t timestamp;
260 260
 #define AVINDEX_KEYFRAME 0x0001
261 261
     int flags:2;
262
-    int size:30; //yeah trying to keep the size of this small to reduce memory requirements (its 24 vs 32 byte due to possible 8byte align)
262
+    int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs 32 byte due to possible 8byte align).
263 263
     int min_distance;         /**< min distance between this and the previous keyframe, used to avoid unneeded searching */
264 264
 } AVIndexEntry;
265 265
 
... ...
@@ -720,10 +720,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
720 720
  *
721 721
  * The packet must contain one audio or video frame.
722 722
  * If the packets are already correctly interleaved the application should
723
- * call av_write_frame() instead as it is slightly faster, it is also important
724
- * to keep in mind that completly non interleaved input will need huge amounts
725
- * of memory to interleave with this, so its prefereable to interleave at the
726
- * demuxer level
723
+ * call av_write_frame() instead as it is slightly faster. It is also important
724
+ * to keep in mind that completely non-interleaved input will need huge amounts
725
+ * of memory to interleave with this, so it is preferable to interleave at the
726
+ * demuxer level.
727 727
  *
728 728
  * @param s media file handle
729 729
  * @param pkt the packet, which contains the stream_index, buf/buf_size, dts/pts, ...
... ...
@@ -85,9 +85,9 @@ void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
85 85
 int url_poll(URLPollEntry *poll_table, int n, int timeout);
86 86
 
87 87
 /**
88
- * passing this as the "whence" parameter to a seek function causes it to
89
- * return the filesize without seeking anywhere, supporting this is optional
90
- * if its not supprted then the seek function will return <0
88
+ * Passing this as the "whence" parameter to a seek function causes it to
89
+ * return the filesize without seeking anywhere. Supporting this is optional.
90
+ * If it is not supported then the seek function will return <0.
91 91
  */
92 92
 #define AVSEEK_SIZE 0x10000
93 93
 
... ...
@@ -78,7 +78,7 @@ typedef struct MOVContext {
78 78
     MOVTrack tracks[MAX_STREAMS];
79 79
 } MOVContext;
80 80
 
81
-//FIXME supprt 64bit varaint with wide placeholders
81
+//FIXME support 64 bit variant with wide placeholders
82 82
 static offset_t updateSize (ByteIOContext *pb, offset_t pos)
83 83
 {
84 84
     offset_t curpos = url_ftell(pb);
... ...
@@ -423,7 +423,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
423 423
     must_open_file = 1;
424 424
     if (fmt && (fmt->flags & AVFMT_NOFILE)) {
425 425
         must_open_file = 0;
426
-        pb= NULL; //FIXME this or memset(pb, 0, sizeof(ByteIOContext)); otherwise its uninitalized
426
+        pb= NULL; //FIXME this or memset(pb, 0, sizeof(ByteIOContext)); otherwise it is uninitialized
427 427
     }
428 428
 
429 429
     if (!fmt || must_open_file) {
... ...
@@ -1098,7 +1098,7 @@ int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts
1098 1098
 
1099 1099
     ts_max=
1100 1100
     ts_min= AV_NOPTS_VALUE;
1101
-    pos_limit= -1; //gcc falsely says it may be uninitalized
1101
+    pos_limit= -1; //gcc falsely says it may be uninitialized
1102 1102
 
1103 1103
     st= s->streams[stream_index];
1104 1104
     if(st->index_entries){
... ...
@@ -26,7 +26,7 @@ extern const int av_aes_size;
26 26
 struct AVAES;
27 27
 
28 28
 /**
29
- * initalizes a AVAES context
29
+ * initializes an AVAES context
30 30
  * @param key_bits 128, 192 or 256
31 31
  * @param decrypt 0 for encryption, 1 for decryption
32 32
  */
... ...
@@ -37,7 +37,7 @@ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
37 37
  * @param count number of 16 byte blocks
38 38
  * @param dst destination array, can be equal to src
39 39
  * @param src source array, can be equal to dst
40
- * @param iv initalization vector for CBC mode, if NULL then ECB will be used
40
+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
41 41
  * @param decrypt 0 for encryption, 1 for decryption
42 42
  */
43 43
 void av_aes_crypt(struct AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, int decrypt);
... ...
@@ -205,14 +205,14 @@ static inline int ff_get_fourcc(const char *s){
205 205
 
206 206
 /*!
207 207
  * \def GET_UTF8(val, GET_BYTE, ERROR)
208
- * converts a utf-8 character (up to 4 bytes long) to its 32-bit ucs-4 encoded form
208
+ * converts a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form
209 209
  * \param val is the output and should be of type uint32_t. It holds the converted
210
- * ucs-4 character and should be a left value.
211
- * \param GET_BYTE gets utf-8 encoded bytes from any proper source. It can be
210
+ * UCS-4 character and should be a left value.
211
+ * \param GET_BYTE gets UTF-8 encoded bytes from any proper source. It can be
212 212
  * a function or a statement whose return value or evaluated value is of type
213
- * uint8_t. It will be executed up to 4 times for values in the valid utf-8 range,
213
+ * uint8_t. It will be executed up to 4 times for values in the valid UTF-8 range,
214 214
  * and up to 7 times in the general case.
215
- * \param ERROR action that should be taken when an invalid utf-8 byte is returned
215
+ * \param ERROR action that should be taken when an invalid UTF-8 byte is returned
216 216
  * from GET_BYTE. It should be a statement that jumps out of the macro,
217 217
  * like exit(), goto, return, break, or continue.
218 218
  */
... ...
@@ -233,17 +233,17 @@ static inline int ff_get_fourcc(const char *s){
233 233
 
234 234
 /*!
235 235
  * \def PUT_UTF8(val, tmp, PUT_BYTE)
236
- * converts a 32-bit unicode character to its utf-8 encoded form (up to 4 bytes long).
236
+ * converts a 32-bit unicode character to its UTF-8 encoded form (up to 4 bytes long).
237 237
  * \param val is an input only argument and should be of type uint32_t. It holds
238
- * a ucs4 encoded unicode character that is to be converted to utf-8. If
238
+ * a ucs4 encoded unicode character that is to be converted to UTF-8. If
239 239
  * val is given as a function it's executed only once.
240 240
  * \param tmp is a temporary variable and should be of type uint8_t. It
241 241
  * represents an intermediate value during conversion that is to be
242 242
  * outputted by PUT_BYTE.
243
- * \param PUT_BYTE writes the converted utf-8 bytes to any proper destination.
243
+ * \param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
244 244
  * It could be a function or a statement, and uses tmp as the input byte.
245 245
  * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
246
- * executed up to 4 times for values in the valid utf-8 range and up to
246
+ * executed up to 4 times for values in the valid UTF-8 range and up to
247 247
  * 7 times in the general case, depending on the length of the converted
248 248
  * unicode character.
249 249
  */
... ...
@@ -373,7 +373,8 @@ static inline void RENAME(doVertLowPass)(uint8_t *src, int stride, PPContext *c)
373 373
  * Experimental implementation of the filter (Algorithm 1) described in a paper from Ramkishor & Karandikar
374 374
  * values are correctly clipped (MMX2)
375 375
  * values are wraparound (C)
376
- * conclusion: its fast, but introduces ugly horizontal patterns if there is a continious gradient
376
+ * Conclusion: It is fast, but introduces ugly horizontal patterns
377
+ * if there is a continuous gradient.
377 378
         0 8 16 24
378 379
         x = 8
379 380
         x/2 = 4
... ...
@@ -3498,7 +3499,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
3498 3498
                         );
3499 3499
 
3500 3500
 #elif defined(HAVE_3DNOW)
3501
-//FIXME check if this is faster on an 3dnow chip or if its faster without the prefetch or ...
3501
+//FIXME check if this is faster on an 3dnow chip or if it is faster without the prefetch or ...
3502 3502
 /*                        prefetch(srcBlock + (((x>>3)&3) + 5)*srcStride + 32);
3503 3503
                         prefetch(srcBlock + (((x>>3)&3) + 9)*srcStride + 32);
3504 3504
                         prefetchw(dstBlock + (((x>>3)&3) + 5)*dstStride + 32);
... ...
@@ -3642,7 +3643,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
3642 3642
                         );
3643 3643
 
3644 3644
 #elif defined(HAVE_3DNOW)
3645
-//FIXME check if this is faster on an 3dnow chip or if its faster without the prefetch or ...
3645
+//FIXME check if this is faster on an 3dnow chip or if it is faster without the prefetch or ...
3646 3646
 /*                        prefetch(srcBlock + (((x>>3)&3) + 5)*srcStride + 32);
3647 3647
                         prefetch(srcBlock + (((x>>3)&3) + 9)*srcStride + 32);
3648 3648
                         prefetchw(dstBlock + (((x>>3)&3) + 5)*dstStride + 32);
... ...
@@ -577,7 +577,7 @@ fi
577 577
 ###################################
578 578
 #if [ -n "$do_vorbis" ] ; then
579 579
 # vorbis
580
-#disabled because its broken
580
+#disabled because it is broken
581 581
 #do_audio_encoding vorbis.asf "-ar 44100" "-acodec vorbis"
582 582
 #do_audio_decoding
583 583
 #fi