Revision 7b9e9817

View differences:

libavcodec/error_resilience.c
786 786
        }
787 787
    }
788 788

  
789
#if 1
789 790
    /* handle overlapping slices */
790 791
    for(error_type=1; error_type<=3; error_type++){
791 792
        int end_ok=0;
......
806 807
                end_ok=0;
807 808
        }
808 809
    }
809

  
810
#endif
811
#if 1
810 812
    /* handle slices with partitions of different length */
811 813
    if(s->partitioned_frame){
812 814
        int end_ok=0;
......
827 829
                end_ok=0;
828 830
        }
829 831
    }
830

  
832
#endif
831 833
    /* handle missing slices */
832 834
    if(s->error_recognition>=4){
833 835
        int end_ok=1;
......
851 853
        }
852 854
    }
853 855

  
856
#if 1
854 857
    /* backward mark errors */
855 858
    distance=9999999;
856 859
    for(error_type=1; error_type<=3; error_type++){
......
875 878
                distance= 9999999;
876 879
        }
877 880
    }
881
#endif
878 882

  
879 883
    /* forward mark errors */
880 884
    error=0;
......
889 893
            s->error_status_table[mb_xy]|= error;
890 894
        }
891 895
    }
892

  
896
#if 1
893 897
    /* handle not partitioned case */
894 898
    if(!s->partitioned_frame){
895 899
        for(i=0; i<s->mb_num; i++){
......
900 904
            s->error_status_table[mb_xy]= error;
901 905
        }
902 906
    }
907
#endif
903 908

  
904 909
    dc_error= ac_error= mv_error=0;
905 910
    for(i=0; i<s->mb_num; i++){
......
1060 1065
            s->dc_val[2][mb_x + mb_y*s->mb_stride]= (dcv+4)>>3;
1061 1066
        }
1062 1067
    }
1063

  
1068
#if 1
1064 1069
    /* guess DC for damaged blocks */
1065 1070
    guess_dc(s, s->dc_val[0], s->mb_width*2, s->mb_height*2, s->b8_stride, 1);
1066 1071
    guess_dc(s, s->dc_val[1], s->mb_width  , s->mb_height  , s->mb_stride, 0);
1067 1072
    guess_dc(s, s->dc_val[2], s->mb_width  , s->mb_height  , s->mb_stride, 0);
1068

  
1073
#endif
1069 1074
    /* filter luma DC */
1070 1075
    filter181(s->dc_val[0], s->mb_width*2, s->mb_height*2, s->b8_stride);
1071 1076

  
1077
#if 1
1072 1078
    /* render DC only intra */
1073 1079
    for(mb_y=0; mb_y<s->mb_height; mb_y++){
1074 1080
        for(mb_x=0; mb_x<s->mb_width; mb_x++){
......
1088 1094
            put_dc(s, dest_y, dest_cb, dest_cr, mb_x, mb_y);
1089 1095
        }
1090 1096
    }
1097
#endif
1091 1098

  
1092 1099
    if(s->avctx->error_concealment&FF_EC_DEBLOCK){
1093 1100
        /* filter horizontal block boundaries */
libavcodec/motion_est_template.c
158 158
        const int b= score_map[(index+(1<<ME_MAP_SHIFT))&(ME_MAP_SIZE-1)]
159 159
                     + (mv_penalty[bx   - pred_x] + mv_penalty[by+2 - pred_y])*c->penalty_factor;
160 160

  
161
#if 1
161 162
        int key;
162 163
        int map_generation= c->map_generation;
163 164
#ifndef NDEBUG
......
171 172
        assert(map[(index+1)&(ME_MAP_SIZE-1)] == key);
172 173
        key= ((my)<<ME_MAP_MV_BITS) + (mx-1) + map_generation;
173 174
        assert(map[(index-1)&(ME_MAP_SIZE-1)] == key);
175
#endif
174 176
        if(t<=b){
175 177
            CHECK_HALF_MV(0, 1, mx  ,my-1)
176 178
            if(l<=r){
libavformat/nutenc.c
175 175
        }
176 176

  
177 177
        key_frame= intra_only;
178
#if 1
178 179
        if(is_audio){
179 180
            int frame_bytes= codec->frame_size*(int64_t)codec->bit_rate / (8*codec->sample_rate);
180 181
            int pts;
......
198 199
            ft->pts_delta=1;
199 200
            start2++;
200 201
        }
202
#endif
201 203

  
202 204
        if(codec->has_b_frames){
203 205
            pred_count=5;

Also available in: Unified diff