pkt->dts += offset;
}
- if(is_intra_only(st->codec))
- pkt->flags |= PKT_FLAG_KEY;
-
/* do we have a video B frame ? */
delay= st->codec->has_b_frames;
presentation_delayed = 0;
// av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n", presentation_delayed, delay, pkt->pts, pkt->dts, st->cur_dts);
/* update flags */
- if (pc) {
+ if(is_intra_only(st->codec))
+ pkt->flags |= PKT_FLAG_KEY;
+ else if (pc) {
pkt->flags = 0;
/* key frame computation */
if (pc->pict_type == FF_I_TYPE)
return m;
}
-//#define DEBUG_SEEK
+#define DEBUG_SEEK
int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts, int flags){
AVInputFormat *avif= s->iformat;
for(i=s->nb_programs-1; i>=0; i--) {
av_freep(&s->programs[i]->provider_name);
av_freep(&s->programs[i]->name);
+ av_freep(&s->programs[i]->stream_index);
av_freep(&s->programs[i]);
}
flush_packet_queue(s);
return ret;
}
+void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx)
+{
+ int i, j;
+ AVProgram *program=NULL;
+ void *tmp;
+
+ for(i=0; i<ac->nb_programs; i++){
+ if(ac->programs[i]->id != progid)
+ continue;
+ program = ac->programs[i];
+ for(j=0; j<program->nb_stream_indexes; j++)
+ if(program->stream_index[j] == idx)
+ return;
+
+ tmp = av_realloc(program->stream_index, sizeof(unsigned int)*(program->nb_stream_indexes+1));
+ if(!tmp)
+ return;
+ program->stream_index = tmp;
+ program->stream_index[program->nb_stream_indexes++] = idx;
+ return;
+ }
+}
+
/* "user interface" functions */
+static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
+{
+ char buf[256];
+ int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
+ AVStream *st = ic->streams[i];
+ int g = ff_gcd(st->time_base.num, st->time_base.den);
+ avcodec_string(buf, sizeof(buf), st->codec, is_output);
+ av_log(NULL, AV_LOG_INFO, " Stream #%d.%d", index, i);
+ /* the pid is an important information, so we display it */
+ /* XXX: add a generic system */
+ if (flags & AVFMT_SHOW_IDS)
+ av_log(NULL, AV_LOG_INFO, "[0x%x]", st->id);
+ if (strlen(st->language) > 0)
+ av_log(NULL, AV_LOG_INFO, "(%s)", st->language);
+ av_log(NULL, AV_LOG_DEBUG, ", %d/%d", st->time_base.num/g, st->time_base.den/g);
+ av_log(NULL, AV_LOG_INFO, ": %s", buf);
+ if(st->codec->codec_type == CODEC_TYPE_VIDEO){
+ if(st->r_frame_rate.den && st->r_frame_rate.num)
+ av_log(NULL, AV_LOG_INFO, ", %5.2f fps(r)", av_q2d(st->r_frame_rate));
+/* else if(st->time_base.den && st->time_base.num)
+ av_log(NULL, AV_LOG_INFO, ", %5.2f fps(m)", 1/av_q2d(st->time_base));*/
+ else
+ av_log(NULL, AV_LOG_INFO, ", %5.2f fps(c)", 1/av_q2d(st->codec->time_base));
+ }
+ av_log(NULL, AV_LOG_INFO, "\n");
+}
void dump_format(AVFormatContext *ic,
int index,
const char *url,
int is_output)
{
- int i, flags;
- char buf[256];
+ int i;
av_log(NULL, AV_LOG_INFO, "%s #%d, %s, %s '%s':\n",
is_output ? "Output" : "Input",
}
av_log(NULL, AV_LOG_INFO, "\n");
}
- for(i=0;i<ic->nb_streams;i++) {
- AVStream *st = ic->streams[i];
- int g= ff_gcd(st->time_base.num, st->time_base.den);
- avcodec_string(buf, sizeof(buf), st->codec, is_output);
- av_log(NULL, AV_LOG_INFO, " Stream #%d.%d", index, i);
- /* the pid is an important information, so we display it */
- /* XXX: add a generic system */
- if (is_output)
- flags = ic->oformat->flags;
- else
- flags = ic->iformat->flags;
- if (flags & AVFMT_SHOW_IDS) {
- av_log(NULL, AV_LOG_INFO, "[0x%x]", st->id);
- }
- if (strlen(st->language) > 0) {
- av_log(NULL, AV_LOG_INFO, "(%s)", st->language);
- }
- av_log(NULL, AV_LOG_DEBUG, ", %d/%d", st->time_base.num/g, st->time_base.den/g);
- av_log(NULL, AV_LOG_INFO, ": %s", buf);
- if(st->codec->codec_type == CODEC_TYPE_VIDEO){
- if(st->r_frame_rate.den && st->r_frame_rate.num)
- av_log(NULL, AV_LOG_INFO, ", %5.2f fps(r)", av_q2d(st->r_frame_rate));
-/* else if(st->time_base.den && st->time_base.num)
- av_log(NULL, AV_LOG_INFO, ", %5.2f fps(m)", 1/av_q2d(st->time_base));*/
- else
- av_log(NULL, AV_LOG_INFO, ", %5.2f fps(c)", 1/av_q2d(st->codec->time_base));
- }
- av_log(NULL, AV_LOG_INFO, "\n");
- }
+ if(ic->nb_programs) {
+ int j, k;
+ for(j=0; j<ic->nb_programs; j++) {
+ av_log(NULL, AV_LOG_INFO, " Program %d %s\n", ic->programs[j]->id,
+ ic->programs[j]->name ? ic->programs[j]->name : "");
+ for(k=0; k<ic->programs[j]->nb_stream_indexes; k++)
+ dump_stream_format(ic, ic->programs[j]->stream_index[k], index, is_output);
+ }
+ } else
+ for(i=0;i<ic->nb_streams;i++)
+ dump_stream_format(ic, i, index, is_output);
}
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
char *path, int path_size,
const char *url)
{
- const char *p, *ls, *at, *col, *brk;
+ const char *p, *ls, *at, *col, *brk, *q;
if (port_ptr) *port_ptr = -1;
if (proto_size > 0) proto[0] = 0;
}
/* separate path from hostname */
- if ((ls = strchr(p, '/')))
- av_strlcpy(path, ls, path_size);
- else
+ if ((ls = strchr(p, '/'))) {
+ if ((q = strchr(ls, '?')))
+ av_strlcpy(path, ls, FFMIN(path_size, q - ls + 1));
+ else
+ av_strlcpy(path, ls, path_size);
+ } else if (!(ls = strchr(p, '?')))
ls = &p[strlen(p)]; // XXX
/* the rest is hostname, use that to parse auth/port */