Merge remote-tracking branch 'qatar/master'

* qatar/master: (42 commits)
  swscale: fix signed overflow in yuv2mono_X_c_template
  snow: fix integer overflows
  svq1enc: remove stale altivec-related hack
  snow: fix signed overflow in byte to 32-bit replication
  adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
  avformat: add CRI ADX format demuxer
  adx: add an ADX parser.
  adx: move header decoding to ADX common code
  adx: calculate the number of blocks in a packet
  adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
  adx: check for unsupported ADX formats
  adx: simplify encoding by using put_sbits()
  adx: calculate correct LPC coeffs
  adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
  adx: simplify adx_decode() by using get_sbits() to read residual samples
  adx: fix the data offset parsing in adx_decode_header()
  adx: remove unneeded post-decode channel interleaving
  adx: validate header values
  adx: cosmetics: general pretty-printing and comment clean-up
  adx: remove useless comments
  ...

Conflicts:
	Changelog
	libavcodec/cook.c
	libavcodec/fraps.c
	libavcodec/nuv.c
	libavcodec/pthread.c
	libavcodec/version.h
	libavformat/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

6 files changed, 117 insertions, 4 deletions

diff --git a/libavformat/Makefile b/libavformat/Makefile
index b597a65fd2..3581a3d2d5 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -25,6 +25,7 @@ OBJS-$(CONFIG_AC3_DEMUXER)               += ac3dec.o rawdec.o
 OBJS-$(CONFIG_AC3_MUXER)                 += rawenc.o
 OBJS-$(CONFIG_ACT_DEMUXER)               += act.o
 OBJS-$(CONFIG_ADF_DEMUXER)               += bintext.o sauce.o
+OBJS-$(CONFIG_ADX_DEMUXER)               += adxdec.o
 OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o
 OBJS-$(CONFIG_AEA_DEMUXER)               += aea.o pcm.o
 OBJS-$(CONFIG_AIFF_DEMUXER)              += aiffdec.o riff.o pcm.o isom.o
diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
new file mode 100644
index 0000000000..eff26982ea
--- /dev/null
+++ b/libavformat/adxdec.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2011 Justin Ruggles
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * CRI ADX demuxer
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/adx.h"
+#include "avformat.h"
+
+#define BLOCK_SIZE    18
+#define BLOCK_SAMPLES 32
+
+typedef struct ADXDemuxerContext {
+    int header_size;
+} ADXDemuxerContext;
+
+static int adx_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    ADXDemuxerContext *c = s->priv_data;
+    AVCodecContext *avctx = s->streams[0]->codec;
+    int ret, size;
+
+    size = BLOCK_SIZE * avctx->channels;
+
+    pkt->pos = avio_tell(s->pb);
+    pkt->stream_index = 0;
+
+    ret = av_get_packet(s->pb, pkt, size);
+    if (ret != size) {
+        av_free_packet(pkt);
+        return ret < 0 ? ret : AVERROR(EIO);
+    }
+    if (AV_RB16(pkt->data) & 0x8000) {
+        av_free_packet(pkt);
+        return AVERROR_EOF;
+    }
+    pkt->size     = size;
+    pkt->duration = 1;
+    pkt->pts      = (pkt->pos - c->header_size) / size;
+
+    return 0;
+}
+
+static int adx_read_header(AVFormatContext *s, AVFormatParameters *ap)
+{
+    ADXDemuxerContext *c = s->priv_data;
+    AVCodecContext *avctx;
+    int ret;
+
+    AVStream *st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+    avctx = s->streams[0]->codec;
+
+    if (avio_rb16(s->pb) != 0x8000)
+        return AVERROR_INVALIDDATA;
+    c->header_size = avio_rb16(s->pb) + 4;
+    avio_seek(s->pb, -4, SEEK_CUR);
+
+    avctx->extradata = av_mallocz(c->header_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!avctx->extradata)
+        return AVERROR(ENOMEM);
+    if (avio_read(s->pb, avctx->extradata, c->header_size) < c->header_size) {
+        av_freep(&avctx->extradata);
+        return AVERROR(EIO);
+    }
+    avctx->extradata_size = c->header_size;
+
+    ret = avpriv_adx_decode_header(avctx, avctx->extradata,
+                                   avctx->extradata_size, &c->header_size,
+                                   NULL);
+    if (ret)
+        return ret;
+
+    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+    st->codec->codec_id    = s->iformat->value;
+
+    av_set_pts_info(st, 64, BLOCK_SAMPLES, avctx->sample_rate);
+
+    return 0;
+}
+
+AVInputFormat ff_adx_demuxer = {
+    .name           = "adx",
+    .long_name      = NULL_IF_CONFIG_SMALL("CRI ADX"),
+    .priv_data_size = sizeof(ADXDemuxerContext),
+    .read_header    = adx_read_header,
+    .read_packet    = adx_read_packet,
+    .extensions     = "adx",
+    .value          = CODEC_ID_ADPCM_ADX,
+};
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 31fa5060f7..9ba459dd92 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -54,6 +54,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (ACT, act);
     REGISTER_DEMUXER  (ADF, adf);
     REGISTER_MUXER    (ADTS, adts);
+    REGISTER_DEMUXER  (ADX, adx);
     REGISTER_DEMUXER  (AEA, aea);
     REGISTER_MUXDEMUX (AIFF, aiff);
     REGISTER_MUXDEMUX (AMR, amr);
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 0199ee1f5f..8a49bef1dc 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -172,6 +172,7 @@ static int film_read_header(AVFormatContext *s,
         if (film->audio_type == CODEC_ID_ADPCM_ADX) {
             st->codec->bits_per_coded_sample = 18 * 8 / 32;
             st->codec->block_align = st->codec->channels * 18;
+            st->need_parsing = AVSTREAM_PARSE_FULL;
         } else {
             st->codec->bits_per_coded_sample = film->audio_bits;
             st->codec->block_align = st->codec->channels *
diff --git a/libavformat/sol.c b/libavformat/sol.c
index cd5b2d75a4..7faa4e78b8 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -23,7 +23,7 @@
  * Based on documents from Game Audio Player and own research
  */
 
-#include "libavutil/bswap.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "pcm.h"
 
@@ -33,8 +33,7 @@
 static int sol_probe(AVProbeData *p)
 {
     /* check file header */
-    uint16_t magic;
-    magic=av_le2ne16(*((uint16_t*)p->buf));
+    uint16_t magic = AV_RL32(p->buf);
     if ((magic == 0x0B8D || magic == 0x0C0D || magic == 0x0C8D) &&
         p->buf[2] == 'S' && p->buf[3] == 'O' &&
         p->buf[4] == 'L' && p->buf[5] == 0)
diff --git a/libavformat/version.h b/libavformat/version.h
index 5c7ed6863e..c98ff60399 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -24,7 +24,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 53
-#define LIBAVFORMAT_VERSION_MINOR 21
+#define LIBAVFORMAT_VERSION_MINOR 22
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \