/ - Diff - PeerStreamer - Redmine

         /* Try using the protocol's read_seek if available */
         if(s->pb) {
             int ret = ffio_read_seek(s->pb, stream_index, pts, flags);
             int ret = avio_seek_time(s->pb, stream_index, pts, flags);
             if(ret >= 0)
                 asf_reset_header(s);
             if (ret != AVERROR(ENOSYS))

      */
     const char *avio_enum_protocols(void **opaque, int output);
     /**
      * Pause and resume playing - only meaningful if using a network streaming
      * protocol (e.g. MMS).
      * @param pause 1 for pause, 0 for resume
      */
     int     avio_pause(AVIOContext *h, int pause);
     /**
      * Seek to a given timestamp relative to some component stream.
      * Only meaningful if using a network streaming protocol (e.g. MMS.).
      * @param stream_index The stream index that the timestamp is relative to.
      *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
      *        units from the beginning of the presentation.
      *        If a stream_index >= 0 is used and the protocol does not support
      *        seeking based on component streams, the call will fail with ENOTSUP.
      * @param timestamp timestamp in AVStream.time_base units
      *        or if there is no stream specified then in AV_TIME_BASE units.
      * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
      *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
      *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
      *        fail with ENOTSUP if used and not supported.
      * @return >= 0 on success
      * @see AVInputFormat::read_seek
      */
     int64_t avio_seek_time(AVIOContext *h, int stream_index,
                            int64_t timestamp, int flags);
     #endif /* AVFORMAT_AVIO_H */

     /** @warning must be called before any I/O */
     int ffio_set_buf_size(AVIOContext *s, int buf_size);
     /**
      * Pause and resume playing - only meaningful if using a network streaming
      * protocol (e.g. MMS).
      * @param pause 1 for pause, 0 for resume
      */
     int     ffio_read_pause(AVIOContext *h,    int pause);
     /**
      * Seek to a given timestamp relative to some component stream.
      * Only meaningful if using a network streaming protocol (e.g. MMS.).
      * @param stream_index The stream index that the timestamp is relative to.
      *        If stream_index is (-1) the timestamp should be in AV_TIME_BASE
      *        units from the beginning of the presentation.
      *        If a stream_index >= 0 is used and the protocol does not support
      *        seeking based on component streams, the call will fail with ENOTSUP.
      * @param timestamp timestamp in AVStream.time_base units
      *        or if there is no stream specified then in AV_TIME_BASE units.
      * @param flags Optional combination of AVSEEK_FLAG_BACKWARD, AVSEEK_FLAG_BYTE
      *        and AVSEEK_FLAG_ANY. The protocol may silently ignore
      *        AVSEEK_FLAG_BACKWARD and AVSEEK_FLAG_ANY, but AVSEEK_FLAG_BYTE will
      *        fail with ENOTSUP if used and not supported.
      * @return >= 0 on success
      * @see AVInputFormat::read_seek
      */
     int64_t ffio_read_seek (AVIOContext *h,    int stream_index,
                             int64_t timestamp, int flags);
     void ffio_init_checksum(AVIOContext *s,
                             unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len),
                             unsigned long checksum);

libavformat/aviobuf.c
403	403	}
404	404	int av_url_read_fpause(AVIOContext *s, int pause)
405	405	{
406		return ffio_read_pause(s, pause);
	406	return avio_pause(s, pause);
407	407	}
408	408	int64_t av_url_read_fseek(AVIOContext *s, int stream_index,
409	409	int64_t timestamp, int flags)
410	410	{
411		return ffio_read_seek(s, stream_index, timestamp, flags);
	411	return avio_seek_time(s, stream_index, timestamp, flags);
412	412	}
413	413	void init_checksum(AVIOContext *s,
414	414	unsigned long (update_checksum)(unsigned long c, const uint8_t p, unsigned int len),
...	...
1013	1013	}
1014	1014	#endif
1015	1015
1016		int ffio_read_pause(AVIOContext *s, int pause)
	1016	int avio_pause(AVIOContext *s, int pause)
1017	1017	{
1018	1018	if (!s->read_pause)
1019	1019	return AVERROR(ENOSYS);
1020	1020	return s->read_pause(s->opaque, pause);
1021	1021	}
1022	1022
1023		int64_t ffio_read_seek(AVIOContext *s, int stream_index,
	1023	int64_t avio_seek_time(AVIOContext *s, int stream_index,
1024	1024	int64_t timestamp, int flags)
1025	1025	{
1026	1026	URLContext *h = s->opaque;

libavformat/flvdec.c
529	529	static int flv_read_seek(AVFormatContext *s, int stream_index,
530	530	int64_t ts, int flags)
531	531	{
532		return ffio_read_seek(s->pb, stream_index, ts, flags);
	532	return avio_seek_time(s->pb, stream_index, ts, flags);
533	533	}
534	534
535	535	#if 0 /* don't know enough to implement this */
...	...
550	550	ts = av_rescale_rnd(ts, 1000, AV_TIME_BASE,
551	551	flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
552	552	}
553		ret = ffio_read_seek(s->pb, stream_index, ts, flags);
	553	ret = avio_seek_time(s->pb, stream_index, ts, flags);
554	554	}
555	555
556	556	if (ret == AVERROR(ENOSYS))

         if (s->iformat->read_play)
             return s->iformat->read_play(s);
         if (s->pb)
             return ffio_read_pause(s->pb, 0);
             return avio_pause(s->pb, 0);
         return AVERROR(ENOSYS);
+    }
-...
         if (s->iformat->read_pause)
             return s->iformat->read_pause(s);
         if (s->pb)
             return ffio_read_pause(s->pb, 1);
             return avio_pause(s->pb, 1);
         return AVERROR(ENOSYS);
+    }

PeerStreamer

Revision ff1ec0c3