[libdvbpsi-devel] [Git][videolan/libdvbpsi][branch/1.3.0-bugfix] 3 commits: dr_56.c: fix generation of descriptors with multiple teletext pages.

[Jean-Paul Saman]

Jean-Paul Saman pushed to branch branch/1.3.0-bugfix at videolan / libdvbpsi


Commits:
efbd8f15 by Jean-Paul Saman at 2017-10-16T11:05:39+02:00
dr_56.c: fix generation of descriptors with multiple teletext pages.

- - - - -
084d4306 by Jean-Paul Saman at 2017-10-16T11:06:52+02:00
NEWS: update

- - - - -
25707240 by Jean-Paul Saman at 2017-10-16T11:07:35+02:00
Bump version 1.3.2

- - - - -


5 changed files:

- NEWS
- configure.ac
- doc/doxygen.cfg
- libdvbpsi.spec.in
- src/descriptors/dr_56.c


Changes:

=====================================
NEWS
=====================================
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes between 1.3.1 and 1.3.2:
 
  * Fix bug in dvbpsi_decoder_psi_section_add() set i_last_section_number
  * Fix bug in descriptor 0x8a that prevented it from being parsed properly
+ * Fix bug in descriptor 0x56 generation with multiple teletext page entries
 
 Changes between 1.3.0 and 1.3.1:
 --------------------------------


=====================================
configure.ac
=====================================
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libdvbpsi], [1.3.1])
+AC_INIT([libdvbpsi], [1.3.2])
 
 AC_PREREQ([2.50])
 AC_CONFIG_AUX_DIR([.auto])


=====================================
doc/doxygen.cfg
=====================================
--- a/doc/doxygen.cfg
+++ b/doc/doxygen.cfg
@@ -38,7 +38,7 @@ PROJECT_NAME           = libdvbpsi
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.3.1
+PROJECT_NUMBER         = 1.3.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a


=====================================
libdvbpsi.spec.in
=====================================
--- a/libdvbpsi.spec.in
+++ b/libdvbpsi.spec.in
@@ -78,6 +78,9 @@ rm -rf %buildroot
 %{_includedir}/*
 
 %changelog
+* Mon Oct 16 2017 Jean-Paul Saman <jpsaman at videolan.org - 1.3.2
+- bugfixes
+
 * Tue Feb 7 2017 Jean-Paul Saman <jpsaman at videolan.org - 1.3.1
 - bugfixes
 


=====================================
src/descriptors/dr_56.c
=====================================
--- a/src/descriptors/dr_56.c
+++ b/src/descriptors/dr_56.c
@@ -112,15 +112,15 @@ dvbpsi_descriptor_t * dvbpsi_GenTeletextDr(dvbpsi_teletext_dr_t * p_decoded,
     /* Encode data */
     for (int i = 0; i < p_decoded->i_pages_number; i++ )
     {
-        memcpy( p_descriptor->p_data + 8 * i,
+        memcpy( p_descriptor->p_data + 5 * i,
                 p_decoded->p_pages[i].i_iso6392_language_code,
                 3);
 
-        p_descriptor->p_data[8 * i + 3] =
+        p_descriptor->p_data[5 * i + 3] =
                 (uint8_t) ( ( (uint8_t) p_decoded->p_pages[i].i_teletext_type << 3 ) |
                             ( (uint8_t) p_decoded->p_pages[i].i_teletext_magazine_number & 0x07 ) );
 
-        p_descriptor->p_data[8 * i + 4] =
+        p_descriptor->p_data[5 * i + 4] =
                 p_decoded->p_pages[i].i_teletext_page_number;
     }
 



View it on GitLab: https://code.videolan.org/videolan/libdvbpsi/compare/fe4f067db5d27d6628c485fcead592900ef48617...2570724002c52dc8b15fccafe7fbcb54c29b04b3

---
View it on GitLab: https://code.videolan.org/videolan/libdvbpsi/compare/fe4f067db5d27d6628c485fcead592900ef48617...2570724002c52dc8b15fccafe7fbcb54c29b04b3
You're receiving this email because of your account on code.videolan.org.