Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / amr.c

diff --git a/libavformat/amr.c b/libavformat/amr.c
index 12b2b7fe58e7c2c5deba9be415548fd34f044022..36ff9b036a862369f1ffaa41f24532d30e9c4f35 100644 (file)
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -2,20 +2,20 @@
  * amr file format
  * Copyright (c) 2001 ffmpeg project
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -25,6 +25,7 @@ Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.tx
 Only mono files are supported.
 
 */
+#include "libavutil/avassert.h"
 #include "avformat.h"
 #include "internal.h"
 
@@ -39,9 +40,9 @@ static int amr_write_header(AVFormatContext *s)
 
     s->priv_data = NULL;
 
-    if (enc->codec_id == CODEC_ID_AMR_NB) {
+    if (enc->codec_id == AV_CODEC_ID_AMR_NB) {
         avio_write(pb, AMR_header,   sizeof(AMR_header)   - 1); /* magic number */
-    } else if (enc->codec_id == CODEC_ID_AMR_WB) {
+    } else if (enc->codec_id == AV_CODEC_ID_AMR_WB) {
         avio_write(pb, AMRWB_header, sizeof(AMRWB_header) - 1); /* magic number */
     } else {
         return -1;
@@ -89,11 +90,11 @@ static int amr_read_header(AVFormatContext *s)
         }
 
         st->codec->codec_tag   = MKTAG('s', 'a', 'w', 'b');
-        st->codec->codec_id    = CODEC_ID_AMR_WB;
+        st->codec->codec_id    = AV_CODEC_ID_AMR_WB;
         st->codec->sample_rate = 16000;
     } else {
         st->codec->codec_tag   = MKTAG('s', 'a', 'm', 'r');
-        st->codec->codec_id    = CODEC_ID_AMR_NB;
+        st->codec->codec_id    = AV_CODEC_ID_AMR_NB;
         st->codec->sample_rate = 8000;
     }
     st->codec->channels   = 1;
@@ -109,7 +110,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
     int read, size = 0, toc, mode;
     int64_t pos = avio_tell(s->pb);
 
-    if (s->pb->eof_reached) {
+    if (url_feof(s->pb)) {
         return AVERROR(EIO);
     }
 
@@ -117,20 +118,20 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
     toc  = avio_r8(s->pb);
     mode = (toc >> 3) & 0x0F;
 
-    if (enc->codec_id == CODEC_ID_AMR_NB) {
+    if (enc->codec_id == AV_CODEC_ID_AMR_NB) {
         static const uint8_t packed_size[16] = {
             12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0
         };
 
         size = packed_size[mode] + 1;
-    } else if(enc->codec_id == CODEC_ID_AMR_WB) {
-        static uint8_t packed_size[16] = {
+    } else if (enc->codec_id == AV_CODEC_ID_AMR_WB) {
+        static const uint8_t packed_size[16] = {
             18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1
         };
 
         size = packed_size[mode];
     } else {
-        assert(0);
+        av_assert0(0);
     }
 
     if (!size || av_new_packet(pkt, size))
@@ -142,7 +143,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
     pkt->stream_index = 0;
     pkt->pos          = pos;
     pkt->data[0]      = toc;
-    pkt->duration     = enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320;
+    pkt->duration     = enc->codec_id == AV_CODEC_ID_AMR_NB ? 160 : 320;
     read              = avio_read(s->pb, pkt->data + 1, size - 1);
 
     if (read != size - 1) {
@@ -156,7 +157,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
 #if CONFIG_AMR_DEMUXER
 AVInputFormat ff_amr_demuxer = {
     .name           = "amr",
-    .long_name      = NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("3GPP AMR"),
     .read_probe     = amr_probe,
     .read_header    = amr_read_header,
     .read_packet    = amr_read_packet,
@@ -167,11 +168,11 @@ AVInputFormat ff_amr_demuxer = {
 #if CONFIG_AMR_MUXER
 AVOutputFormat ff_amr_muxer = {
     .name              = "amr",
-    .long_name         = NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
+    .long_name         = NULL_IF_CONFIG_SMALL("3GPP AMR"),
     .mime_type         = "audio/amr",
     .extensions        = "amr",
-    .audio_codec       = CODEC_ID_AMR_NB,
-    .video_codec       = CODEC_ID_NONE,
+    .audio_codec       = AV_CODEC_ID_AMR_NB,
+    .video_codec       = AV_CODEC_ID_NONE,
     .write_header      = amr_write_header,
     .write_packet      = amr_write_packet,
 };