skip run-in sequence during probe

[ffmpeg] / libavformat / psxstr.c

diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 88c44dff4e0f29a9255f268247819bb5a1d1d376..b4a4ac0590a961b1d83bfd7a0fc1cacd642b3316 100644 (file)
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
@@ -107,6 +107,7 @@ static int str_probe(AVProbeData *p)
     return 50;
 }
 
+#if 0
 static void dump(unsigned char *buf,size_t len)
 {
     int i;
@@ -117,6 +118,7 @@ static void dump(unsigned char *buf,size_t len)
     }
     av_log(NULL, AV_LOG_DEBUG, "\n");
 }
+#endif
 
 static int str_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
@@ -135,9 +137,6 @@ static int str_read_header(AVFormatContext *s,
     str->video_channel = -1;
     str->video_chunk = NULL;
 
-    /* set the pts reference (1 pts = 1/90000) */
-    s->pts_num = 1;
-    s->pts_den = 90000;
 
     /* skip over any RIFF header */
     if (get_buffer(pb, sector, RIFF_HEADER_SIZE) != RIFF_HEADER_SIZE)
@@ -178,14 +177,15 @@ static int str_read_header(AVFormatContext *s,
                 st = av_new_stream(s, 0);
                 if (!st)
                     return AVERROR_NOMEM;
+                av_set_pts_info(st, 64, 1, 15);
 
                 str->channels[channel].video_stream_index = st->index;
 
-                st->codec.codec_type = CODEC_TYPE_VIDEO;
-                st->codec.codec_id = CODEC_ID_MDEC; 
-                st->codec.codec_tag = 0;  /* no fourcc */
-                st->codec.width = str->channels[channel].width;
-                st->codec.height = str->channels[channel].height;
+                st->codec->codec_type = CODEC_TYPE_VIDEO;
+                st->codec->codec_id = CODEC_ID_MDEC;
+                st->codec->codec_tag = 0;  /* no fourcc */
+                st->codec->width = str->channels[channel].width;
+                st->codec->height = str->channels[channel].height;
             }
             break;
 
@@ -195,28 +195,29 @@ static int str_read_header(AVFormatContext *s,
                 int fmt;
                 str->audio_channel = channel;
                 str->channels[channel].type = STR_AUDIO;
-                str->channels[channel].channels = 
+                str->channels[channel].channels =
                     (sector[0x13] & 0x01) ? 2 : 1;
-                str->channels[channel].sample_rate = 
+                str->channels[channel].sample_rate =
                     (sector[0x13] & 0x04) ? 18900 : 37800;
-                str->channels[channel].bits = 
+                str->channels[channel].bits =
                     (sector[0x13] & 0x10) ? 8 : 4;
 
                 /* allocate a new AVStream */
                 st = av_new_stream(s, 0);
                 if (!st)
                     return AVERROR_NOMEM;
+                av_set_pts_info(st, 64, 128, str->channels[channel].sample_rate);
 
                 str->channels[channel].audio_stream_index = st->index;
 
                 fmt = sector[0x13];
-                st->codec.codec_type = CODEC_TYPE_AUDIO;
-                st->codec.codec_id = CODEC_ID_ADPCM_XA; 
-                st->codec.codec_tag = 0;  /* no fourcc */
-                st->codec.channels = (fmt&1)?2:1;
-                st->codec.sample_rate = (fmt&4)?18900:37800;
-            //    st->codec.bit_rate = 0; //FIXME;
-                st->codec.block_align = 128;
+                st->codec->codec_type = CODEC_TYPE_AUDIO;
+                st->codec->codec_id = CODEC_ID_ADPCM_XA;
+                st->codec->codec_tag = 0;  /* no fourcc */
+                st->codec->channels = (fmt&1)?2:1;
+                st->codec->sample_rate = (fmt&4)?18900:37800;
+            //    st->codec->bit_rate = 0; //FIXME;
+                st->codec->block_align = 128;
             }
             break;
 
@@ -231,7 +232,7 @@ if (str->video_channel != -1)
     str->channels[str->video_channel].width,
     str->channels[str->video_channel].height,str->channels[str->video_channel].video_stream_index);
 if (str->audio_channel != -1)
-   av_log (s, AV_LOG_DEBUG, " audio channel = %d, %d Hz, %d channels, %d bits/sample %d\n", 
+   av_log (s, AV_LOG_DEBUG, " audio channel = %d, %d Hz, %d channels, %d bits/sample %d\n",
     str->audio_channel,
     str->channels[str->audio_channel].sample_rate,
     str->channels[str->audio_channel].channels,
@@ -257,7 +258,7 @@ static int str_read_packet(AVFormatContext *s,
     while (!packet_read) {
 
         if (get_buffer(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE)
-            return -EIO;
+            return AVERROR_IO;
 
         channel = sector[0x11];
         if (channel >= 32)
@@ -279,9 +280,10 @@ static int str_read_packet(AVFormatContext *s,
                 pkt = &str->tmp_pkt;
                 if (current_sector == 0) {
                     if (av_new_packet(pkt, frame_size))
-                        return -EIO;
+                        return AVERROR_IO;
 
-                    pkt->stream_index = 
+                    pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
+                    pkt->stream_index =
                         str->channels[channel].video_stream_index;
                //     pkt->pts = str->pts;
 
@@ -315,10 +317,10 @@ printf (" dropping audio sector\n");
             if (channel == str->audio_channel) {
                 pkt = ret_pkt;
                 if (av_new_packet(pkt, 2304))
-                    return -EIO;
+                    return AVERROR_IO;
                 memcpy(pkt->data,sector+24,2304);
 
-                pkt->stream_index = 
+                pkt->stream_index =
                     str->channels[channel].audio_stream_index;
                 //pkt->pts = str->pts;
                 return 0;
@@ -334,7 +336,7 @@ printf (" dropping other sector\n");
         }
 
         if (url_feof(pb))
-            return -EIO;
+            return AVERROR_IO;
     }
 
     return ret;
@@ -349,7 +351,7 @@ static int str_read_close(AVFormatContext *s)
     return 0;
 }
 
-static AVInputFormat str_iformat = {
+AVInputFormat str_demuxer = {
     "psxstr",
     "Sony Playstation STR format",
     sizeof(StrDemuxContext),
@@ -358,9 +360,3 @@ static AVInputFormat str_iformat = {
     str_read_packet,
     str_read_close,
 };
-
-int str_init(void)
-{
-    av_register_input_format(&str_iformat);
-    return 0;
-}