comparison h264.c @ 7487:13937730e79d libavcodec

Use frame_num and reference instead of poc for matching frames for direct mode MBs, this seems to work better with field/frame mixes. POC of both can be the same and can be different that makes its use tricky.

7486:a52ba8daad18

    int sidx= s->picture_structure&1;
    int ref1sidx= ref1->reference&1;
    for(list=0; list<2; list++){
        cur->ref_count[sidx][list] = h->ref_count[list];
        for(j=0; j<h->ref_count[list]; j++)
            cur->ref_poc[sidx][list][j] = h->ref_list[list][j].poc;
    }
    if(s->picture_structure == PICT_FRAME){
        memcpy(cur->ref_count[0], cur->ref_count[1], sizeof(cur->ref_count[0]));
        memcpy(cur->ref_poc  [0], cur->ref_poc  [1], sizeof(cur->ref_poc  [0]));
    }
    if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred)
        return;
    for(list=0; list<2; list++){
        for(i=0; i<ref1->ref_count[ref1sidx][list]; i++){
            const int poc = ref1->ref_poc[ref1sidx][list][i];
            h->map_col_to_list0[list][i] = 0; /* bogus; fills in for missing frames */
            for(j=0; j<h->ref_count[list]; j++)
                if(h->ref_list[list][j].poc == poc){
                    h->map_col_to_list0[list][i] = j;
                    break;
                }
        }
    }

7487:13937730e79d

    int sidx= s->picture_structure&1;
    int ref1sidx= ref1->reference&1;
    for(list=0; list<2; list++){
        cur->ref_count[sidx][list] = h->ref_count[list];
        for(j=0; j<h->ref_count[list]; j++)
            cur->ref_poc[sidx][list][j] = 4*h->ref_list[list][j].frame_num + (h->ref_list[list][j].reference&3);
    }
    if(s->picture_structure == PICT_FRAME){
        memcpy(cur->ref_count[0], cur->ref_count[1], sizeof(cur->ref_count[0]));
        memcpy(cur->ref_poc  [0], cur->ref_poc  [1], sizeof(cur->ref_poc  [0]));
    }
    if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred)
        return;
    for(list=0; list<2; list++){
        for(i=0; i<ref1->ref_count[ref1sidx][list]; i++){
            int poc = ref1->ref_poc[ref1sidx][list][i];
            if(((poc&3) == 3) != (s->picture_structure == PICT_FRAME))
                poc= (poc&~3) + s->picture_structure;
            h->map_col_to_list0[list][i] = 0; /* bogus; fills in for missing frames */
            for(j=0; j<h->ref_count[list]; j++)
                if(4*h->ref_list[list][j].frame_num + (h->ref_list[list][j].reference&3) == poc){
                    h->map_col_to_list0[list][i] = j;
                    break;
                }
        }
    }