diff options
author | Robert Kukla <roolku@rockbox.org> | 2007-10-09 20:42:20 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2007-10-09 20:42:20 +0000 |
commit | fd3fe45bc14a0a540f2525102551c92a64a73b76 (patch) | |
tree | 1ef8103bbfa5b33f684a94bddc5ecb4685ec5e88 /apps/plugins/mpegplayer/header.c | |
parent | ce135909b9393d9824b3f69a70659400480cc069 (diff) | |
download | rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.tar.gz rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.zip |
FS#7487 - mpegplayer - video start time seek with resume
by John S. Gwynne & Brian J. Morey
This should stop the patch from breaking again and give them opportunity to improve it further.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15052 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/header.c')
-rw-r--r-- | apps/plugins/mpegplayer/header.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/plugins/mpegplayer/header.c b/apps/plugins/mpegplayer/header.c index 7f94705f52..7486b0ebf0 100644 --- a/apps/plugins/mpegplayer/header.c +++ b/apps/plugins/mpegplayer/header.c | |||
@@ -58,7 +58,7 @@ static const uint8_t default_intra_quantizer_matrix[64] ICONST_ATTR = { | |||
58 | 83 | 58 | 83 |
59 | }; | 59 | }; |
60 | 60 | ||
61 | uint8_t mpeg2_scan_norm[64] IDATA_ATTR = { | 61 | uint8_t default_mpeg2_scan_norm[64] IDATA_ATTR = { |
62 | /* Zig-Zag scan pattern */ | 62 | /* Zig-Zag scan pattern */ |
63 | 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, | 63 | 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, |
64 | 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, | 64 | 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, |
@@ -66,7 +66,7 @@ uint8_t mpeg2_scan_norm[64] IDATA_ATTR = { | |||
66 | 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63 | 66 | 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63 |
67 | }; | 67 | }; |
68 | 68 | ||
69 | uint8_t mpeg2_scan_alt[64] IDATA_ATTR = { | 69 | uint8_t default_mpeg2_scan_alt[64] IDATA_ATTR = { |
70 | /* Alternate scan pattern */ | 70 | /* Alternate scan pattern */ |
71 | 0, 8, 16, 24, 1, 9, 2, 10, 17, 25, 32, 40, 48, 56, 57, 49, | 71 | 0, 8, 16, 24, 1, 9, 2, 10, 17, 25, 32, 40, 48, 56, 57, 49, |
72 | 41, 33, 26, 18, 3, 11, 4, 12, 19, 27, 34, 42, 50, 58, 35, 43, | 72 | 41, 33, 26, 18, 3, 11, 4, 12, 19, 27, 34, 42, 50, 58, 35, 43, |
@@ -74,6 +74,9 @@ uint8_t mpeg2_scan_alt[64] IDATA_ATTR = { | |||
74 | 53, 61, 22, 30, 7, 15, 23, 31, 38, 46, 54, 62, 39, 47, 55, 63 | 74 | 53, 61, 22, 30, 7, 15, 23, 31, 38, 46, 54, 62, 39, 47, 55, 63 |
75 | }; | 75 | }; |
76 | 76 | ||
77 | uint8_t mpeg2_scan_norm[64] IDATA_ATTR; | ||
78 | uint8_t mpeg2_scan_alt[64] IDATA_ATTR; | ||
79 | |||
77 | void mpeg2_header_state_init (mpeg2dec_t * mpeg2dec) | 80 | void mpeg2_header_state_init (mpeg2dec_t * mpeg2dec) |
78 | { | 81 | { |
79 | if (mpeg2dec->sequence.width != (unsigned)-1) { | 82 | if (mpeg2dec->sequence.width != (unsigned)-1) { |