r1108 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Wed Aug 31 19:50:58 UTC 2005
Author: tschmidt
Date: 2005-08-31 19:50:57 +0000 (Wed, 31 Aug 2005)
New Revision: 1108
Added:
vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch
vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch
vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch
vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
Log:
vdr: Added a few dpatches which fix some minor issues in vdr 1.3.31
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-08-31 19:21:34 UTC (rev 1107)
+++ vdr/vdr/trunk/debian/changelog 2005-08-31 19:50:57 UTC (rev 1108)
@@ -7,6 +7,12 @@
- Use --background when calling start-stop-daemon in the init-script
- Added 16_avoidTrashing.dpatch, which prevent vdr from trashing the
file system buffers when reading/writing recordings
+ - Added 18_vdr-1.3.31-remuxbraces - Fixes some gcc warning messages
+ - Added 19_vdr-1.3.31-remux - Fixes a bug in cVideo/AudioRepacker::Repack()
+ - Added 20_vdr-1.3.31-sequence-end-code5 - Fixes a problem with appending
+ a sequence end code when moving cutting marks in radio recordings
+ - Added 21_vdr-1.3.31-skipframes - Fixes a problem with skipping frames
+ when moving cutting marks in radio recordings
* Tobias Grimm <tg at e-tobi.net>
- Made debian/patchlevel.sh acccept opt-entries in 00list with leading
spaces and removed leading space from vdr-patchlevel output
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2005-08-31 19:21:34 UTC (rev 1107)
+++ vdr/vdr/trunk/debian/patches/00list 2005-08-31 19:50:57 UTC (rev 1108)
@@ -15,6 +15,10 @@
15_dvbplayer
16_avoidTrashing
17_replay
+18_vdr-1.3.31-remuxbraces
+19_vdr-1.3.31-remux
+20_vdr-1.3.31-sequence-end-code5
+21_vdr-1.3.31-skipframes
# Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
# opt-21_subtitles_and_ttxtsubs
Added: vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch 2005-08-31 19:21:34 UTC (rev 1107)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch 2005-08-31 19:50:57 UTC (rev 1108)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 18_vdr-1.3.31-remuxbraces.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes some gcc warning messages
+
+ at DPATCH@
+diff -urNad vdr-1.3.31/remux.c /tmp/dpep.7mmgBA/vdr-1.3.31/remux.c
+--- vdr-1.3.31/remux.c 2005-08-28 13:46:44.000000000 +0200
++++ /tmp/dpep.7mmgBA/vdr-1.3.31/remux.c 2005-08-31 21:24:47.644378176 +0200
+@@ -522,18 +522,22 @@
+ };
+
+ int cAudioRepacker::bitRates[2][3][16] = { // all values are specified as kbits/s
++ {
+ // MPEG 1, Layer I
+- 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1,
++ { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 },
+ // MPEG 1, Layer II
+- 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1,
++ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 },
+ // MPEG 1, Layer III
+- 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1,
++ { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 }
++ },
++ {
+ // MPEG 2, Layer I
+- 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1,
++ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 },
+ // MPEG 2, Layer II/III
+- 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1,
++ { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 },
+ // MPEG 2, Layer II/III
+- 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1
++ { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 }
++ }
+ };
+
+ cAudioRepacker::cAudioRepacker(void)
+@@ -590,16 +594,16 @@
+ else {
+ static int samplingFrequencies[2][4] = { // all values are specified in Hz
+ // MPEG 1
+- 44100, 48000, 32000, -1,
++ { 44100, 48000, 32000, -1 },
+ // MPEG 2
+- 22050, 24000, 16000, -1
++ { 22050, 24000, 16000, -1 }
+ };
+
+ static int slots_per_frame[2][3] = {
+ // MPEG 1, Layer I, II, III
+- 12, 144, 144,
++ { 12, 144, 144 },
+ // MPEG 2, Layer I, II, III
+- 12, 144, 72
++ { 12, 144, 72 }
+ };
+
+ int mpegIndex = 1 - id;
Added: vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch 2005-08-31 19:21:34 UTC (rev 1107)
+++ vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch 2005-08-31 19:50:57 UTC (rev 1108)
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 19_vdr-1.3.31-remux.dpatch by Reinhard Nissl <rnissl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes a bug in cVideo/AudioRepacker::Repack()
+
+ at DPATCH@
+diff -urNad vdr-1.3.31/remux.c /tmp/dpep.Q0kE5W/vdr-1.3.31/remux.c
+--- vdr-1.3.31/remux.c 2005-08-28 13:46:44.000000000 +0200
++++ /tmp/dpep.Q0kE5W/vdr-1.3.31/remux.c 2005-08-31 21:25:31.440720120 +0200
+@@ -142,7 +142,7 @@
+ {
+ cRepacker::Reset();
+ skippedBytes = 0;
+- packetTodo = maxPacketSize - 6 - 3;
++ packetTodo = 0;
+ fragmentLen = 0;
+ pesHeaderLen = 0;
+ pesHeaderBackupLen = 0;
+@@ -361,7 +361,7 @@
+ done++;
+ todo--;
+ // do we have to start a new packet as there is no more space left?
+- if (--packetTodo <= 0) {
++ if (state != syncing && --packetTodo <= 0) {
+ // we connot start a new packet here if the current might end in a start
+ // code and this start code shall possibly be put in the next packet. So
+ // overfill the current packet until we can safely detect that we won't
+@@ -468,6 +468,9 @@
+
+ int cVideoRepacker::BreakAt(const uchar *Data, int Count)
+ {
++ if (initiallySyncing)
++ return -1; // fill the packet buffer completely until we have synced once
++
+ int PesPayloadOffset = 0;
+
+ if (AnalyzePesHeader(Data, Count, PesPayloadOffset) <= phInvalid)
+@@ -732,7 +735,7 @@
+ done++;
+ todo--;
+ // do we have to start a new packet as there is no more space left?
+- if (--packetTodo <= 0) {
++ if (state != syncing && --packetTodo <= 0) {
+ // We connot start a new packet here if the current might end in an audio
+ // frame header and this header shall possibly be put in the next packet. So
+ // overfill the current packet until we can safely detect that we won't
+@@ -836,6 +839,9 @@
+
+ int cAudioRepacker::BreakAt(const uchar *Data, int Count)
+ {
++ if (initiallySyncing)
++ return -1; // fill the packet buffer completely until we have synced once
++
+ int PesPayloadOffset = 0;
+
+ ePesHeader MpegLevel = AnalyzePesHeader(Data, Count, PesPayloadOffset);
+@@ -1189,6 +1195,9 @@
+
+ int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
+ {
++ if (initiallySyncing)
++ return -1; // fill the packet buffer completely until we have synced once
++
+ // enough data for test?
+ if (Count < 6 + 3)
+ return -1;
Added: vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch 2005-08-31 19:21:34 UTC (rev 1107)
+++ vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch 2005-08-31 19:50:57 UTC (rev 1108)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 20_vdr-1.3.31-sequence-end-code5.dpatch by Reinhard Nissl <rnissl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes a problem when moving cutting marks in radio recordings
+
+ at DPATCH@
+diff -urNad vdr-1.3.31/dvbplayer.c /tmp/dpep.hVSHGH/vdr-1.3.31/dvbplayer.c
+--- vdr-1.3.31/dvbplayer.c 2005-08-14 12:52:45.000000000 +0200
++++ /tmp/dpep.hVSHGH/vdr-1.3.31/dvbplayer.c 2005-08-31 21:26:31.886530960 +0200
+@@ -661,7 +661,7 @@
+ if (playMode == pmPause)
+ DevicePlay();
+ // append sequence end code to get the image shown immediately with softdevices
+- if (r > 6) { // should be always true
++ if (r > 6 && (b[3] & 0xF0) == 0xE0) { // make sure to append it only to a video packet
+ b[r++] = 0x00;
+ b[r++] = 0x00;
+ b[r++] = 0x01;
Added: vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch 2005-08-31 19:21:34 UTC (rev 1107)
+++ vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch 2005-08-31 19:50:57 UTC (rev 1108)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 21_vdr-1.3.31-skipframes.dpatch by Reinhard Nissl <rnissl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes a problem when moving cutting marks in radio recordings
+
+ at DPATCH@
+diff -urNad vdr-1.3.31/dvbplayer.c /tmp/dpep.pCvmik/vdr-1.3.31/dvbplayer.c
+--- vdr-1.3.31/dvbplayer.c 2005-08-14 12:52:45.000000000 +0200
++++ /tmp/dpep.pCvmik/vdr-1.3.31/dvbplayer.c 2005-08-31 21:27:50.253617352 +0200
+@@ -621,7 +621,10 @@
+ int Current, Total;
+ GetIndex(Current, Total, true);
+ int OldCurrent = Current;
+- Current = index->GetNextIFrame(Current + Frames, Frames > 0);
++ // As GetNextIFrame() increments/decrements at least once, the
++ // destination frame (= Current + Frames) must be adjusted by
++ // -1/+1 respectively.
++ Current = index->GetNextIFrame(Current + Frames + (Frames > 0 ? -1 : 1), Frames > 0);
+ return Current >= 0 ? Current : OldCurrent;
+ }
+ return -1;
More information about the pkg-vdr-dvb-changes
mailing list