Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify

Browse Source 
reference list 1 swaping fix? seems its not used by any samples i found though

Originally committed as revision 3863 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 20 years ago
parent 4c12e8bee3
commit 3b33943e9b
1 changed files with 10 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      libavcodec/h264.c

35
libavcodec/h264.c
Unescape View File

@ -2886,32 +2886,17 @@ static int fill_default_ref_list(H264Context *h){
// 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 swap_first_L1 = 0; int j= -99;
int step= list ? -1 : 1;
if (0 == list) { for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) {
for(i=smallest_poc_greater_than_current-1; i>=0 && index < h->ref_count[list]; i--) { while(j<0 || j>= h->short_ref_count){
if(sorted_short_ref[i].reference != 3) continue; step = -step;
h->default_ref_list[list][index ]= sorted_short_ref[i]; j= smallest_poc_greater_than_current + (step>>1);
h->default_ref_list[list][index++].pic_id= sorted_short_ref[i].frame_num;
}
for(i=smallest_poc_greater_than_current; i<h->short_ref_count && index < h->ref_count[list]; i++) {
if(sorted_short_ref[i].reference != 3) continue;
h->default_ref_list[list][index ]= sorted_short_ref[i];
h->default_ref_list[list][index++].pic_id= sorted_short_ref[i].frame_num;
}
} else {
for(i=smallest_poc_greater_than_current; i<h->short_ref_count && index < h->ref_count[list]; i++) {
if(sorted_short_ref[i].reference != 3) continue;
swap_first_L1 |= 1;
h->default_ref_list[list][index ]= sorted_short_ref[i];
h->default_ref_list[list][index++].pic_id= sorted_short_ref[i].frame_num;
}
for(i=smallest_poc_greater_than_current-1; i>=0 && index < h->ref_count[list]; i--) {
if(sorted_short_ref[i].reference != 3) continue;
swap_first_L1 |= 2;
h->default_ref_list[list][index ]= sorted_short_ref[i];
h->default_ref_list[list][index++].pic_id= sorted_short_ref[i].frame_num;
} }
if(sorted_short_ref[j].reference != 3) continue;
h->default_ref_list[list][index ]= sorted_short_ref[j];
h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num;
} }
for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){ for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){
@ -2922,7 +2907,7 @@ static int fill_default_ref_list(H264Context *h){
h->default_ref_list[ list ][index++].pic_id= i;; h->default_ref_list[ list ][index++].pic_id= i;;
} }
if(list && (3 == swap_first_L1) && (1 < index)){ if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){
// swap the two first elements of L1 when // swap the two first elements of L1 when
// L0 and L1 are identical // L0 and L1 are identical
Picture temp= h->default_ref_list[1][0]; Picture temp= h->default_ref_list[1][0];

Write Preview
Loading…
Cancel
Save