diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-03-12 15:16:19 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-03-12 15:16:19 +0000 |
| commit | 14bea432f16d7c66f9099e427819028b6b4c3bdc (patch) | |
| tree | c52726ce14a0265337b9deebd2214e2552d284b0 /ffserver.c | |
| parent | 586bc7553ca90dee507afd950de64bbd2c6a80b5 (diff) | |
| download | ffmpeg-14bea432f16d7c66f9099e427819028b6b4c3bdc.tar.gz | |
per context frame_rate_base, this should finally fix frame_rate related av sync issues
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ffserver.c b/ffserver.c index ee560e26bc..73e61e5a53 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1725,7 +1725,7 @@ static void compute_stats(HTTPContext *c) case CODEC_TYPE_VIDEO: type = "video"; sprintf(parameters, "%dx%d, q=%d-%d, fps=%d", st->codec.width, st->codec.height, - st->codec.qmin, st->codec.qmax, st->codec.frame_rate / FRAME_RATE_BASE); + st->codec.qmin, st->codec.qmax, st->codec.frame_rate / st->codec.frame_rate_base); break; default: av_abort(); @@ -1950,7 +1950,7 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) (int64_t)s->pts_num * st->codec.sample_rate); break; case CODEC_TYPE_VIDEO: - st->pts_incr = (int64_t)s->pts_den * FRAME_RATE_BASE; + st->pts_incr = (int64_t)s->pts_den * st->codec.frame_rate_base; av_frac_init(&st->pts, st->pts.val, 0, (int64_t)s->pts_num * st->codec.frame_rate); break; @@ -2018,7 +2018,7 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) (int64_t)s->pts_num * st->codec.sample_rate); break; case CODEC_TYPE_VIDEO: - st->pts_incr = (int64_t)s->pts_den * FRAME_RATE_BASE; + st->pts_incr = (int64_t)s->pts_den * st->codec.frame_rate_base; av_frac_init(&st->pts, st->pts.val, 0, (int64_t)s->pts_num * st->codec.frame_rate); break; @@ -3219,6 +3219,7 @@ static int add_av_stream(FFStream *feed, AVStream *st) if (av1->width == av->width && av1->height == av->height && av1->frame_rate == av->frame_rate && + av1->frame_rate_base == av->frame_rate_base && av1->gop_size == av->gop_size) goto found; break; @@ -3406,6 +3407,7 @@ static void build_feed_streams(void) matches = 0; } else if (ccf->codec_type == CODEC_TYPE_VIDEO) { if (CHECK_CODEC(frame_rate) || + CHECK_CODEC(frame_rate_base) || CHECK_CODEC(width) || CHECK_CODEC(height)) { printf("Codec width, height and framerate do not match for stream %d\n", i); @@ -3553,8 +3555,10 @@ static void add_codec(FFStream *stream, AVCodecContext *av) case CODEC_TYPE_VIDEO: if (av->bit_rate == 0) av->bit_rate = 64000; - if (av->frame_rate == 0) - av->frame_rate = 5 * FRAME_RATE_BASE; + if (av->frame_rate == 0){ + av->frame_rate = 5; + av->frame_rate_base = 1; + } if (av->width == 0 || av->height == 0) { av->width = 160; av->height = 128; @@ -4017,7 +4021,8 @@ static int parse_ffconfig(const char *filename) } else if (!strcasecmp(cmd, "VideoFrameRate")) { get_arg(arg, sizeof(arg), &p); if (stream) { - video_enc.frame_rate = (int)(strtod(arg, NULL) * FRAME_RATE_BASE); + video_enc.frame_rate_base= DEFAULT_FRAME_RATE_BASE; + video_enc.frame_rate = (int)(strtod(arg, NULL) * video_enc.frame_rate_base); } } else if (!strcasecmp(cmd, "VideoGopSize")) { get_arg(arg, sizeof(arg), &p); |