Skip to content

F
ffmpeg-mt
Commit 99ecfcf8 authored by diego's avatar diego
Browse files
Options

misc spelling/grammar fixes 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14367 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 924cb74b
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
libavcodec/h264.c
View file @ 99ecfcf8
...@@ -133,7 +133,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){ ...@@ -133,7 +133,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){
topleft_xy -= s->mb_stride; topleft_xy -= s->mb_stride;
} else if(bottom && curr_mb_frame_flag && !left_mb_frame_flag) { } else if(bottom && curr_mb_frame_flag && !left_mb_frame_flag) {
topleft_xy += s->mb_stride; topleft_xy += s->mb_stride;
// take topleft mv from the middle of the mb, as opposed to all other modes which use the bottom-right partition // take top left mv from the middle of the mb, as opposed to all other modes which use the bottom right partition
topleft_partition = 0; topleft_partition = 0;
} }
if (bottom if (bottom
...@@ -292,7 +292,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){ ...@@ -292,7 +292,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){
4 L . .L . . . . 4 L . .L . . . .
5 L . .. . . . . 5 L . .. . . . .
*/ */
//FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) //FIXME constraint_intra_pred & partitioning & nnz (let us hope this is just a typo in the spec)
if(top_type){ if(top_type){
h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4]; h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4];
h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5]; h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5];
...@@ -673,7 +673,7 @@ static inline void write_back_non_zero_count(H264Context *h){ ...@@ -673,7 +673,7 @@ static inline void write_back_non_zero_count(H264Context *h){
} }
/** /**
* gets the predicted number of non zero coefficients. * gets the predicted number of non-zero coefficients.
* @param n block index * @param n block index
*/ */
static inline int pred_non_zero_count(H264Context *h, int n){ static inline int pred_non_zero_count(H264Context *h, int n){
...@@ -728,7 +728,7 @@ static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, in ...@@ -728,7 +728,7 @@ static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, in
if(MB_FIELD if(MB_FIELD
&& !IS_INTERLACED(mb_types[h->left_mb_xy[0]]) && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])
&& i >= scan8[0]+8){ && i >= scan8[0]+8){
// leftshift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's ok. // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK.
SET_DIAG_MV(/2, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2); SET_DIAG_MV(/2, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2);
} }
} }
...@@ -1454,7 +1454,7 @@ static int decode_rbsp_trailing(H264Context *h, const uint8_t *src){ ...@@ -1454,7 +1454,7 @@ static int decode_rbsp_trailing(H264Context *h, const uint8_t *src){
} }
/** /**
* idct tranforms the 16 dc values and dequantize them. * IDCT transforms the 16 dc values and dequantizes them.
* @param qp quantization parameter * @param qp quantization parameter
*/ */
static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
...@@ -1486,7 +1486,7 @@ static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ ...@@ -1486,7 +1486,7 @@ static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
const int z2= temp[4*1+i] - temp[4*3+i]; const int z2= temp[4*1+i] - temp[4*3+i];
const int z3= temp[4*1+i] + temp[4*3+i]; const int z3= temp[4*1+i] + temp[4*3+i];
block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_resdual block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_residual
block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8)); block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8)); block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8)); block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
...@@ -1495,7 +1495,7 @@ static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ ...@@ -1495,7 +1495,7 @@ static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
#if 0 #if 0
/** /**
* dct tranforms the 16 dc values. * DCT transforms the 16 dc values.
* @param qp quantization parameter ??? FIXME * @param qp quantization parameter ??? FIXME
*/ */
static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
...@@ -1684,7 +1684,7 @@ static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, ...@@ -1684,7 +1684,7 @@ static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square,
const int pic_width = 16*s->mb_width; const int pic_width = 16*s->mb_width;
const int pic_height = 16*s->mb_height >> MB_FIELD; const int pic_height = 16*s->mb_height >> MB_FIELD;
if(!pic->data[0]) //FIXME this is unacceptable, some senseable error concealment must be done for missing reference frames if(!pic->data[0]) //FIXME this is unacceptable, some sensible error concealment must be done for missing reference frames
return; return;
if(mx&7) extra_width -= 3; if(mx&7) extra_width -= 3;
...@@ -2226,7 +2226,7 @@ static int frame_start(H264Context *h){ ...@@ -2226,7 +2226,7 @@ static int frame_start(H264Context *h){
/* /*
* MPV_frame_start uses pict_type to derive key_frame. * MPV_frame_start uses pict_type to derive key_frame.
* This is incorrect for H.264; IDR markings must be used. * This is incorrect for H.264; IDR markings must be used.
* Zero here; IDR markings per slice in frame or fields are OR'd in later. * Zero here; IDR markings per slice in frame or fields are ORed in later.
* See decode_nal_units(). * See decode_nal_units().
*/ */
s->current_picture_ptr->key_frame= 0; s->current_picture_ptr->key_frame= 0;
...@@ -2256,7 +2256,7 @@ static int frame_start(H264Context *h){ ...@@ -2256,7 +2256,7 @@ static int frame_start(H264Context *h){
// s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1;
// We mark the current picture as non reference after allocating it, so // We mark the current picture as non-reference after allocating it, so
// that if we break out due to an error it can be released automatically // that if we break out due to an error it can be released automatically
// in the next MPV_frame_start(). // in the next MPV_frame_start().
// SVQ3 as well as most other codecs have only last/next/current and thus // SVQ3 as well as most other codecs have only last/next/current and thus
...@@ -2467,7 +2467,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ ...@@ -2467,7 +2467,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
linesize = h->mb_linesize = s->linesize * 2; linesize = h->mb_linesize = s->linesize * 2;
uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2; uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
block_offset = &h->block_offset[24]; block_offset = &h->block_offset[24];
if(mb_y&1){ //FIXME move out of this func? if(mb_y&1){ //FIXME move out of this function?
dest_y -= s->linesize*15; dest_y -= s->linesize*15;
dest_cb-= s->uvlinesize*7; dest_cb-= s->uvlinesize*7;
dest_cr-= s->uvlinesize*7; dest_cr-= s->uvlinesize*7;
...@@ -2876,7 +2876,7 @@ static int fill_default_ref_list(H264Context *h){ ...@@ -2876,7 +2876,7 @@ static int fill_default_ref_list(H264Context *h){
int out_i; int out_i;
int limit= INT_MIN; int limit= INT_MIN;
/* sort frame according to poc in B slice */ /* sort frame according to POC in B slice */
for(out_i=0; out_i<h->short_ref_count; out_i++){ for(out_i=0; out_i<h->short_ref_count; out_i++){
int best_i=INT_MIN; int best_i=INT_MIN;
int best_poc=INT_MAX; int best_poc=INT_MAX;
...@@ -2903,7 +2903,7 @@ static int fill_default_ref_list(H264Context *h){ ...@@ -2903,7 +2903,7 @@ static int fill_default_ref_list(H264Context *h){
tprintf(h->s.avctx, "current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current); tprintf(h->s.avctx, "current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current);
// find the largest poc // find the largest POC
for(list=0; list<2; list++){ for(list=0; list<2; list++){
int index = 0; int index = 0;
int j= -99; int j= -99;
...@@ -3033,7 +3033,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){ ...@@ -3033,7 +3033,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){
print_short_term(h); print_short_term(h);
print_long_term(h); print_long_term(h);
if(h->slice_type_nos==FF_I_TYPE) return 0; //FIXME move before func if(h->slice_type_nos==FF_I_TYPE) return 0; //FIXME move before function
for(list=0; list<h->list_count; list++){ for(list=0; list<h->list_count; list++){
memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
...@@ -3078,7 +3078,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){ ...@@ -3078,7 +3078,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){
if(ref->data[0] != NULL && if(ref->data[0] != NULL &&
ref->frame_num == frame_num && ref->frame_num == frame_num &&
(ref->reference & pic_structure) && (ref->reference & pic_structure) &&
ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer ref->long_ref == 0) // ignore non-existing pictures by testing data[0] pointer
break; break;
} }
if(i>=0) if(i>=0)
...@@ -3920,7 +3920,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -3920,7 +3920,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
h->slice_type= slice_type; h->slice_type= slice_type;
h->slice_type_nos= slice_type & 3; h->slice_type_nos= slice_type & 3;
s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though s->pict_type= h->slice_type; // to make a few old functions happy, it's wrong though
if (s->pict_type == FF_B_TYPE && s0->last_picture_ptr == NULL) { if (s->pict_type == FF_B_TYPE && s0->last_picture_ptr == NULL) {
av_log(h->s.avctx, AV_LOG_ERROR, av_log(h->s.avctx, AV_LOG_ERROR,
"B picture before any references, skipping\n"); "B picture before any references, skipping\n");
...@@ -3933,13 +3933,13 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -3933,13 +3933,13 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
return -1; return -1;
} }
if(!h0->pps_buffers[pps_id]) { if(!h0->pps_buffers[pps_id]) {
av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS referenced\n");
return -1; return -1;
} }
h->pps= *h0->pps_buffers[pps_id]; h->pps= *h0->pps_buffers[pps_id];
if(!h0->sps_buffers[h->pps.sps_id]) { if(!h0->sps_buffers[h->pps.sps_id]) {
av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS referenced\n");
return -1; return -1;
} }
h->sps = *h0->sps_buffers[h->pps.sps_id]; h->sps = *h0->sps_buffers[h->pps.sps_id];
...@@ -4130,7 +4130,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -4130,7 +4130,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
h->redundant_pic_count= get_ue_golomb(&s->gb); h->redundant_pic_count= get_ue_golomb(&s->gb);
} }
//set defaults, might be overriden a few line later //set defaults, might be overridden a few lines later
h->ref_count[0]= h->pps.ref_count[0]; h->ref_count[0]= h->pps.ref_count[0];
h->ref_count[1]= h->pps.ref_count[1]; h->ref_count[1]= h->pps.ref_count[1];
...@@ -4524,7 +4524,7 @@ static void decode_mb_skip(H264Context *h){ ...@@ -4524,7 +4524,7 @@ static void decode_mb_skip(H264Context *h){
/** /**
* decodes a macroblock * decodes a macroblock
* @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
*/ */
static int decode_mb_cavlc(H264Context *h){ static int decode_mb_cavlc(H264Context *h){
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
...@@ -5642,7 +5642,7 @@ static inline void compute_mb_neighbors(H264Context *h) ...@@ -5642,7 +5642,7 @@ static inline void compute_mb_neighbors(H264Context *h)
/** /**
* decodes a macroblock * decodes a macroblock
* @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed * @returns 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
*/ */
static int decode_mb_cabac(H264Context *h) { static int decode_mb_cabac(H264Context *h) {
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
...@@ -7696,7 +7696,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ ...@@ -7696,7 +7696,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
else if(err == 1) { else if(err == 1) {
/* Slice could not be decoded in parallel mode, copy down /* Slice could not be decoded in parallel mode, copy down
* NAL unit stuff to context 0 and restart. Note that * NAL unit stuff to context 0 and restart. Note that
* rbsp_buffer is not transfered, but since we no longer * rbsp_buffer is not transferred, but since we no longer
* run in parallel mode this should not be an issue. */ * run in parallel mode this should not be an issue. */
h->nal_unit_type = hx->nal_unit_type; h->nal_unit_type = hx->nal_unit_type;
h->nal_ref_idc = hx->nal_ref_idc; h->nal_ref_idc = hx->nal_ref_idc;
...@@ -7731,7 +7731,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -7731,7 +7731,7 @@ static int decode_frame(AVCodecContext *avctx,
s->flags= avctx->flags; s->flags= avctx->flags;
s->flags2= avctx->flags2; s->flags2= avctx->flags2;
/* end of stream, output whats still in the buffers */ /* end of stream, output what is still in the buffers */
if (buf_size == 0) { if (buf_size == 0) {
Picture *out; Picture *out;
int i, out_idx; int i, out_idx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment