Fixed broken tests.

Incomplete tables not correctly returning error codes.
Fixed incorrect test data when parsing pes headers.

Author: frejoel

Makefile

@@ -62,7 +62,8 @@ tests: static $(OBJ_TESTS)
 examples: static $(OBJ_EXAMPLES)
 
 check: tests $(OBJ_TESTS)
-	find test/*.o -type f -exec "{}" \;
+	./test-runner.sh
+
 ifeq ($(COVERAGE), 1)
 	mkdir -p $(CCDIR)
 	rm -f *.gcno

src/tsdemux.c

@@ -346,7 +346,7 @@ TSDCode get_data_context(TSDemuxContext *ctx,
     }
     ctx->buffers.pool = dataCtx;
     ctx->buffers.length = len;
-    // reassign the active buffer
+    // reassign the active buffer if it was previously set
     if(active_idx >= 0) {
         ctx->buffers.active = &ctx->buffers.pool[active_idx];
     }
@@ -432,10 +432,6 @@ TSDCode tsd_parse_table(TSDemuxContext *ctx,
         section_count++;
 
         if((ptr+1) < dataCtx->write && (*(ptr+1) == 0xFF) || (0x00 == *(ptr+1))) {
-            // we found the end of the table,
-            // clear the active buffer seeing as we've finished with the table
-            ctx->buffers.active = NULL;
-
             // create and parse the sections.
             table->length = section_count;
             table->sections = (TSDTableSection*) ctx->calloc(section_count,
@@ -451,6 +447,13 @@ TSDCode tsd_parse_table(TSDemuxContext *ctx,
 
             if(res != TSD_OK) {
                 tsd_table_data_destroy(ctx, table);
+                if(res == TSD_INVALID_DATA_SIZE) {
+                    res = TSD_INCOMPLETE_TABLE;
+                }
+            } else {
+                // we found the end of the table,
+                // clear the active buffer seeing as we've finished with the table
+                ctx->buffers.active = NULL;
             }
             return res;
         }

test-runner.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+pass=0
+total=0;
+
+for fname in test/*.o; do
+    echo ======================================
+    echo running test suite: $fname
+    echo ======================================
+    ./$fname
+    rc=$?; if [[ $rc == 0 ]]; then ((pass++)); fi
+    ((total++))
+done
+
+echo
+echo ======================================
+echo $pass/$total test suites passing
+echo ======================================
+echo

test/parse_pes_header.c

@@ -57,7 +57,7 @@ void test_parse_pes_data(void)
         0x00, 0x3C, // packet length
         0b10000010, // '10', scrmabling(2), priority(1), data alignment(1), copyright(1), original or copy(1)
         0b11101011, // pts dts(2), escr(1), es rate(1), dsm trick play(1), add copy info(1), crc (1), ext (1)
-        0x34, // pes header data length
+        0x49, // pes header data length
         0b00100001, 0x00, 0x01, 0x00, 0x01, // '0010', pts 4,3,1,15,1,15,1
         0b00011001, 0x00, 0x01, 0x00, 0x01, // '0001', dts 4,3,1,15,1,15,1
         0b11000100, 0x00, 0b00000100, 0x00, 0b00000100, 0x01, // ESCR, reserved(2), 3,1,15,1,15,1 ext 9,1
@@ -114,7 +114,7 @@ void test_parse_pes_data(void)
     test_assert_equal(pes.flags & TSD_PPF_ADDITIONAL_COPY_INFO_FLAG, 0x00, "additional copy info flag");
     test_assert_equal(pes.flags & TSD_PPF_PES_CRC_FLAG, TSD_PPF_PES_CRC_FLAG, "CRC flag");
     test_assert_equal(pes.flags & TSD_PPF_PES_EXTENSION_FLAG, TSD_PPF_PES_EXTENSION_FLAG, "PES extension flag");
-    test_assert_equal(pes.header_data_length, 0x34, "header data length");
+    test_assert_equal(pes.header_data_length, 0x49, "header data length");
     test_assert_equal(pes.pts, 0x00000000, "pts");
     test_assert_equal(pes.dts, 0x00000000, "dts");
     test_assert_equal(pes.escr, 0x00000000, "escr");

test/parse_table.c

@@ -258,6 +258,7 @@ void test_parse_multi_packet_table(void)
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         // +46 bytes
+        // The section_length says there is more data to this table
     };
 
     uint8_t tableData2[] = {