comparison h264.c @ 1174:2de2a847af67 libavcodec

some checks to avoid segfault

1173:86d5a33eaec8

    if(pps_id>255){
        fprintf(stderr, "pps_id out of range\n");
        return -1;
    }
    h->pps= h->pps_buffer[pps_id];
    h->sps= h->sps_buffer[ h->pps.sps_id ];
    
    s->mb_width= h->sps.mb_width;
    s->mb_height= h->sps.mb_height;
    h->mb_stride= s->mb_width + 1;
    

            h->intra_gb_ptr= &h->intra_gb;
            break;
        case NAL_DPC:
            init_get_bits(&h->inter_gb, ptr, bit_length);
            h->inter_gb_ptr= &h->inter_gb;
            
            if(h->redundant_pic_count==0)
                decode_slice(h);
            break;
        case NAL_SEI:
            break;
        case NAL_SPS:

        //FIXME move after where irt is set
        s->current_picture.pict_type= s->pict_type;
        s->current_picture.key_frame= s->pict_type == I_TYPE;
    }
    
    h->prev_frame_num_offset= h->frame_num_offset;
    h->prev_frame_num= h->frame_num;
    if(s->current_picture_ptr->reference){
        h->prev_poc_msb= h->poc_msb;
        h->prev_poc_lsb= h->poc_lsb;

        *pict= *(AVFrame*)&s->current_picture;
    } else {
        *pict= *(AVFrame*)&s->last_picture;
    }
#endif
    *pict= *(AVFrame*)&s->current_picture; //FIXME 
    assert(pict->data[0]);
//printf("out %d\n", (int)pict->data[0]);
    if(avctx->debug&FF_DEBUG_QP){
        int8_t *qtab= pict->qscale_table;
        int x,y;
        
        for(y=0; y<s->mb_height; y++){
            for(x=0; x<s->mb_width; x++){
                printf("%2d ", qtab[x + y*s->mb_width]);
            }
            printf("\n");
        }
        printf("\n");
    }
#if 0 //?

    /* Return the Picture timestamp as the frame number */
    /* we substract 1 because it is added on utils.c    */
    avctx->frame_number = s->picture_number - 1;

1174:2de2a847af67

    if(pps_id>255){
        fprintf(stderr, "pps_id out of range\n");
        return -1;
    }
    h->pps= h->pps_buffer[pps_id];
    if(h->pps.slice_group_count == 0){
        fprintf(stderr, "non existing PPS referenced\n");
        return -1;
    }

    h->sps= h->sps_buffer[ h->pps.sps_id ];
    if(h->sps.log2_max_frame_num == 0){
        fprintf(stderr, "non existing SPS referenced\n");
        return -1;
    }
    
    s->mb_width= h->sps.mb_width;
    s->mb_height= h->sps.mb_height;
    h->mb_stride= s->mb_width + 1;
    

            h->intra_gb_ptr= &h->intra_gb;
            break;
        case NAL_DPC:
            init_get_bits(&h->inter_gb, ptr, bit_length);
            h->inter_gb_ptr= &h->inter_gb;

            if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning)
                decode_slice(h);
            break;
        case NAL_SEI:
            break;
        case NAL_SPS:

        //FIXME move after where irt is set
        s->current_picture.pict_type= s->pict_type;
        s->current_picture.key_frame= s->pict_type == I_TYPE;
    }
    
    if(!s->current_picture_ptr) return buf_index; //no frame
    
    h->prev_frame_num_offset= h->frame_num_offset;
    h->prev_frame_num= h->frame_num;
    if(s->current_picture_ptr->reference){
        h->prev_poc_msb= h->poc_msb;
        h->prev_poc_lsb= h->poc_lsb;

        *pict= *(AVFrame*)&s->current_picture;
    } else {
        *pict= *(AVFrame*)&s->last_picture;
    }
#endif
    if(!s->current_picture_ptr){
        fprintf(stderr, "error, NO frame\n");
        return -1;
    }

    *pict= *(AVFrame*)&s->current_picture; //FIXME 
    assert(pict->data[0]);
//printf("out %d\n", (int)pict->data[0]);
#if 0 //?

    /* Return the Picture timestamp as the frame number */
    /* we substract 1 because it is added on utils.c    */
    avctx->frame_number = s->picture_number - 1;