FFmpeg merge diff after patches.

libavformat/oggdec.c

 /*
  * Ogg bitstream support
  * Luca Barbato <lu_zero@gentoo.org>
  * Based on tcvp implementation
  */
 
 /*
     Copyright (C) 2005  Michael Ahlberg, Måns Rullgård
 
     Permission is hereby granted, free of charge, to any person
@@ skipping 21 matching lines @@
 #include "oggdec.h"
 #include "avformat.h"
 #include "internal.h"
 #include "vorbiscomment.h"
 
 #define MAX_PAGE_SIZE 65307
 #define DECODER_BUFFER_SIZE MAX_PAGE_SIZE
 
 static const struct ogg_codec * const ogg_codecs[] = {
     &ff_skeleton_codec,
+#if CONFIG_DIRAC_DEMUXER
     &ff_dirac_codec,
+#endif
+#if CONFIG_LIBSPEEX
     &ff_speex_codec,
+#endif
     &ff_vorbis_codec,
     &ff_theora_codec,
+#if CONFIG_FLAC_DECODER
     &ff_flac_codec,
+#endif
     &ff_celt_codec,
+#if CONFIG_DIRAC_DEMUXER
     &ff_old_dirac_codec,
+#endif
+#if CONFIG_FLAC_DECODER
     &ff_old_flac_codec,
+#endif
     &ff_ogm_video_codec,
     &ff_ogm_audio_codec,
     &ff_ogm_text_codec,
     &ff_ogm_old_codec,
     NULL
 };
 
 //FIXME We could avoid some structure duplication
 static int ogg_save(AVFormatContext *s)
 {
@@ skipping 428 matching lines @@
                 s->streams[i]->duration -= s->streams[i]->start_time;
                 streams_left-= (ogg->streams[i].got_start==-1);
                 ogg->streams[i].got_start= 1;
             }else if(!ogg->streams[i].got_start){
                 ogg->streams[i].got_start= -1;
                 streams_left++;
             }
         }
     }
 
     ogg_restore (s, 0);

[DaleCurtis, 2012/02/04 18:06:20]

Applied 35_oggdec_duration.patch, despite upstream saying the issue 
is fixed, some test cases in ffmpeg_unittests regressed. 

[scherkus (not reviewing), 2012/02/06 17:46:29]

We should sanity check those tests for accuracy as well :)

[DaleCurtis, 2012/02/06 18:59:01]

Without this patch it gets the duration wrong by > 0.5 secs on sync1.ogg and
sync2.ogg. I'll recheck that these aren't fixed by the threads patch I made to
ffmpeg_unittests.

 
-    ogg_save (s);
-    avio_seek (s->pb, 0, SEEK_SET);
-    while (!ogg_read_page (s, &i)){
-        if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 &&
-            ogg->streams[i].codec) {
-            if(s->streams[i]->duration && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start){
-                int64_t start= ogg_gptopts (s, i, ogg->streams[i].granule, NULL);
-                if(av_rescale_q(start, s->streams[i]->time_base, AV_TIME_BASE_Q) > AV_TIME_BASE)
-                    s->streams[i]->duration -= start;
-                ogg->streams[i].got_start= 1;
-                streams_left--;
-            }
-            if(streams_left<=0)
-                break;
-        }
-    }
-    ogg_restore (s, 0);
-
     return 0;
 }
 
 static int ogg_read_header(AVFormatContext *s)
 {
     struct ogg *ogg = s->priv_data;
     int ret, i;
     ogg->curidx = -1;
     //linear headers seek from start
     ret = ogg_get_headers(s);
@@ skipping 96 matching lines @@
     return 0;
 }
 
 static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
                                   int64_t *pos_arg, int64_t pos_limit)
 {
     struct ogg *ogg = s->priv_data;
     AVIOContext *bc = s->pb;
     int64_t pts = AV_NOPTS_VALUE;
     int i = -1;
+    int packet = 0;
+    int64_t start_pos = *pos_arg;
     avio_seek(bc, *pos_arg, SEEK_SET);
     ogg_reset(ogg);
 
     while (avio_tell(bc) < pos_limit && !ogg_packet(s, &i, NULL, NULL, pos_arg)) {
         if (i == stream_index) {
             struct ogg_stream *os = ogg->streams + stream_index;
             pts = ogg_calc_pts(s, i, NULL);
             if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY))
                 pts = AV_NOPTS_VALUE;
+
+            // This is for the special case for the first packet in the stream.
+            if (pts == AV_NOPTS_VALUE && start_pos <= s->data_offset && !packet) {
+                pts = 0;
+            }
+            ++packet;
         }
         if (pts != AV_NOPTS_VALUE)
             break;
     }
     ogg_reset(ogg);
     return pts;
 }
 
 static int ogg_read_seek(AVFormatContext *s, int stream_index,
                          int64_t timestamp, int flags)
 {
     struct ogg *ogg = s->priv_data;
     struct ogg_stream *os = ogg->streams + stream_index;
     int ret;
+    int64_t seek_pos;
+    int64_t pos_arg;
+    int64_t seek_pts;
+    int i;
 
     // Try seeking to a keyframe first. If this fails (very possible),
     // av_seek_frame will fall back to ignoring keyframes
     if (s->streams[stream_index]->codec->codec_type == AVMEDIA_TYPE_VIDEO
         && !(flags & AVSEEK_FLAG_ANY))
         os->keyframe_seek = 1;
 
     ret = ff_seek_frame_binary(s, stream_index, timestamp, flags);
     os = ogg->streams + stream_index;
     if (ret < 0)
         os->keyframe_seek = 0;
+
+    // Save the position seeked to.
+    pos_arg = seek_pos = avio_tell(s->pb);

[DaleCurtis, 2012/02/04 18:06:20]

Patch required swapping url_ftell w/ avio_tell.

[scherkus (not reviewing), 2012/02/06 17:46:29]

For these function swaps is it because the patch was written before the ffmpeg
IO functions were updated?

[DaleCurtis, 2012/02/06 18:59:01]

Yes. 

+    seek_pts = ogg_read_timestamp(s, stream_index, &pos_arg, avio_size(s->pb));

[DaleCurtis, 2012/02/04 18:06:20]

Patch required swapping url_fsize w/ avio_size.

+    os = ogg->streams + stream_index;
+
+    // Since we have seeked to the beginning then reset lastpts and lastdts to 0.
+    if (!seek_pts) {
+        for (i = 0; i < ogg->nstreams; i++){
+            struct ogg_stream *stream = ogg->streams + i;
+            stream->lastpts = 0;
+            stream->lastdts = 0;
+        }
+        os->keyframe_seek = 0;
+    }
+    avio_seek(s->pb, seek_pos, SEEK_SET);

[DaleCurtis, 2012/02/04 18:06:20]

Patch required swapping url_fseek w/ avio_seek.

     return ret;
 }
 
 static int ogg_probe(AVProbeData *p)
 {
     if (!memcmp("OggS", p->buf, 5) && p->buf[5] <= 0x7)
         return AVPROBE_SCORE_MAX;
     return 0;
 }
 
 AVInputFormat ff_ogg_demuxer = {
     .name           = "ogg",
     .long_name      = NULL_IF_CONFIG_SMALL("Ogg"),
     .priv_data_size = sizeof(struct ogg),
     .read_probe     = ogg_probe,
     .read_header    = ogg_read_header,
     .read_packet    = ogg_read_packet,
     .read_close     = ogg_read_close,
     .read_seek      = ogg_read_seek,
     .read_timestamp = ogg_read_timestamp,
     .extensions     = "ogg",
     .flags          = AVFMT_GENERIC_INDEX,
 };