Created attachment 70423 [details] [review]
fixes

2006-08-07  Alessandro Decina <alessandro@nnva.org>

	* ext/annodex/gstcmmlenc.c (gst_cmml_enc_parse_tag_clip),
	(gst_cmml_enc_push_clip): Check if clip->start_time is valid before
	adding the clip to the track list.
	(gst_cmml_enc_change_state): Reset enc->preamble going from PAUSED to READY.

	* ext/annodex/gstcmmlutils.c (gst_cmml_clock_time_from_npt): Parse the
	seconds field of the npt-sec time format using %llu rather than %d and check
	that the value scaled by GST_SECOND doesn't overflow.
	(gst_cmml_clock_time_to_granule): Use guint64(s) to represent the keyindex and
	keyoffset fields of a granulepos.
	(gst_cmml_track_list_has_clip): Lookup a clip's track with clip->track rather
	than clip->id which makes no sense.
	Identify a clip by its track and start time and not its xml id.

Created attachment 70425 [details] [review]
tests

With the both patches applied, the test fails like this:

Running suite(s): cmmldec
100%: Checks: 6, Failures: 0, Errors: 0
PASS: elements/cmmldec
Running suite(s): cmmlenc0:00:00.276794000 30131 0x8050a08 ERROR              cmmlenc gstcmmlenc.c:513:gst_cmml_enc_parse_tag_clip:<cmmlenc> previous clip start time > current clip (clip-2) start time

80%: Checks: 5, Failures: 1, Errors: 0
elements/cmmlenc.c:420:F:general:test_time_limits: 'flow' (GST_FLOW_ERROR) is not equal to 'GST_FLOW_OK' (GST_FLOW_OK)
FAIL: elements/cmmlenc

Created attachment 71548 [details] [review]
fixes

I should really remember to test my code on x86.
Looks like ((guint64) 1 << 64) is undefined but it gives the correct value with gcc on linux-ppc32. This is fixed now.

Created attachment 71550 [details] [review]
tests

Fixed in CVS.

I did some small changes to the cmmlenc element, mainly wrong usage of GST_FLOW_UNEXPECTED and posting an ERROR message when we did not generate the error.

        Patch by: Alessandro Decina <alessandro at nnva dot org>

        * ext/annodex/gstannodex.c: (gst_annodex_granule_to_time):
        Do some extra sanity checks.
        Fixes #350340.

        * ext/annodex/gstcmmlenc.c: (gst_cmml_enc_change_state),
        (gst_cmml_enc_parse_tag_head), (gst_cmml_enc_parse_tag_clip),
        (gst_cmml_enc_push_clip), (gst_cmml_enc_push):
        Check if clip->start_time is valid before adding the clip to the
        track list.
        Reset enc->preamble going from PAUSED to READY.
        Don't use GST_FLOW_UNEXPECTED for wrong usage of the element, it is
        only used for EOS.
        Only post an error message if we were the one that created the fatal
        GstFlowReturn value.

        * ext/annodex/gstcmmlutils.c: (gst_cmml_clock_time_from_npt),
        (gst_cmml_clock_time_to_granule), (gst_cmml_track_list_has_clip):
        Parse the seconds field of the npt-sec time format using %llu rather than
        %d and check that the value scaled by GST_SECOND doesn't overflow.
        Use guint64(s) to represent the keyindex and keyoffset fields of a granulepos.
        Lookup a clip's track with clip->track rather than clip->id which
        makes no sense.
        Identify a clip by its track and start time and not its xml id.
        do some more input checking and make sure we don't do undefined shifts.

        * tests/check/elements/cmmldec.c: (setup_cmmldec),
        (teardown_cmmldec), (check_output_buffer_is_equal), (push_data),
        (cmml_tag_message_pop), (check_headers), (push_clip_full),
        (push_clip), (push_empty_clip), (check_output_clip),
        (GST_START_TEST), (cmmldec_suite):
        * tests/check/elements/cmmlenc.c: (setup_cmmlenc),
        (teardown_cmmlenc), (check_output_buffer_is_equal), (push_data),
        (check_headers), (push_clip), (check_clip_times), (check_clip),
        (check_empty_clip), (GST_START_TEST), (cmmlenc_suite):
        Added some more checks.