Mercurial > mplayer.hg

comparison libmpdemux/muxer_mpeg.c @ 14799:090be6ae25ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disabled by default frame reordering
author nicodvb
date Thu, 24 Feb 2005 20:23:13 +0000
parents 5c82935cb6f0
children d5683a00b74c
comparison
equal deleted inserted replaced
14798:0bd50330e688 14799:090be6ae25ac
72 static int conf_init_vpts = 200, conf_init_apts = 200; 72 static int conf_init_vpts = 200, conf_init_apts = 200;
73 static int conf_ts_allframes = 0; 73 static int conf_ts_allframes = 0;
74 static int conf_init_adelay = 0; 74 static int conf_init_adelay = 0;
75 static int conf_drop = 0; 75 static int conf_drop = 0;
76 static int conf_skip_padding = 0; 76 static int conf_skip_padding = 0;
77 static int conf_noreorder = 0; 77 static int conf_reorder = 0;
78 78
79 enum FRAME_TYPE { 79 enum FRAME_TYPE {
80 I_FRAME = 1, 80 I_FRAME = 1,
81 P_FRAME = 2, 81 P_FRAME = 2,
82 B_FRAME = 3 82 B_FRAME = 3
169 {"init_apts", &(conf_init_apts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL}, 169 {"init_apts", &(conf_init_apts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL},
170 {"vdelay", &conf_init_adelay, CONF_TYPE_INT, CONF_RANGE, 1, 32760, NULL}, 170 {"vdelay", &conf_init_adelay, CONF_TYPE_INT, CONF_RANGE, 1, 32760, NULL},
171 {"drop", &conf_drop, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 171 {"drop", &conf_drop, CONF_TYPE_FLAG, 0, 0, 1, NULL},
172 {"tsaf", &conf_ts_allframes, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 172 {"tsaf", &conf_ts_allframes, CONF_TYPE_FLAG, 0, 0, 1, NULL},
173 {"skip_padding", &conf_skip_padding, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 173 {"skip_padding", &conf_skip_padding, CONF_TYPE_FLAG, 0, 0, 1, NULL},
174 {"noreorder", &conf_noreorder, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 174 {"reorder", &conf_reorder, CONF_TYPE_FLAG, 0, 0, 1, NULL},
175 {NULL, NULL, 0, 0, 0, 0, NULL} 175 {NULL, NULL, 0, 0, 0, 0, NULL}
176 }; 176 };
177 177
178 static void fix_audio_sys_header(muxer_priv_t *priv, uint8_t id, uint8_t newid, uint32_t size) 178 static void fix_audio_sys_header(muxer_priv_t *priv, uint8_t id, uint8_t newid, uint32_t size)
179 { 179 {
387 } 387 }
388 if(priv->is_xvcd) 388 if(priv->is_xvcd)
389 spriv->min_pes_hlen = 18; 389 spriv->min_pes_hlen = 18;
390 else if(priv->is_xsvcd) 390 else if(priv->is_xsvcd)
391 spriv->min_pes_hlen = 22; 391 spriv->min_pes_hlen = 22;
392 if(conf_noreorder) 392 if(conf_reorder)
393 spriv->reorder = 1;
394 else
393 spriv->reorder = 0; 395 spriv->reorder = 0;
394 else
395 spriv->reorder = 1;
396 mp_msg (MSGT_MUXER, MSGL_DBG2, "Added video stream %d, ckid=%X\n", muxer->num_videos, s->ckid); 396 mp_msg (MSGT_MUXER, MSGL_DBG2, "Added video stream %d, ckid=%X\n", muxer->num_videos, s->ckid);
397 } else { // MUXER_TYPE_AUDIO 397 } else { // MUXER_TYPE_AUDIO
398 spriv->type = 0; 398 spriv->type = 0;
399 spriv->pts = 1; 399 spriv->pts = 1;
400 spriv->dts = 0; 400 spriv->dts = 0;