frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavformat / avs.c

diff --git a/libavformat/avs.c b/libavformat/avs.c
index 5325ff6610895540b2930d993eb4b9ab75496b4e..1fcb19fddeacb4aac19af8e75b86c77f8135f34d 100644 (file)
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avformat.h"
@@ -24,7 +24,7 @@
 
 
 typedef struct avs_format {
-    voc_dec_context_t voc;
+    VocDecContext voc;
     AVStream *st_video;
     AVStream *st_audio;
     int width;
@@ -34,14 +34,15 @@ typedef struct avs_format {
     int nb_frames;
     int remaining_frame_size;
     int remaining_audio_size;
-} avs_format_t;
+} AvsFormat;
 
 typedef enum avs_block_type {
+    AVS_NONE      = 0x00,
     AVS_VIDEO     = 0x01,
     AVS_AUDIO     = 0x02,
     AVS_PALETTE   = 0x03,
     AVS_GAME_DATA = 0x04,
-} avs_block_type_t;
+} AvsBlockType;
 
 static int avs_probe(AVProbeData * p)
 {
@@ -56,16 +57,16 @@ static int avs_probe(AVProbeData * p)
 
 static int avs_read_header(AVFormatContext * s, AVFormatParameters * ap)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
 
     s->ctx_flags |= AVFMTCTX_NOHEADER;
 
-    url_fskip(&s->pb, 4);
-    avs->width = get_le16(&s->pb);
-    avs->height = get_le16(&s->pb);
-    avs->bits_per_sample = get_le16(&s->pb);
-    avs->fps = get_le16(&s->pb);
-    avs->nb_frames = get_le32(&s->pb);
+    url_fskip(s->pb, 4);
+    avs->width = get_le16(s->pb);
+    avs->height = get_le16(s->pb);
+    avs->bits_per_sample = get_le16(s->pb);
+    avs->fps = get_le16(s->pb);
+    avs->nb_frames = get_le32(s->pb);
     avs->remaining_frame_size = 0;
     avs->remaining_audio_size = 0;
 
@@ -81,10 +82,10 @@ static int avs_read_header(AVFormatContext * s, AVFormatParameters * ap)
 
 static int
 avs_read_video_packet(AVFormatContext * s, AVPacket * pkt,
-                      avs_block_type_t type, int sub_type, int size,
+                      AvsBlockType type, int sub_type, int size,
                       uint8_t * palette, int palette_size)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
     int ret;
 
     ret = av_new_packet(pkt, size + palette_size);
@@ -103,10 +104,10 @@ avs_read_video_packet(AVFormatContext * s, AVPacket * pkt,
     pkt->data[palette_size + 1] = type;
     pkt->data[palette_size + 2] = size & 0xFF;
     pkt->data[palette_size + 3] = (size >> 8) & 0xFF;
-    ret = get_buffer(&s->pb, pkt->data + palette_size + 4, size - 4) + 4;
+    ret = get_buffer(s->pb, pkt->data + palette_size + 4, size - 4) + 4;
     if (ret < size) {
         av_free_packet(pkt);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     pkt->size = ret + palette_size;
@@ -119,15 +120,15 @@ avs_read_video_packet(AVFormatContext * s, AVPacket * pkt,
 
 static int avs_read_audio_packet(AVFormatContext * s, AVPacket * pkt)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
     int ret, size;
 
-    size = url_ftell(&s->pb);
+    size = url_ftell(s->pb);
     ret = voc_get_packet(s, pkt, avs->st_audio, avs->remaining_audio_size);
-    size = url_ftell(&s->pb) - size;
+    size = url_ftell(s->pb) - size;
     avs->remaining_audio_size -= size;
 
-    if (ret == AVERROR_IO)
+    if (ret == AVERROR(EIO))
         return 0;    /* this indicate EOS */
     if (ret < 0)
         return ret;
@@ -140,9 +141,9 @@ static int avs_read_audio_packet(AVFormatContext * s, AVPacket * pkt)
 
 static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
 {
-    avs_format_t *avs = s->priv_data;
+    AvsFormat *avs = s->priv_data;
     int sub_type = 0, size = 0;
-    avs_block_type_t type = 0;
+    AvsBlockType type = AVS_NONE;
     int palette_size = 0;
     uint8_t palette[4 + 3 * 256];
     int ret;
@@ -153,22 +154,22 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
 
     while (1) {
         if (avs->remaining_frame_size <= 0) {
-            if (!get_le16(&s->pb))    /* found EOF */
-                return AVERROR_IO;
-            avs->remaining_frame_size = get_le16(&s->pb) - 4;
+            if (!get_le16(s->pb))    /* found EOF */
+                return AVERROR(EIO);
+            avs->remaining_frame_size = get_le16(s->pb) - 4;
         }
 
         while (avs->remaining_frame_size > 0) {
-            sub_type = get_byte(&s->pb);
-            type = get_byte(&s->pb);
-            size = get_le16(&s->pb);
+            sub_type = get_byte(s->pb);
+            type = get_byte(s->pb);
+            size = get_le16(s->pb);
             avs->remaining_frame_size -= size;
 
             switch (type) {
             case AVS_PALETTE:
-                ret = get_buffer(&s->pb, palette, size - 4);
+                ret = get_buffer(s->pb, palette, size - 4);
                 if (ret < size - 4)
-                    return AVERROR_IO;
+                    return AVERROR(EIO);
                 palette_size = size;
                 break;
 
@@ -176,12 +177,12 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
                 if (!avs->st_video) {
                     avs->st_video = av_new_stream(s, AVS_VIDEO);
                     if (avs->st_video == NULL)
-                        return AVERROR_NOMEM;
+                        return AVERROR(ENOMEM);
                     avs->st_video->codec->codec_type = CODEC_TYPE_VIDEO;
                     avs->st_video->codec->codec_id = CODEC_ID_AVS;
                     avs->st_video->codec->width = avs->width;
                     avs->st_video->codec->height = avs->height;
-                    avs->st_video->codec->bits_per_sample=avs->bits_per_sample;
+                    avs->st_video->codec->bits_per_coded_sample=avs->bits_per_sample;
                     avs->st_video->nb_frames = avs->nb_frames;
                     avs->st_video->codec->time_base = (AVRational) {
                     1, avs->fps};
@@ -193,7 +194,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
                 if (!avs->st_audio) {
                     avs->st_audio = av_new_stream(s, AVS_AUDIO);
                     if (avs->st_audio == NULL)
-                        return AVERROR_NOMEM;
+                        return AVERROR(ENOMEM);
                     avs->st_audio->codec->codec_type = CODEC_TYPE_AUDIO;
                 }
                 avs->remaining_audio_size = size - 4;
@@ -203,7 +204,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
                 break;
 
             default:
-                url_fskip(&s->pb, size - 4);
+                url_fskip(s->pb, size - 4);
             }
         }
     }
@@ -216,8 +217,8 @@ static int avs_read_close(AVFormatContext * s)
 
 AVInputFormat avs_demuxer = {
     "avs",
-    "avs format",
-    sizeof(avs_format_t),
+    NULL_IF_CONFIG_SMALL("AVS format"),
+    sizeof(AvsFormat),
     avs_probe,
     avs_read_header,
     avs_read_packet,