Merge commit 'e9e5a1bd'

* commit 'e9e5a1bd':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
	libavcodec/h264_parser.c
	tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h264.c

@@ -2694,11 +2694,10 @@ static void flush_dpb(AVCodecContext *avctx)
     h->parse_context.last_index        = 0;
 }
 
-static int init_poc(H264Context *h)
+int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc)
 {
     const int max_frame_num = 1 << h->sps.log2_max_frame_num;
     int field_poc[2];
-    Picture *cur = h->cur_pic_ptr;
 
     h->frame_num_offset = h->prev_frame_num_offset;
     if (h->frame_num < h->prev_frame_num)
@@ -2763,10 +2762,11 @@ static int init_poc(H264Context *h)
     }
 
     if (h->picture_structure != PICT_BOTTOM_FIELD)
-        h->cur_pic_ptr->field_poc[0] = field_poc[0];
+        pic_field_poc[0] = field_poc[0];
     if (h->picture_structure != PICT_TOP_FIELD)
-        h->cur_pic_ptr->field_poc[1] = field_poc[1];
-    cur->poc = FFMIN(cur->field_poc[0], cur->field_poc[1]);
+        pic_field_poc[1] = field_poc[1];
+    if (pic_poc)
+        *pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]);
 
     return 0;
 }
@@ -3650,7 +3650,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
             h->delta_poc[1] = get_se_golomb(&h->gb);
     }
 
-    init_poc(h);
+    ff_init_poc(h, h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc);
 
     if (h->pps.redundant_pic_cnt_present)
         h->redundant_pic_count = get_ue_golomb(&h->gb);

libavcodec/h264.h

@@ -976,5 +976,6 @@ static av_always_inline int get_dct8x8_allowed(H264Context *h)
 }
 
 void ff_h264_draw_horiz_band(H264Context *h, int y, int height);
+int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc);
 
 #endif /* AVCODEC_H264_H */

libavcodec/h264_parser.c

@@ -150,10 +150,12 @@ static inline int parse_nal_units(AVCodecParserContext *s,
     int state = -1;
     const uint8_t *ptr;
     int q264 = buf_size >=4 && !memcmp("Q264", buf, 4);
+    int field_poc[2];
 
     /* set some sane default values */
     s->pict_type = AV_PICTURE_TYPE_I;
     s->key_frame = 0;
+    s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN;
 
     h->avctx= avctx;
     h->sei_recovery_frame_cnt = -1;
@@ -209,6 +211,11 @@ static inline int parse_nal_units(AVCodecParserContext *s,
             break;
         case NAL_IDR_SLICE:
             s->key_frame = 1;
+
+            h->prev_frame_num        = 0;
+            h->prev_frame_num_offset = 0;
+            h->prev_poc_msb          =
+            h->prev_poc_lsb          = 0;
             /* fall through */
         case NAL_SLICE:
             get_ue_golomb_long(&h->gb);  // skip first_mb_in_slice
@@ -248,6 +255,24 @@ static inline int parse_nal_units(AVCodecParserContext *s,
                 }
             }
 
+            if (h->nal_unit_type == NAL_IDR_SLICE)
+                get_ue_golomb(&h->gb); /* idr_pic_id */
+            if (h->sps.poc_type == 0) {
+                h->poc_lsb = get_bits(&h->gb, h->sps.log2_max_poc_lsb);
+
+                if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME)
+                    h->delta_poc_bottom = get_se_golomb(&h->gb);
+            }
+
+            if (h->sps.poc_type == 1 && !h->sps.delta_pic_order_always_zero_flag) {
+                h->delta_poc[0] = get_se_golomb(&h->gb);
+
+                if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME)
+                    h->delta_poc[1] = get_se_golomb(&h->gb);
+            }
+
+            ff_init_poc(h, field_poc, NULL);
+
             if(h->sps.pic_struct_present_flag) {
                 switch (h->sei_pic_struct) {
                     case SEI_PIC_STRUCT_TOP_FIELD:
@@ -277,6 +302,38 @@ static inline int parse_nal_units(AVCodecParserContext *s,
                 s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
             }
 
+            if (h->picture_structure == PICT_FRAME) {
+                s->picture_structure = AV_PICTURE_STRUCTURE_FRAME;
+                if (h->sps.pic_struct_present_flag) {
+                    switch (h->sei_pic_struct) {
+                        case SEI_PIC_STRUCT_TOP_BOTTOM:
+                        case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
+                            s->field_order = AV_FIELD_TT;
+                            break;
+                        case SEI_PIC_STRUCT_BOTTOM_TOP:
+                        case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
+                            s->field_order = AV_FIELD_BB;
+                            break;
+                        default:
+                            s->field_order = AV_FIELD_PROGRESSIVE;
+                            break;
+                    }
+                } else {
+                    if (field_poc[0] < field_poc[1])
+                        s->field_order = AV_FIELD_TT;
+                    else if (field_poc[0] > field_poc[1])
+                        s->field_order = AV_FIELD_BB;
+                    else
+                        s->field_order = AV_FIELD_PROGRESSIVE;
+                }
+            } else {
+                if (h->picture_structure == PICT_TOP_FIELD)
+                    s->picture_structure = AV_PICTURE_STRUCTURE_TOP_FIELD;
+                else
+                    s->picture_structure = AV_PICTURE_STRUCTURE_BOTTOM_FIELD;
+                s->field_order = AV_FIELD_UNKNOWN;
+            }
+
             return 0; /* no need to evaluate the rest */
         }
         buf += h->is_avc ? nalsize : consumed;

tests/Makefile

@@ -100,6 +100,7 @@ include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
 include $(SRC_PATH)/tests/fate/microsoft.mak
+include $(SRC_PATH)/tests/fate/monkeysaudio.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
 include $(SRC_PATH)/tests/fate/mpc.mak
 include $(SRC_PATH)/tests/fate/pcm.mak

tests/fate/lossless-audio.mak

@@ -4,9 +4,6 @@ fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le
 FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio
 fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
 
-FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio
-fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
-
 FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, RM, RALF) += fate-ralf
 fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le
 

tests/fate/monkeysaudio.mak

+APE_VERSIONS = 380 388 389b1 391b1 392b2 394b1
+
+define FATE_APE_SUITE
+FATE_APE += fate-lossless-monkeysaudio-$(1)-normal
+fate-lossless-monkeysaudio-$(1)-normal: CMD = crc -i $(SAMPLES)/lossless-audio/luckynight-mac$(1)-c2000.ape -af atrim=end_sample=73728
+fate-lossless-monkeysaudio-$(1)-normal: REF = CRC=0x5d08c17e
+fate-lossless-monkeysaudio-$(1)-normal: CMP = oneline
+FATE_APE += fate-lossless-monkeysaudio-$(1)-extrahigh
+fate-lossless-monkeysaudio-$(1)-extrahigh: CMD = crc -i $(SAMPLES)/lossless-audio/luckynight-mac$(1)-c4000.ape -af atrim=end_sample=73728
+fate-lossless-monkeysaudio-$(1)-extrahigh: REF = CRC=0x5d08c17e
+fate-lossless-monkeysaudio-$(1)-extrahigh: CMP = oneline
+endef
+
+$(foreach N,$(APE_VERSIONS),$(eval $(call FATE_APE_SUITE,$(N))))
+
+FATE_APE += fate-lossless-monkeysaudio-399
+fate-lossless-monkeysaudio-399: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, APE, APE) += $(FATE_APE)
+fate-lossless-monkeysaudio: $(FATE_APE)