Changeset 595

Timestamp:

06/20/07 22:11:21 (1 year ago)

Author:

gbooker

Message:

Fixes for H.264 streams. Apparently, B slices don't always depend on future frames.

Also, I don't seem to have any h.264 files with out of order frames where each frame's data is stored by itself. So, I can't fully test this. Basically, I need:
1, 3, 2
instead of
132, -, -,

Anyone?

Files:

• trunk/FFusionCodec.c (modified) (1 diff)
• trunk/bitstream_info.c (modified) (10 diffs)

trunk/FFusionCodec.c

@@ -948 +948 @@
-                
-                drp->frameType = qtTypeForFrameInfo(drp->frameType, type, skippable);
-
-
+
+
+
+
+
-                Codecprintf(glob->fileLog, "began frame %d as %d:%d\n", p->frameNumber, type, skippable);
-        }

trunk/bitstream_info.c

@@ -138 +138 @@
-                acl->mChannelLayoutTag = ac3_layout_no_lfe[acmod];
-        
+        return 1;
+}
+
+static int parse_mpeg4_extra(FFusionParserContext *parser, const uint8_t *buf, int buf_size)
+{
+        ParseContext1 *pc1 = (ParseContext1 *)parser->pc->priv_data;
+        pc1->pc.frame_start_found = 0;
+        
+        MpegEncContext *s = pc1->enc;
+        GetBitContext gb1, *gb = &gb1;
+        
+        s->avctx = parser->avctx;
+        s->current_picture_ptr = &s->current_picture;
+        
+        init_get_bits(gb, buf, 8 * buf_size);
+        ff_mpeg4_decode_picture_header(s, gb);
-        return 1;
-}
@@ -208 +224 @@
-        sizeof(uint64_t),
-        NULL,
-NULL
+parse_mpeg4_extra
-        parse_mpeg4_stream,
-};
@@ -216 +232 @@
-        int is_avc;
-        int nal_length_size;
-#if 0 /*this was an attempt to figure out the PTS information and detect an out of order P frame before we hit its B frame */
-        int prevPts;
-#endif
-        
-        int poc_type;
@@ -226 +240 @@
-
-        int log2_max_poc_lsb;
-#if 0 /*this was an attempt to figure out the PTS information and detect an out of order P frame before we hit its B frame */
-        int poc_msb;
-        int prev_poc_lsb;
-#endif
-
-        int delta_pic_order_always_zero_flag;
@@ -362 +374 @@
-        GetBitContext getbit, *gb = &getbit;
-        int slice_type;
-#if 0 /*this was an attempt to figure out the PTS information and detect an out of order P frame before we hit its B frame */
-        int field_pic_flag = 0;
-        int bottom_field_flag = 0;
-        int frame_number;
-
-B
+
+P
-        
-        init_get_bits(gb, buf, 8 * buf_size);
@@ -382 +393 @@
-        if(just_type)
-                return 1;
-#if 0 /*this was an attempt to figure out the PTS information and detect an out of order P frame before we hit its B frame */
-        
-        get_ue_golomb(gb); //pic_parameter_set_id
@@ -449 +459 @@
-                *pts = expectedpoc + delta_pic_order_cnt[0];
-        }
-#endif
-        
-        return 1;
@@ -461 +470 @@
-        int buf_index = 0;
-        int ret = 0;
-1
+0
-        int lowestType = 20;
-        
@@ -557 +566 @@
-                                        if(nal_ref_idc)
-                                                *skippable = 0;
-#if 0 /*this was an attempt to figure out the PTS information and detect an out of order P frame before we hit its B frame */
-                                        if(pts_decoded == 0)
-                                        {
@@ -563 +571 @@
-                                                if(pts > context->prevPts)
-                                                {
-
-
-
-
+
+
-                                                        context->prevPts = pts;
-                                                }
-                                                else
-                                                        *precedesAPastFrame = 0;
-                                        }
-#endif
-                                }
-                        }