Mercurial > mplayer.hg

changeset 25604:11cae072ab88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Whitespace-only cosmetics: get rid of tabs
author reimar
date Sun, 06 Jan 2008 20:27:14 +0000
parents 01754b23193e
children cae067bfc231
files mpcommon.c
diffstat 1 files changed, 94 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/mpcommon.c	Sun Jan 06 16:31:26 2008 +0000
+++ b/mpcommon.c	Sun Jan 06 20:27:14 2008 +0000
@@ -34,111 +34,111 @@
 #endif
       type = 't';
     if (reset) {
-	sub_clear_text(&subs, MP_NOPTS_VALUE);
-	if (vo_sub) {
-	    vo_sub = NULL;
-	    vo_osd_changed(OSDTYPE_SUBTITLE);
-	}
-	if (vo_spudec) {
-	    spudec_reset(vo_spudec);
-	    vo_osd_changed(OSDTYPE_SPU);
-	}
+        sub_clear_text(&subs, MP_NOPTS_VALUE);
+        if (vo_sub) {
+            vo_sub = NULL;
+            vo_osd_changed(OSDTYPE_SUBTITLE);
+        }
+        if (vo_spudec) {
+            spudec_reset(vo_spudec);
+            vo_osd_changed(OSDTYPE_SPU);
+        }
     }
     // find sub
     if (subdata) {
-	double pts = sh_video->pts;
-	if (sub_fps==0) sub_fps = sh_video->fps;
-	current_module = "find_sub";
-	if (pts > sub_last_pts || pts < sub_last_pts-1.0) {
-	    find_sub(subdata, (pts+sub_delay) *
-		     (subdata->sub_uses_time ? 100. : sub_fps)); 
-	    if (vo_sub) vo_sub_last = vo_sub;
-	    // FIXME! frame counter...
-	    sub_last_pts = pts;
-	}
+        double pts = sh_video->pts;
+        if (sub_fps==0) sub_fps = sh_video->fps;
+        current_module = "find_sub";
+        if (pts > sub_last_pts || pts < sub_last_pts-1.0) {
+            find_sub(subdata, (pts+sub_delay) *
+                     (subdata->sub_uses_time ? 100. : sub_fps)); 
+            if (vo_sub) vo_sub_last = vo_sub;
+            // FIXME! frame counter...
+            sub_last_pts = pts;
+        }
     }
 
     // DVD sub:
     if (vo_config_count && vo_spudec &&
-	(vobsub_id >= 0 || (dvdsub_id >= 0 && type == 'v'))) {
-	int timestamp;
-	current_module = "spudec";
-	spudec_heartbeat(vo_spudec, 90000*sh_video->timer);
-	/* Get a sub packet from the DVD or a vobsub and make a timestamp
-	 * relative to sh_video->timer */
-	while(1) {
-	    // Vobsub
-	    len = 0;
-	    if (vo_vobsub) {
-		if (sh_video->pts+sub_delay >= 0) {
-		    len = vobsub_get_packet(vo_vobsub, sh_video->pts+sub_delay,
-					    (void**)&packet, &timestamp);
-		    if (len > 0) {
-			timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000;
-			mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0,timestamp);
-		    }
-		}
-	    } else {
-		// DVD sub
-		len = ds_get_packet_sub(d_dvdsub, (unsigned char**)&packet);
-		if (len > 0) {
-		    // XXX This is wrong, sh_video->pts can be arbitrarily
-		    // much behind demuxing position. Unfortunately using
-		    // d_video->pts which would have been the simplest
-		    // improvement doesn't work because mpeg specific hacks
-		    // in video.c set d_video->pts to 0.
-		    float x = d_dvdsub->pts - sh_video->pts;
-		    if (x > -20 && x < 20) // prevent missing subs on pts reset
-			timestamp = 90000*(sh_video->timer + d_dvdsub->pts
-					   + sub_delay - sh_video->pts);
-		    else timestamp = 90000*(sh_video->timer + sub_delay);
-		    mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d  "
-			   "v_pts=%5.3f  s_pts=%5.3f  ts=%d \n", len,
-			   sh_video->pts, d_dvdsub->pts, timestamp);
-		}
-	    }
-	    if (len<=0 || !packet) break;
-	    if (vo_vobsub || timestamp >= 0)
-		spudec_assemble(vo_spudec, packet, len, timestamp);
-	}
+        (vobsub_id >= 0 || (dvdsub_id >= 0 && type == 'v'))) {
+        int timestamp;
+        current_module = "spudec";
+        spudec_heartbeat(vo_spudec, 90000*sh_video->timer);
+        /* Get a sub packet from the DVD or a vobsub and make a timestamp
+         * relative to sh_video->timer */
+        while(1) {
+            // Vobsub
+            len = 0;
+            if (vo_vobsub) {
+                if (sh_video->pts+sub_delay >= 0) {
+                    len = vobsub_get_packet(vo_vobsub, sh_video->pts+sub_delay,
+                                            (void**)&packet, &timestamp);
+                    if (len > 0) {
+                        timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000;
+                        mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0,timestamp);
+                    }
+                }
+            } else {
+                // DVD sub
+                len = ds_get_packet_sub(d_dvdsub, (unsigned char**)&packet);
+                if (len > 0) {
+                    // XXX This is wrong, sh_video->pts can be arbitrarily
+                    // much behind demuxing position. Unfortunately using
+                    // d_video->pts which would have been the simplest
+                    // improvement doesn't work because mpeg specific hacks
+                    // in video.c set d_video->pts to 0.
+                    float x = d_dvdsub->pts - sh_video->pts;
+                    if (x > -20 && x < 20) // prevent missing subs on pts reset
+                        timestamp = 90000*(sh_video->timer + d_dvdsub->pts
+                                           + sub_delay - sh_video->pts);
+                    else timestamp = 90000*(sh_video->timer + sub_delay);
+                    mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d  "
+                           "v_pts=%5.3f  s_pts=%5.3f  ts=%d \n", len,
+                           sh_video->pts, d_dvdsub->pts, timestamp);
+                }
+            }
+            if (len<=0 || !packet) break;
+            if (vo_vobsub || timestamp >= 0)
+                spudec_assemble(vo_spudec, packet, len, timestamp);
+        }
 
-	if (spudec_changed(vo_spudec))
-	    vo_osd_changed(OSDTYPE_SPU);
+        if (spudec_changed(vo_spudec))
+            vo_osd_changed(OSDTYPE_SPU);
     } else if (dvdsub_id >= 0 && type == 't') {
-	double curpts = sh_video->pts + sub_delay;
-	double endpts;
-	vo_sub = &subs;
-	while (d_dvdsub->first) {
-	    double pts = ds_get_next_pts(d_dvdsub);
-	    if (pts > curpts)
-		break;
-	    endpts = d_dvdsub->first->endpts;
-	    len = ds_get_packet_sub(d_dvdsub, &packet);
+        double curpts = sh_video->pts + sub_delay;
+        double endpts;
+        vo_sub = &subs;
+        while (d_dvdsub->first) {
+            double pts = ds_get_next_pts(d_dvdsub);
+            if (pts > curpts)
+                break;
+            endpts = d_dvdsub->first->endpts;
+            len = ds_get_packet_sub(d_dvdsub, &packet);
 #ifdef USE_ASS
-	    if (ass_enabled) {
-		static ass_track_t *global_ass_track = NULL;
-		if (!global_ass_track) global_ass_track = ass_default_track(ass_library);
-		ass_track = global_ass_track;
-		vo_sub = NULL;
-		if (pts != MP_NOPTS_VALUE) {
-		    if (endpts == MP_NOPTS_VALUE) endpts = pts + 3;
-		    sub_clear_text(&subs, MP_NOPTS_VALUE);
-		    sub_add_text(&subs, packet, len, endpts);
-		    subs.start = pts * 100;
-		    subs.end = endpts * 100;
-		    ass_process_subtitle(ass_track, &subs);
-		}
-	    } else
+            if (ass_enabled) {
+                static ass_track_t *global_ass_track = NULL;
+                if (!global_ass_track) global_ass_track = ass_default_track(ass_library);
+                ass_track = global_ass_track;
+                vo_sub = NULL;
+                if (pts != MP_NOPTS_VALUE) {
+                    if (endpts == MP_NOPTS_VALUE) endpts = pts + 3;
+                    sub_clear_text(&subs, MP_NOPTS_VALUE);
+                    sub_add_text(&subs, packet, len, endpts);
+                    subs.start = pts * 100;
+                    subs.end = endpts * 100;
+                    ass_process_subtitle(ass_track, &subs);
+                }
+            } else
 #endif
-		if (pts != MP_NOPTS_VALUE) {
-		    if (endpts == MP_NOPTS_VALUE)
-			sub_clear_text(&subs, MP_NOPTS_VALUE);
-		    sub_add_text(&subs, packet, len, endpts);
-		    vo_osd_changed(OSDTYPE_SUBTITLE);
-		}
-	}
-	if (sub_clear_text(&subs, curpts))
-	    vo_osd_changed(OSDTYPE_SUBTITLE);
+            if (pts != MP_NOPTS_VALUE) {
+                if (endpts == MP_NOPTS_VALUE)
+                    sub_clear_text(&subs, MP_NOPTS_VALUE);
+                sub_add_text(&subs, packet, len, endpts);
+                vo_osd_changed(OSDTYPE_SUBTITLE);
+            }
+        }
+        if (sub_clear_text(&subs, curpts))
+            vo_osd_changed(OSDTYPE_SUBTITLE);
     }
     current_module=NULL;
 }