diff options
| author | schmirl <schmirl> | 2009-06-30 06:03:15 +0000 |
|---|---|---|
| committer | schmirl <schmirl> | 2009-06-30 06:03:15 +0000 |
| commit | abb8e8003352454aee644952a98c55d4a64af303 (patch) | |
| tree | d3d44fabecd19fa4c7a37d4b6df554f8e44c46ac /remux/ts2pes.c | |
| parent | 412c6982b6deba6089cc729704bebab784ef3313 (diff) | |
| download | vdr-plugin-streamdev-abb8e8003352454aee644952a98c55d4a64af303.tar.gz vdr-plugin-streamdev-abb8e8003352454aee644952a98c55d4a64af303.tar.bz2 | |
now there's a common baseclass for all remuxers, make use of it
Modified Files:
Tag: v0_4
HISTORY remux/ts2pes.c remux/ts2pes.h remux/tsremux.h
server/livestreamer.c server/livestreamer.h
Diffstat (limited to 'remux/ts2pes.c')
| -rw-r--r-- | remux/ts2pes.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/remux/ts2pes.c b/remux/ts2pes.c index 036fdec..e25d83e 100644 --- a/remux/ts2pes.c +++ b/remux/ts2pes.c @@ -10,7 +10,7 @@ * The cRepacker family's code was originally written by Reinhard Nissl <rnissl@gmx.de>, * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de. * - * $Id: ts2pes.c,v 1.1.2.2 2009/06/29 06:25:28 schmirl Exp $ + * $Id: ts2pes.c,v 1.1.2.3 2009/06/30 06:03:16 schmirl Exp $ */ #include "remux/ts2pes.h" @@ -1907,7 +1907,7 @@ int cTS2PESRemux::Put(const uchar *Data, int Count) return used; } -uchar *cTS2PESRemux::Get(int &Count, uchar *PictureType) +uchar *cTS2PESRemux::Get(int &Count) { // Remove any previously skipped data from the result buffer: @@ -1916,18 +1916,8 @@ uchar *cTS2PESRemux::Get(int &Count, uchar *PictureType) resultSkipped = 0; } -#if 0 - // Test recording without determining the real frame borders: - if (PictureType) - *PictureType = I_FRAME; - return resultBuffer->Get(Count); -#endif - // Check for frame borders: - if (PictureType) - *PictureType = NO_PICTURE; - Count = 0; uchar *resultData = NULL; int resultCount = 0; @@ -1948,8 +1938,6 @@ uchar *cTS2PESRemux::Get(int &Count, uchar *PictureType) } else if (!synced) { if (pt == I_FRAME) { - if (PictureType) - *PictureType = pt; resultSkipped = i; // will drop everything before this position cTSRemux::SetBrokenLink(data + i, l); synced = true; @@ -1957,8 +1945,6 @@ uchar *cTS2PESRemux::Get(int &Count, uchar *PictureType) } else if (Count) return resultData; - else if (PictureType) - *PictureType = pt; } } else { //if (AUDIO_STREAM_S <= StreamType && StreamType <= AUDIO_STREAM_E || StreamType == PRIVATE_STREAM1) { @@ -1967,15 +1953,11 @@ uchar *cTS2PESRemux::Get(int &Count, uchar *PictureType) return resultData; if (noVideo) { if (!synced) { - if (PictureType) - *PictureType = I_FRAME; resultSkipped = i; // will drop everything before this position synced = true; } else if (Count) return resultData; - else if (PictureType) - *PictureType = I_FRAME; } } if (synced) { |