return 0;
}
-/* fifo handling */
-
-int fifo_init(FifoBuffer *f, int size)
-{
- f->buffer = av_malloc(size);
- if (!f->buffer)
- return -1;
- f->end = f->buffer + size;
- f->wptr = f->rptr = f->buffer;
- return 0;
-}
-
-void fifo_free(FifoBuffer *f)
-{
- av_free(f->buffer);
-}
-
-int fifo_size(FifoBuffer *f, uint8_t *rptr)
-{
- int size;
-
- if(!rptr)
- rptr= f->rptr;
-
- if (f->wptr >= rptr) {
- size = f->wptr - rptr;
- } else {
- size = (f->end - rptr) + (f->wptr - f->buffer);
- }
- return size;
-}
-
-/**
- * Get data from the fifo (returns -1 if not enough data).
- */
-int fifo_read(FifoBuffer *f, uint8_t *buf, int buf_size, uint8_t **rptr_ptr)
-{
- uint8_t *rptr;
- int size, len;
-
- if(!rptr_ptr)
- rptr_ptr= &f->rptr;
- rptr = *rptr_ptr;
-
- if (f->wptr >= rptr) {
- size = f->wptr - rptr;
- } else {
- size = (f->end - rptr) + (f->wptr - f->buffer);
- }
-
- if (size < buf_size)
- return -1;
- while (buf_size > 0) {
- len = f->end - rptr;
- if (len > buf_size)
- len = buf_size;
- memcpy(buf, rptr, len);
- buf += len;
- rptr += len;
- if (rptr >= f->end)
- rptr = f->buffer;
- buf_size -= len;
- }
- *rptr_ptr = rptr;
- return 0;
-}
-
-/**
- * Resizes a FIFO.
- */
-void fifo_realloc(FifoBuffer *f, unsigned int new_size){
- unsigned int old_size= f->end - f->buffer;
-
- if(old_size < new_size){
- uint8_t *old= f->buffer;
-
- f->buffer= av_realloc(f->buffer, new_size);
-
- f->rptr += f->buffer - old;
- f->wptr += f->buffer - old;
-
- if(f->wptr < f->rptr){
- memmove(f->rptr + new_size - old_size, f->rptr, f->buffer + old_size - f->rptr);
- f->rptr += new_size - old_size;
- }
- f->end= f->buffer + new_size;
- }
-}
-
-void fifo_write(FifoBuffer *f, const uint8_t *buf, int size, uint8_t **wptr_ptr)
-{
- int len;
- uint8_t *wptr;
-
- if(!wptr_ptr)
- wptr_ptr= &f->wptr;
- wptr = *wptr_ptr;
-
- while (size > 0) {
- len = f->end - wptr;
- if (len > size)
- len = size;
- memcpy(wptr, buf, len);
- wptr += len;
- if (wptr >= f->end)
- wptr = f->buffer;
- buf += len;
- size -= len;
- }
- *wptr_ptr = wptr;
-}
-
-/* get data from the fifo (return -1 if not enough data) */
-int put_fifo(ByteIOContext *pb, FifoBuffer *f, int buf_size, uint8_t **rptr_ptr)
-{
- uint8_t *rptr = *rptr_ptr;
- int size, len;
-
- if (f->wptr >= rptr) {
- size = f->wptr - rptr;
- } else {
- size = (f->end - rptr) + (f->wptr - f->buffer);
- }
-
- if (size < buf_size)
- return -1;
- while (buf_size > 0) {
- len = f->end - rptr;
- if (len > buf_size)
- len = buf_size;
- put_buffer(pb, rptr, len);
- rptr += len;
- if (rptr >= f->end)
- rptr = f->buffer;
- buf_size -= len;
- }
- *rptr_ptr = rptr;
- return 0;
-}
-
/**
* Allocate the payload of a packet and intialized its fields to default values.
*
static const AVOption options[]={
{"probesize", NULL, OFFSET(probesize), FF_OPT_TYPE_INT, 32000, 32, INT_MAX, D}, /* 32000 from mpegts.c: 1.0 second at 24Mbit/s */
{"muxrate", "set mux rate", OFFSET(mux_rate), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
+{"packetsize", "set packet size", OFFSET(packet_size), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
{"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D, "fflags"},
{"ignidx", "ignore index", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNIDX, INT_MIN, INT_MAX, D, "fflags"},
{"genpts", "generate pts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_GENPTS, INT_MIN, INT_MAX, D, "fflags"},
ret = count;
break;
}
- } else {
- /* we did not get all the codec info, but we read too much data */
- if (read_size >= MAX_READ_SIZE) {
- ret = count;
- break;
- }
+ }
+ /* we did not get all the codec info, but we read too much data */
+ if (read_size >= MAX_READ_SIZE) {
+ ret = count;
+ break;
}
/* NOTE: a new stream can be added there if no header in file
duration_sum[index]= duration;
duration_count[index]=1;
}else{
- int factor= av_rescale(duration, duration_count[index], duration_sum[index]);
+ int factor= av_rescale(2*duration, duration_count[index], duration_sum[index]);
+ if(factor==3)
+ duration_count[index] *= 2;
+ factor= av_rescale(duration, duration_count[index], duration_sum[index]);
duration_sum[index] += duration;
duration_count[index]+= factor;
}
if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_sample)
st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
- if(duration_count[i] && st->codec->time_base.num*101LL <= st->codec->time_base.den &&
+ if(duration_count[i]
+ && (st->codec->time_base.num*101LL <= st->codec->time_base.den || st->codec->codec_id == CODEC_ID_MPEG2VIDEO) &&
+ //FIXME we should not special case mpeg2, but this needs testing with non mpeg2 ...
st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den){
int64_t num, den, error, best_error;
av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, j, 12, INT_MAX);
}
}
- for(j=24; j<=30; j+=6){
- error= ABS(1001*12*num - 1000*12*j*den);
+ for(j=0; j<3; j++){
+ static const int ticks[]= {24,30,60};
+ error= ABS(1001*12*num - 1000*12*den * ticks[j]);
if(error < best_error){
best_error= error;
- av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, j*1000, 1001, INT_MAX);
+ av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, ticks[j]*1000, 1001, INT_MAX);
}
}
}
- /* set real frame rate info */
- /* compute the real frame rate for telecine */
- if ((st->codec->codec_id == CODEC_ID_MPEG1VIDEO ||
- st->codec->codec_id == CODEC_ID_MPEG2VIDEO) &&
- st->codec->sub_id == 2) {
- if (st->codec_info_nb_frames >= 20) {
- float coded_frame_rate, est_frame_rate;
- est_frame_rate = ((double)st->codec_info_nb_frames * AV_TIME_BASE) /
- (double)st->codec_info_duration ;
- coded_frame_rate = 1.0/av_q2d(st->codec->time_base);
-#if 0
- printf("telecine: coded_frame_rate=%0.3f est_frame_rate=%0.3f\n",
- coded_frame_rate, est_frame_rate);
-#endif
- /* if we detect that it could be a telecine, we
- signal it. It would be better to do it at a
- higher level as it can change in a film */
- if (coded_frame_rate >= 24.97 &&
- (est_frame_rate >= 23.5 && est_frame_rate < 24.5)) {
- st->r_frame_rate = (AVRational){24000, 1001};
- }
- }
- }
/* if no real frame rate, use the codec one */
if (!st->r_frame_rate.num){
st->r_frame_rate.num = st->codec->time_base.den;