]> git.sesse.net Git - ffmpeg/blobdiff - libavformat/westwood.c
projects / ffmpeg / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add some const keywords in rtjpeg decoder
[ffmpeg] / libavformat / westwood.c
diff --git a/libavformat/westwood.c b/libavformat/westwood.c
index e91b2e4d75d82fe0b9bd7d672cfcb5c1b58572ce..268f2e71ee1030fc1645dfbd516c9b5fb62992b7 100644 (file)
--- a/libavformat/westwood.c
+++ b/libavformat/westwood.c
@@ -101,7 +101,7 @@ static int wsaud_probe(AVProbeData *p)
         return 0;
 
     /* check sample rate */
-    field = LE_16(&p->buf[0]);
+    field = AV_RL16(&p->buf[0]);
     if ((field < 8000) || (field > 48000))
         return 0;
 
@@ -117,14 +117,14 @@ static int wsaud_probe(AVProbeData *p)
 static int wsaud_read_header(AVFormatContext *s,
                              AVFormatParameters *ap)
 {
-    WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsAudDemuxContext *wsaud = s->priv_data;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
     unsigned char header[AUD_HEADER_SIZE];
 
     if (get_buffer(pb, header, AUD_HEADER_SIZE) != AUD_HEADER_SIZE)
-        return AVERROR_IO;
-    wsaud->audio_samplerate = LE_16(&header[0]);
+        return AVERROR(EIO);
+    wsaud->audio_samplerate = AV_RL16(&header[0]);
     if (header[11] == 99)
         wsaud->audio_type = CODEC_ID_ADPCM_IMA_WS;
     else
@@ -138,7 +138,7 @@ static int wsaud_read_header(AVFormatContext *s,
     /* initialize the audio decoder stream */
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     av_set_pts_info(st, 33, 1, wsaud->audio_samplerate);
     st->codec->codec_type = CODEC_TYPE_AUDIO;
     st->codec->codec_id = wsaud->audio_type;
@@ -159,24 +159,24 @@ static int wsaud_read_header(AVFormatContext *s,
 static int wsaud_read_packet(AVFormatContext *s,
                              AVPacket *pkt)
 {
-    WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsAudDemuxContext *wsaud = s->priv_data;
+    ByteIOContext *pb = s->pb;
     unsigned char preamble[AUD_CHUNK_PREAMBLE_SIZE];
     unsigned int chunk_size;
     int ret = 0;
 
     if (get_buffer(pb, preamble, AUD_CHUNK_PREAMBLE_SIZE) !=
         AUD_CHUNK_PREAMBLE_SIZE)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     /* validate the chunk */
-    if (LE_32(&preamble[4]) != AUD_CHUNK_SIGNATURE)
+    if (AV_RL32(&preamble[4]) != AUD_CHUNK_SIGNATURE)
         return AVERROR_INVALIDDATA;
 
-    chunk_size = LE_16(&preamble[0]);
+    chunk_size = AV_RL16(&preamble[0]);
     ret= av_get_packet(pb, pkt, chunk_size);
     if (ret != chunk_size)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     pkt->stream_index = wsaud->audio_stream_index;
     pkt->pts = wsaud->audio_frame_counter;
     pkt->pts /= wsaud->audio_samplerate;
@@ -189,7 +189,7 @@ static int wsaud_read_packet(AVFormatContext *s,
 
 static int wsaud_read_close(AVFormatContext *s)
 {
-//    WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data;
+//    WsAudDemuxContext *wsaud = s->priv_data;
 
     return 0;
 }
@@ -202,8 +202,8 @@ static int wsvqa_probe(AVProbeData *p)
         return 0;
 
     /* check for the VQA signatures */
-    if ((BE_32(&p->buf[0]) != FORM_TAG) ||
-        (BE_32(&p->buf[8]) != WVQA_TAG))
+    if ((AV_RB32(&p->buf[0]) != FORM_TAG) ||
+        (AV_RB32(&p->buf[8]) != WVQA_TAG))
         return 0;
 
     return AVPROBE_SCORE_MAX;
@@ -212,8 +212,8 @@ static int wsvqa_probe(AVProbeData *p)
 static int wsvqa_read_header(AVFormatContext *s,
                              AVFormatParameters *ap)
 {
-    WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsVqaDemuxContext *wsvqa = s->priv_data;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
     unsigned char *header;
     unsigned char scratch[VQA_PREAMBLE_SIZE];
@@ -223,8 +223,8 @@ static int wsvqa_read_header(AVFormatContext *s,
     /* initialize the video decoder stream */
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
-    av_set_pts_info(st, 33, 1, 90000);
+        return AVERROR(ENOMEM);
+    av_set_pts_info(st, 33, 1, VQA_FRAMERATE);
     wsvqa->video_stream_index = st->index;
     st->codec->codec_type = CODEC_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_WS_VQA;
@@ -240,27 +240,24 @@ static int wsvqa_read_header(AVFormatContext *s,
     if (get_buffer(pb, st->codec->extradata, VQA_HEADER_SIZE) !=
         VQA_HEADER_SIZE) {
         av_free(st->codec->extradata);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
-    st->codec->width = LE_16(&header[6]);
-    st->codec->height = LE_16(&header[8]);
-
-    st->codec->time_base.num = 1;
-    st->codec->time_base.den = VQA_FRAMERATE;
+    st->codec->width = AV_RL16(&header[6]);
+    st->codec->height = AV_RL16(&header[8]);
 
     /* initialize the audio decoder stream for VQA v1 or nonzero samplerate */
-    if (LE_16(&header[24]) || (LE_16(&header[0]) == 1 && LE_16(&header[2]) == 1)) {
+    if (AV_RL16(&header[24]) || (AV_RL16(&header[0]) == 1 && AV_RL16(&header[2]) == 1)) {
         st = av_new_stream(s, 0);
         if (!st)
-            return AVERROR_NOMEM;
-        av_set_pts_info(st, 33, 1, 90000);
+            return AVERROR(ENOMEM);
+        av_set_pts_info(st, 33, 1, VQA_FRAMERATE);
         st->codec->codec_type = CODEC_TYPE_AUDIO;
-        if (LE_16(&header[0]) == 1)
+        if (AV_RL16(&header[0]) == 1)
             st->codec->codec_id = CODEC_ID_WESTWOOD_SND1;
         else
             st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS;
         st->codec->codec_tag = 0;  /* no tag */
-        st->codec->sample_rate = LE_16(&header[24]);
+        st->codec->sample_rate = AV_RL16(&header[24]);
         if (!st->codec->sample_rate)
             st->codec->sample_rate = 22050;
         st->codec->channels = header[26];
@@ -282,10 +279,10 @@ static int wsvqa_read_header(AVFormatContext *s,
     do {
         if (get_buffer(pb, scratch, VQA_PREAMBLE_SIZE) != VQA_PREAMBLE_SIZE) {
             av_free(st->codec->extradata);
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
-        chunk_tag = BE_32(&scratch[0]);
-        chunk_size = BE_32(&scratch[4]);
+        chunk_tag = AV_RB32(&scratch[0]);
+        chunk_size = AV_RB32(&scratch[4]);
 
         /* catch any unknown header tags, for curiousity */
         switch (chunk_tag) {
@@ -317,8 +314,8 @@ static int wsvqa_read_header(AVFormatContext *s,
 static int wsvqa_read_packet(AVFormatContext *s,
                              AVPacket *pkt)
 {
-    WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsVqaDemuxContext *wsvqa = s->priv_data;
+    ByteIOContext *pb = s->pb;
     int ret = -1;
     unsigned char preamble[VQA_PREAMBLE_SIZE];
     unsigned int chunk_type;
@@ -326,41 +323,30 @@ static int wsvqa_read_packet(AVFormatContext *s,
     int skip_byte;
 
     while (get_buffer(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) {
-        chunk_type = BE_32(&preamble[0]);
-        chunk_size = BE_32(&preamble[4]);
+        chunk_type = AV_RB32(&preamble[0]);
+        chunk_size = AV_RB32(&preamble[4]);
         skip_byte = chunk_size & 0x01;
 
         if ((chunk_type == SND1_TAG) || (chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) {
 
             if (av_new_packet(pkt, chunk_size))
-                return AVERROR_IO;
+                return AVERROR(EIO);
             ret = get_buffer(pb, pkt->data, chunk_size);
             if (ret != chunk_size) {
                 av_free_packet(pkt);
-                return AVERROR_IO;
+                return AVERROR(EIO);
             }
 
             if (chunk_type == SND2_TAG) {
                 pkt->stream_index = wsvqa->audio_stream_index;
-
-                pkt->pts = 90000;
-                pkt->pts *= wsvqa->audio_frame_counter;
-                pkt->pts /= wsvqa->audio_samplerate;
-
                 /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */
                 wsvqa->audio_frame_counter += (chunk_size * 2) / wsvqa->audio_channels;
             } else if(chunk_type == SND1_TAG) {
                 pkt->stream_index = wsvqa->audio_stream_index;
-
-                pkt->pts = 90000;
-                pkt->pts *= wsvqa->audio_frame_counter;
-                pkt->pts /= wsvqa->audio_samplerate;
-
                 /* unpacked size is stored in header */
-                wsvqa->audio_frame_counter += LE_16(pkt->data) / wsvqa->audio_channels;
+                wsvqa->audio_frame_counter += AV_RL16(pkt->data) / wsvqa->audio_channels;
             } else {
                 pkt->stream_index = wsvqa->video_stream_index;
-                pkt->pts = wsvqa->video_pts;
                 wsvqa->video_pts += VQA_VIDEO_PTS_INC;
             }
             /* stay on 16-bit alignment */
@@ -385,7 +371,7 @@ static int wsvqa_read_packet(AVFormatContext *s,
 
 static int wsvqa_read_close(AVFormatContext *s)
 {
-//    WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data;
+//    WsVqaDemuxContext *wsvqa = s->priv_data;
 
     return 0;
 }
Unnamed repository; edit this file 'description' to name the repository.