diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | pat.c | 4 | ||||
| -rw-r--r-- | remux.c | 36 |
4 files changed, 25 insertions, 23 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 027a99bf..5f88d74f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2958,7 +2958,7 @@ Oliver Schinagl <oliver@schinagl.nl> for a patch that was used to implement the setup options "OSD/Color key [0123]" Andrey Pridvorov <ua0lnj@bk.ru> - for reporting a problem with detecting frames in MPEG 4 video, and pointing towards + for reporting a problem with detecting frames in H.264 video, and pointing towards a better way of doing it Jens Vogel <jens.vogel@akjv.de> @@ -2972,6 +2972,7 @@ Sören Moch <smoch@web.de> for fixing sorting folders before recordings in case of UTF-8 for reporting that cCuttingThread::GetPendingPackets() should get only non-video packets + for pointing out that the name H264 should be used instead of MPEG4 Peter Münster <pmlists@free.fr> for fixing 'make install' to not overwrite existing configuration files @@ -7245,7 +7245,7 @@ Video Disk Recorder Revision History - Decreased the ring buffer put/get trigger sizes from 1/3 to 1/10. - The script given to VDR with the '-r' option is now also called whenever a recording is deleted (thanks to Alexander Wenzel). -- Improved detecting frames in MPEG 4 video (reported by Andrey Pridvorov). +- Improved detecting frames in H.264 video (reported by Andrey Pridvorov). - cPatPmtParser::ParsePmt() now also recognizes stream type 0x81 as "AC3", so that recordings that have been converted from the old PES format to TS can be played (suggested by Jens Vogel). @@ -7305,7 +7305,7 @@ Video Disk Recorder Revision History Sundararaj Reel). - Fixed handling timers in case an event is modified and "phased out" while the timer is recording. -- Improved frame detection by parsing just far enough into the MPEG-4 NAL units to get +- Improved frame detection by parsing just far enough into the H.264 NAL units to get the necessary information about frames and slices. - The initial syncing of the frame detector is now done immediately after the first complete GOP has been seen. This makes recordings and especially pausing live video @@ -7348,3 +7348,4 @@ Video Disk Recorder Revision History - Updated the Macedonian OSD texts (thanks to Dimitar Petrovski). - Fixed getting only non-video packets in cCuttingThread::GetPendingPackets() (reported by Sören Moch). +- Changed all occurrences of MPEG4 to H264 (pointed out by Sören Moch). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: pat.c 2.18 2012/04/15 09:54:53 kls Exp $ + * $Id: pat.c 2.19 2012/11/25 14:12:21 kls Exp $ */ #include "pat.h" @@ -352,7 +352,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length switch (stream.getStreamType()) { case 1: // STREAMTYPE_11172_VIDEO case 2: // STREAMTYPE_13818_VIDEO - case 0x1B: // MPEG4 + case 0x1B: // H.264 Vpid = esPid; Ppid = pmt.getPCRPid(); Vtype = stream.getStreamType(); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: remux.c 2.72 2012/11/19 10:23:42 kls Exp $ + * $Id: remux.c 2.73 2012/11/25 14:16:11 kls Exp $ */ #include "remux.h" @@ -676,7 +676,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length) switch (stream.getStreamType()) { case 0x01: // STREAMTYPE_11172_VIDEO case 0x02: // STREAMTYPE_13818_VIDEO - case 0x1B: // MPEG4 + case 0x1B: // H.264 vpid = stream.getPid(); vtype = stream.getStreamType(); ppid = Pmt.getPCRPid(); @@ -1110,9 +1110,9 @@ int cMpeg2Parser::Parse(const uchar *Data, int Length, int Pid) return tsPayload.Used(); } -// --- cMpeg4Parser ---------------------------------------------------------- +// --- cH264Parser ----------------------------------------------------------- -class cMpeg4Parser : public cFrameParser { +class cH264Parser : public cFrameParser { private: enum eNalUnitType { nutCodedSliceNonIdr = 1, @@ -1144,14 +1144,14 @@ private: void ParseSequenceParameterSet(void); void ParseSliceHeader(void); public: - cMpeg4Parser(void); - ///< Sets up a new MPEG-4 parser. + cH264Parser(void); + ///< Sets up a new H.264 parser. ///< This class parses only the data absolutely necessary to determine the ///< frame borders and field count of the given H264 material. virtual int Parse(const uchar *Data, int Length, int Pid); }; -cMpeg4Parser::cMpeg4Parser(void) +cH264Parser::cH264Parser(void) { byte = 0; bit = -1; @@ -1164,7 +1164,7 @@ cMpeg4Parser::cMpeg4Parser(void) gotSequenceParameterSet = false; } -uchar cMpeg4Parser::GetByte(bool Raw) +uchar cH264Parser::GetByte(bool Raw) { uchar b = tsPayload.GetByte(); if (!Raw) { @@ -1183,7 +1183,7 @@ uchar cMpeg4Parser::GetByte(bool Raw) return b; } -uchar cMpeg4Parser::GetBit(void) +uchar cH264Parser::GetBit(void) { if (bit < 0) { byte = GetByte(); @@ -1192,7 +1192,7 @@ uchar cMpeg4Parser::GetBit(void) return (byte & (1 << bit--)) ? 1 : 0; } -uint32_t cMpeg4Parser::GetBits(int Bits) +uint32_t cH264Parser::GetBits(int Bits) { uint32_t b = 0; while (Bits--) @@ -1200,7 +1200,7 @@ uint32_t cMpeg4Parser::GetBits(int Bits) return b; } -uint32_t cMpeg4Parser::GetGolombUe(void) +uint32_t cH264Parser::GetGolombUe(void) { int z = -1; for (int b = 0; !b; z++) @@ -1208,7 +1208,7 @@ uint32_t cMpeg4Parser::GetGolombUe(void) return (1 << z) - 1 + GetBits(z); } -int32_t cMpeg4Parser::GetGolombSe(void) +int32_t cH264Parser::GetGolombSe(void) { uint32_t v = GetGolombUe(); if (v) { @@ -1220,7 +1220,7 @@ int32_t cMpeg4Parser::GetGolombSe(void) return v; } -int cMpeg4Parser::Parse(const uchar *Data, int Length, int Pid) +int cH264Parser::Parse(const uchar *Data, int Length, int Pid) { newFrame = independentFrame = false; tsPayload.Setup(const_cast<uchar *>(Data), Length, Pid); @@ -1260,14 +1260,14 @@ int cMpeg4Parser::Parse(const uchar *Data, int Length, int Pid) return tsPayload.Used(); } -void cMpeg4Parser::ParseAccessUnitDelimiter(void) +void cH264Parser::ParseAccessUnitDelimiter(void) { if (debug && gotSequenceParameterSet) dbgframes("A"); GetByte(); // primary_pic_type } -void cMpeg4Parser::ParseSequenceParameterSet(void) +void cH264Parser::ParseSequenceParameterSet(void) { uchar profile_idc = GetByte(); // profile_idc GetByte(); // constraint_set[0-5]_flags, reserved_zero_2bits @@ -1319,7 +1319,7 @@ void cMpeg4Parser::ParseSequenceParameterSet(void) } } -void cMpeg4Parser::ParseSliceHeader(void) +void cH264Parser::ParseSliceHeader(void) { newFrame = true; GetGolombUe(); // first_mb_in_slice @@ -1369,13 +1369,13 @@ void cFrameDetector::SetPid(int Pid, int Type) { pid = Pid; type = Type; - isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or 4 + isVideo = type == 0x01 || type == 0x02 || type == 0x1B; // MPEG 1, 2 or H.264 delete parser; parser = NULL; if (type == 0x01 || type == 0x02) parser = new cMpeg2Parser; else if (type == 0x1B) - parser = new cMpeg4Parser; + parser = new cH264Parser; else if (type == 0x04 || type == 0x06) // MPEG audio or AC3 audio parser = new cAudioParser; else if (type != 0) |