[vlc-commits] bluray: use defines for still image boundaries

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon May  7 
13:52:54 2018 +0200| [7cb68e46fc1e2d934b1f0a0e0754b2f2b2d488dd] | committer: 
Francois Cartegnie

bluray: use defines for still image boundaries

(cherry picked from commit 24d43feca0c291f4073fd128ce67a78cf0b04ec4)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7cb68e46fc1e2d934b1f0a0e0754b2f2b2d488dd
---

 modules/access/bluray.c | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index f39115d352..16b3af1234 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -285,6 +285,10 @@ static void  notifyDiscontinuity( demux_sys_t *p_sys );
 
 #define FROM_TICKS(a) ((a)*CLOCK_FREQ / INT64_C(9))
 #define TO_TICKS(a)   ((a)*INT64_C(9)/CLOCK_FREQ)
+
+#define STILL_IMAGE_NOT_SET0
+#define STILL_IMAGE_INFINITE  -1
+
 #define CURRENT_TITLE p_sys->pp_title[p_demux->info.i_title]
 #define CUR_LENGTHCURRENT_TITLE->i_length
 
@@ -667,7 +671,7 @@ static int blurayOpen(vlc_object_t *object)
 p_sys->i_audio_stream_idx = -1;
 p_sys->i_spu_stream_idx = -1;
 p_sys->i_video_stream = -1;
-p_sys->i_still_end_time = 0;
+p_sys->i_still_end_time = STILL_IMAGE_NOT_SET;
 
 /* init demux info fields */
 p_demux->info.i_update= 0;
@@ -2160,8 +2164,8 @@ static void blurayResetStillImage( demux_t *p_demux )
 {
 demux_sys_t *p_sys = p_demux->p_sys;
 
-if (p_sys->i_still_end_time) {
-p_sys->i_still_end_time = 0;
+if (p_sys->i_still_end_time != STILL_IMAGE_NOT_SET) {
+p_sys->i_still_end_time = STILL_IMAGE_NOT_SET;
 
 blurayResetParser(p_demux);
 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
@@ -2173,7 +2177,9 @@ static void blurayStillImage( demux_t *p_demux, unsigned 
i_timeout )
 demux_sys_t *p_sys = p_demux->p_sys;
 
 /* time period elapsed ? */
-if (p_sys->i_still_end_time > 0 && p_sys->i_still_end_time <= mdate()) {
+if (p_sys->i_still_end_time != STILL_IMAGE_NOT_SET &&
+p_sys->i_still_end_time != STILL_IMAGE_INFINITE &&
+p_sys->i_still_end_time <= mdate()) {
 msg_Dbg(p_demux, "Still image end");
 bd_read_skip_still(p_sys->bluray);
 
@@ -2182,13 +2188,13 @@ static void blurayStillImage( demux_t *p_demux, 
unsigned i_timeout )
 }
 
 /* show last frame as still image */
-if (!p_sys->i_still_end_time) {
+if (p_sys->i_still_end_time == STILL_IMAGE_NOT_SET) {
 if (i_timeout) {
 msg_Dbg(p_demux, "Still image (%d seconds)", i_timeout);
 p_sys->i_still_end_time = mdate() + i_timeout * CLOCK_FREQ;
 } else {
 msg_Dbg(p_demux, "Still image (infinite)");
-p_sys->i_still_end_time = -1;
+p_sys->i_still_end_time = STILL_IMAGE_INFINITE;
 }
 
 /* flush demuxer and decoder (there won't be next video packet 
starting with ts PUSI) */

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] bluray: use defines for still image boundaries

[Steve Lhomme]

vlc | branch: master | Steve Lhomme  | Mon May  7 13:52:54 
2018 +0200| [24d43feca0c291f4073fd128ce67a78cf0b04ec4] | committer: Steve Lhomme

bluray: use defines for still image boundaries

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24d43feca0c291f4073fd128ce67a78cf0b04ec4
---

 modules/access/bluray.c | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index dc032e2479..5016f3d538 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -287,6 +287,9 @@ static void  onMouseEvent(const vlc_mouse_t *mouse, void 
*user_data);
 static void  blurayResetParser(demux_t *p_demux);
 static void  notifyDiscontinuity( demux_sys_t *p_sys );
 
+#define STILL_IMAGE_NOT_SET0
+#define STILL_IMAGE_INFINITE  -1
+
 #define CURRENT_TITLE p_sys->pp_title[p_sys->cur_title]
 #define CUR_LENGTHCURRENT_TITLE->i_length
 
@@ -677,7 +680,7 @@ static int blurayOpen(vlc_object_t *object)
 p_sys->i_audio_stream_idx = -1;
 p_sys->i_spu_stream_idx = -1;
 p_sys->i_video_stream = -1;
-p_sys->i_still_end_time = 0;
+p_sys->i_still_end_time = STILL_IMAGE_NOT_SET;
 
 /* init demux info fields */
 p_sys->updates = 0;
@@ -2194,8 +2197,8 @@ static void blurayResetStillImage( demux_t *p_demux )
 {
 demux_sys_t *p_sys = p_demux->p_sys;
 
-if (p_sys->i_still_end_time) {
-p_sys->i_still_end_time = 0;
+if (p_sys->i_still_end_time != STILL_IMAGE_NOT_SET) {
+p_sys->i_still_end_time = STILL_IMAGE_NOT_SET;
 
 blurayResetParser(p_demux);
 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
@@ -2207,7 +2210,9 @@ static void blurayStillImage( demux_t *p_demux, unsigned 
i_timeout )
 demux_sys_t *p_sys = p_demux->p_sys;
 
 /* time period elapsed ? */
-if (p_sys->i_still_end_time > 0 && p_sys->i_still_end_time <= 
vlc_tick_now()) {
+if (p_sys->i_still_end_time != STILL_IMAGE_NOT_SET &&
+p_sys->i_still_end_time != STILL_IMAGE_INFINITE &&
+p_sys->i_still_end_time <= vlc_tick_now()) {
 msg_Dbg(p_demux, "Still image end");
 bd_read_skip_still(p_sys->bluray);
 
@@ -2216,13 +2221,13 @@ static void blurayStillImage( demux_t *p_demux, 
unsigned i_timeout )
 }
 
 /* show last frame as still image */
-if (!p_sys->i_still_end_time) {
+if (p_sys->i_still_end_time == STILL_IMAGE_NOT_SET) {
 if (i_timeout) {
 msg_Dbg(p_demux, "Still image (%d seconds)", i_timeout);
 p_sys->i_still_end_time = vlc_tick_now() + vlc_tick_from_sec( 
i_timeout );
 } else {
 msg_Dbg(p_demux, "Still image (infinite)");
-p_sys->i_still_end_time = -1;
+p_sys->i_still_end_time = STILL_IMAGE_INFINITE;
 }
 
 /* flush demuxer and decoder (there won't be next video packet 
starting with ts PUSI) */

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits