Mercurial > pt1.oyama
changeset 184:dc0d3addfd18
Fix a bug that failed to DLNA streaming. cosmetic changes.
| author | Naoya OYAMA <naoya.oyama@gmail.com> |
|---|---|
| date | Fri, 09 May 2014 21:30:46 +0900 |
| parents | 27e5f99f8991 |
| children | 7a0f498af035 |
| files | src/recpt1.c src/tssplitter_lite.c src/tssplitter_lite.h |
| diffstat | 3 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/recpt1.c Mon May 05 22:08:21 2014 +0900 +++ b/src/recpt1.c Fri May 09 21:30:46 2014 +0900 @@ -628,17 +628,17 @@ } /* $BJ,N%BP>]0J30$r$U$k$$Mn$H$9(B */ code = split_ts(data->splitter, &buf, &splitbuf); - if(code == TSS_NULL) { + if(code == TSS_NULL) { fprintf(stderr, "PMT reading..\n"); } else if(code != TSS_SUCCESS) { fprintf(stderr, "split_ts failed\n"); break; - } + } break; } /* while */ - buf.size = splitbuf.buffer_size; + buf.size = splitbuf.buffer_filled; buf.data = splitbuf.buffer; fin: pthread_mutex_unlock(&data->splitter_mutex);
--- a/src/tssplitter_lite.c Mon May 05 22:08:21 2014 +0900 +++ b/src/tssplitter_lite.c Fri May 09 21:30:46 2014 +0900 @@ -394,12 +394,6 @@ static int AnalyzePat(splitter *sp, unsigned char *buf) #if 0 splitter *sp - unsigned char** pat, // [out] PAT 情報（再構築後） - unsigned char* pids, // [out] 出力対象 PID 情報 - char** sid_list, // [in] 出力対象サービス ID のリスト - unsigned char* pmt_pids, // [out] サービス ID に対応する PMT の PID - int* pmt_retain // [out] 残すPMTの数 - unsigned char* buf, // [in] 読み込んだバッファ #endif {
--- a/src/tssplitter_lite.h Mon May 05 22:08:21 2014 +0900 +++ b/src/tssplitter_lite.h Fri May 09 21:30:46 2014 +0900 @@ -60,8 +60,8 @@ int num_pmts; uint16_t section_remain[MAX_PID]; // セクション残りバイト数 uint8_t packet_seq[MAX_PID]; // 巡回カウンタ - int split_select_finish; time_t split_start_time; + int split_select_finish; } splitter; typedef struct _splitbuf_t