Changeset 749

Timestamp:

11/30/07 17:44:48 (9 months ago)

Author:

astrange

Message:

FFusionCodec.c: Fail harder in preflight.
bitstream_info.c: Fix typo in SPS parser.

Files:

• branches/perian-1.1/FFusionCodec.c (modified) (3 diffs)
• branches/perian-1.1/bitstream_info.c (modified) (1 diff)

branches/perian-1.1/FFusionCodec.c

@@ -677 +677 @@
-                // specifically PAFF + spatial prediction
-                if (codecID == CODEC_ID_H264 && ffusionIsParsedVideoInterlaced(glob->begin.parser))
-return -2
+goto error
-                
-                // some hooks into ffmpeg's buffer allocation to get frames in 
@@ -694 +694 @@
-            Codecprintf(glob->fileLog, "Error opening avcodec!\n");
-            
-return -2
+goto error
-        }
-                
@@ -774 +774 @@
-    
-    return noErr;
+        
+error:
+        HLock(glob->pixelTypes);
+    pos = *((OSType **)glob->pixelTypes);
+        *pos = 0;
+        p->wantedDestinationPixelTypes = (OSType **)glob->pixelTypes;
+        HUnlock(glob->pixelTypes);
+        
+        return -2;
-}
-

branches/perian-1.1/bitstream_info.c

@@ -354 +354 @@
-                for(i=0; i<context->num_ref_frames_in_pic_order_cnt_cycle; i++)
-                        context->sum_of_offset_for_ref_frames += get_se_golomb(gb); //offset_for_ref_frame[i]
-       get_ue_golomb(gb);      //num_ref_frames
-       get_bits1(gb);          //gaps_in_frame_num_value_allowed_flag
-       get_ue_golomb(gb);      //pic_width_in_mbs_minus1
-       get_ue_golomb(gb);      //pic_height_in_map_unit
-       context->frame_mbs_only_flag = get_bits1(gb);
-}
+}
+get_ue_golomb(gb);     //num_ref_frames
+get_bits1(gb);         //gaps_in_frame_num_value_allowed_flag
+get_ue_golomb(gb);     //pic_width_in_mb
+get_ue_golomb(gb);     //pic_height_in_map_units_minus1
+context->frame_mbs_only_flag = get_bits1(gb);
-}
-