@@ -137,6 +137,7 @@ easier to use. The changes are:

 - cellauto source

 - v410 Quicktime Uncompressed 4:4:4 10-bit encoder and decoder

 - SBaGen (SBG) binaural beats script demuxer

+- OpenMG Audio muxer

 version 0.8:

@@ -31,6 +31,9 @@ API changes, most recent first:

 2011-10-20 - b35e9e1 - lavu 51.22.0

   Add av_strtok() to avstring.h.

+2011-12-18 - 8400b12 - lavc 53.28.1

+  Deprecate AVFrame.age. The field is unused.

+

 2011-xx-xx - xxxxxxx - lavf 53.17.0

   Add avformat_open_input().

   Deprecate av_close_input_file() and av_close_input_stream().

@@ -317,7 +317,7 @@ library:

     @tab Used in Sierra CD-ROM games.

 @item Smacker                   @tab   @tab X

     @tab Multimedia format used by many games.

-@item Sony OpenMG (OMA)         @tab   @tab X

+@item Sony OpenMG (OMA)         @tab X @tab X

     @tab Audio format used in Sony Sonic Stage and Sony Vegas.

 @item Sony PlayStation STR      @tab   @tab X

 @item Sony Wave64 (W64)         @tab   @tab X

@@ -1583,7 +1583,6 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)

         pic->linesize[i] = ref->linesize[i];

     }

     pic->opaque = ref;

-    pic->age    = INT_MAX;

     pic->type   = FF_BUFFER_TYPE_USER;

     pic->reordered_opaque = codec->reordered_opaque;

     if(codec->pkt) pic->pkt_pts = codec->pkt->pts;

@@ -440,15 +440,6 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){

         dst += 8*stride;

     }

-    if(   bitstream_size != (get_bits_count(&f->gb)+31)/32*4

-       || (((const char*)f->wordstream - (const char*)buf + 2)&~2) != extra + bitstream_size + wordstream_size

-       || (((const char*)f->bytestream - (const char*)buf + 3)&~3) != extra + bitstream_size + wordstream_size + bytestream_size)

-        av_log(f->avctx, AV_LOG_ERROR, " %d %td %td bytes left\n",

-            bitstream_size - (get_bits_count(&f->gb)+31)/32*4,

-            -(((const char*)f->bytestream - (const char*)buf + 3)&~3) + (extra + bitstream_size + wordstream_size + bytestream_size),

-            -(((const char*)f->wordstream - (const char*)buf + 2)&~2) + (extra + bitstream_size + wordstream_size)

-        );

-

     return 0;

 }

@@ -1029,13 +1029,12 @@ typedef struct AVFrame {

      */

     int quality;

+#if FF_API_AVFRAME_AGE

     /**

-     * buffer age (1->was last buffer and dint change, 2->..., ...).

-     * Set to INT_MAX if the buffer has not been used yet.

-     * - encoding: unused

-     * - decoding: MUST be set by get_buffer() for video.

+     * @deprecated unused

      */

-    int age;

+    attribute_deprecated int age;

+#endif

     /**

      * is this picture used as reference

@@ -30,7 +30,6 @@

 #include "avcodec.h"

 typedef struct InternalBuffer {

-    int last_pic_num;

     uint8_t *base[AV_NUM_DATA_POINTERS];

     uint8_t *data[AV_NUM_DATA_POINTERS];

     int linesize[AV_NUM_DATA_POINTERS];

@@ -263,9 +263,9 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)

     else

         r = avcodec_default_get_buffer(s->avctx, (AVFrame *) pic);

-    if (r < 0 || !pic->f.age || !pic->f.type || !pic->f.data[0]) {

-        av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n",

-               r, pic->f.age, pic->f.type, pic->f.data[0]);

+    if (r < 0 || !pic->f.type || !pic->f.data[0]) {

+        av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %p)\n",

+               r, pic->f.type, pic->f.data[0]);

         av_freep(&pic->f.hwaccel_picture_private);

         return -1;

     }

@@ -369,15 +369,6 @@ int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared)

                           1 * sizeof(AVPanScan), fail)

     }

-    /* It might be nicer if the application would keep track of these

-     * but it would require an API change. */

-    memmove(s->prev_pict_types + 1, s->prev_pict_types,

-            PREV_PICT_TYPES_BUFFER_SIZE-1);

-    s->prev_pict_types[0] =  s->dropable ? AV_PICTURE_TYPE_B : s->pict_type;

-    if (pic->f.age < PREV_PICT_TYPES_BUFFER_SIZE &&

-        s->prev_pict_types[pic->f.age] == AV_PICTURE_TYPE_B)

-        pic->f.age = INT_MAX; // Skipped MBs in B-frames are quite rare in MPEG-1/2

-                              // and it is a bit tricky to skip them anyway.

     pic->owner2 = s;

     return 0;

@@ -574,9 +565,6 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,

     s->current_picture_ptr = REBASE_PICTURE(s1->current_picture_ptr, s, s1);

     s->next_picture_ptr    = REBASE_PICTURE(s1->next_picture_ptr,    s, s1);

-    memcpy(s->prev_pict_types, s1->prev_pict_types,

-           PREV_PICT_TYPES_BUFFER_SIZE);

-

     // Error/bug resilience

     s->next_p_frame_damaged = s1->next_p_frame_damaged;

     s->workaround_bugs      = s1->workaround_bugs;

@@ -837,7 +825,6 @@ av_cold int MPV_common_init(MpegEncContext *s)

         /* init macroblock skip table */

         FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size + 2, fail);

         // Note the + 1 is for  a quicker mpeg4 slice_end detection

-        FF_ALLOCZ_OR_GOTO(s->avctx, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE, fail);

         s->parse_context.state = -1;

         if ((s->avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) ||

@@ -928,7 +915,6 @@ void MPV_common_end(MpegEncContext *s)

     av_freep(&s->pred_dir_table);

     av_freep(&s->mbskip_table);

-    av_freep(&s->prev_pict_types);

     av_freep(&s->bitstream_buffer);

     s->allocated_bitstream_buffer_size = 0;

@@ -2201,24 +2187,13 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],

         /* skip only during decoding as we might trash the buffers during encoding a bit */

         if(!s->encoding){

             uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy];

-            const int age = s->current_picture.f.age;

-

-            assert(age);

             if (s->mb_skipped) {

                 s->mb_skipped= 0;

                 assert(s->pict_type!=AV_PICTURE_TYPE_I);

-

-                (*mbskip_ptr) ++; /* indicate that this time we skipped it */

-                if(*mbskip_ptr >99) *mbskip_ptr= 99;

-

-                /* if previous was skipped too, then nothing to do !  */

-                if (*mbskip_ptr >= age && s->current_picture.f.reference){

-                    return;

-                }

+                *mbskip_ptr = 1;

             } else if(!s->current_picture.f.reference) {

-                (*mbskip_ptr) ++; /* increase counter so the age can be compared cleanly */

-                if(*mbskip_ptr >99) *mbskip_ptr= 99;

+                *mbskip_ptr = 1;

             } else{

                 *mbskip_ptr = 0; /* not skipped */

             }

@@ -311,8 +311,6 @@ typedef struct MpegEncContext {

     uint8_t *coded_block;          ///< used for coded block pattern prediction (msmpeg4v3, wmv1)

     int16_t (*ac_val_base)[16];

     int16_t (*ac_val[3])[16];      ///< used for for mpeg4 AC prediction, all 3 arrays must be continuous

-    uint8_t *prev_pict_types;     ///< previous picture types in bitstream order, used for mb skip

-#define PREV_PICT_TYPES_BUFFER_SIZE 256

     int mb_skipped;                ///< MUST BE SET only during DECODING

     uint8_t *mbskip_table;        /**< used to avoid copy if macroblock skipped (for black regions for example)

                                    and used for b-frame encoding & decoding (contains skip table of next P Frame) */

@@ -868,13 +868,6 @@ int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f)

     pthread_mutex_unlock(&p->parent->buffer_mutex);

-    /*

-     * Buffer age is difficult to keep track of between

-     * multiple threads, and the optimizations it allows

-     * are not worth the effort. It is disabled for now.

-     */

-    f->age = INT_MAX;

-

     return err;

 }

@@ -34,14 +34,6 @@ typedef struct TMVContext {

     AVFrame pic;

 } TMVContext;

-static av_cold int tmv_decode_init(AVCodecContext *avctx)

-{

-    TMVContext *tmv = avctx->priv_data;

-

-    avcodec_get_frame_defaults(&tmv->pic);

-    return 0;

-}

-

 static int tmv_decode_frame(AVCodecContext *avctx, void *data,

                             int *data_size, AVPacket *avpkt)

 {

@@ -90,6 +82,14 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data,

     return avpkt->size;

 }

+static av_cold int tmv_decode_init(AVCodecContext *avctx)

+{

+    TMVContext *tmv = avctx->priv_data;

+    avctx->pix_fmt = PIX_FMT_PAL8;

+    avcodec_get_frame_defaults(&tmv->pic);

+    return 0;

+}

+

 static av_cold int tmv_decode_close(AVCodecContext *avctx)

 {

     TMVContext *tmv = avctx->priv_data;

@@ -373,7 +373,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)

     int w= s->width;

     int h= s->height;

     InternalBuffer *buf;

-    int *picture_number;

     AVCodecInternal *avci = s->internal;

     if(pic->data[0]!=NULL) {

@@ -394,8 +393,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)

     }

     buf = &avci->buffer[avci->buffer_count];

-    picture_number = &(avci->buffer[INTERNAL_BUFFER_SIZE]).last_pic_num; //FIXME ugly hack

-    (*picture_number)++;

     if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){

         if(s->active_thread_type&FF_THREAD_FRAME) {

@@ -409,10 +406,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)

         }

     }

-    if(buf->base[0]){

-        pic->age= *picture_number - buf->last_pic_num;

-        buf->last_pic_num= *picture_number;

-    }else{

+    if (!buf->base[0]) {

         int h_chroma_shift, v_chroma_shift;

         int size[4] = {0};

         int tmpsize;

@@ -451,7 +445,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)

             size[i] = picture.data[i+1] - picture.data[i];

         size[i] = tmpsize - (picture.data[i] - picture.data[0]);

-        buf->last_pic_num= -256*256*256*64;

         memset(buf->base, 0, sizeof(buf->base));

         memset(buf->data, 0, sizeof(buf->data));

@@ -480,7 +473,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)

         buf->width  = s->width;

         buf->height = s->height;

         buf->pix_fmt= s->pix_fmt;

-        pic->age= 256*256*256*64;

     }

     pic->type= FF_BUFFER_TYPE_INTERNAL;

@@ -22,7 +22,7 @@

 #define LIBAVCODEC_VERSION_MAJOR 53

 #define LIBAVCODEC_VERSION_MINOR 46

-#define LIBAVCODEC_VERSION_MICRO  0

+#define LIBAVCODEC_VERSION_MICRO  1

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

                                                LIBAVCODEC_VERSION_MINOR, \

@@ -120,5 +120,8 @@

 #define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 54)

 #endif

+#ifndef FF_API_AVFRAME_AGE

+#define FF_API_AVFRAME_AGE (LIBAVCODEC_VERSION_MAJOR < 54)

+#endif

 #endif /* AVCODEC_VERSION_H */

@@ -194,7 +194,8 @@ OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \

                                             vorbiscomment.o

 OBJS-$(CONFIG_OGG_MUXER)                 += oggenc.o \

                                             vorbiscomment.o

-OBJS-$(CONFIG_OMA_DEMUXER)               += oma.o pcm.o

+OBJS-$(CONFIG_OMA_DEMUXER)               += omadec.o pcm.o oma.o

+OBJS-$(CONFIG_OMA_MUXER)                 += omaenc.o rawenc.o oma.o

 OBJS-$(CONFIG_PCM_ALAW_DEMUXER)          += pcmdec.o pcm.o rawdec.o

 OBJS-$(CONFIG_PCM_ALAW_MUXER)            += pcmenc.o rawenc.o

 OBJS-$(CONFIG_PCM_F32BE_DEMUXER)         += pcmdec.o pcm.o rawdec.o

@@ -166,7 +166,7 @@ void av_register_all(void)

     REGISTER_MUXDEMUX (NUT, nut);

     REGISTER_DEMUXER  (NUV, nuv);

     REGISTER_MUXDEMUX (OGG, ogg);

-    REGISTER_DEMUXER  (OMA, oma);

+    REGISTER_MUXDEMUX (OMA, oma);

     REGISTER_MUXDEMUX (PCM_ALAW,  pcm_alaw);

     REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw);

     REGISTER_MUXDEMUX (PCM_F64BE, pcm_f64be);

@@ -1,9 +1,5 @@

 /*

- * Sony OpenMG (OMA) demuxer

- *

- * Copyright (c) 2008 Maxim Poliakovski

- *               2008 Benjamin Larsson

- *               2011 David Goldwich

+ * Sony OpenMG (OMA) common data

  *

  * This file is part of FFmpeg.

  *

@@ -22,446 +18,17 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-/**

- * @file

- * This is a demuxer for Sony OpenMG Music files

- *

- * Known file extensions: ".oma", "aa3"

- * The format of such files consists of three parts:

- * - "ea3" header carrying overall info and metadata. Except for starting with

- *   "ea" instead of "ID", it's an ID3v2 header.

- * - "EA3" header is a Sony-specific header containing information about

- *   the OpenMG file: codec type (usually ATRAC, can also be MP3 or WMA),

- *   codec specific info (packet size, sample rate, channels and so on)

- *   and DRM related info (file encryption, content id).

- * - Sound data organized in packets follow the EA3 header

- *   (can be encrypted using the Sony DRM!).

- *

- * CODEC SUPPORT: Only ATRAC3 codec is currently supported!

- */

-

-#include "avformat.h"

 #include "internal.h"

-#include "libavutil/intreadwrite.h"

-#include "libavutil/des.h"

-#include "pcm.h"

-#include "riff.h"

-#include "id3v2.h"

+#include "oma.h"

+#include "libavcodec/avcodec.h"

-#define EA3_HEADER_SIZE 96

-#define ID3v2_EA3_MAGIC "ea3"

-#define OMA_ENC_HEADER_SIZE 16

+const uint16_t ff_oma_srate_tab[6] = { 320, 441, 480, 882, 960, 0 };

-enum {

-    OMA_CODECID_ATRAC3  = 0,

-    OMA_CODECID_ATRAC3P = 1,

-    OMA_CODECID_MP3     = 3,

-    OMA_CODECID_LPCM    = 4,

-    OMA_CODECID_WMA     = 5,

-};

-

-static const AVCodecTag codec_oma_tags[] = {

-    { CODEC_ID_ATRAC3,      OMA_CODECID_ATRAC3 },

+const AVCodecTag ff_oma_codec_tags[] = {

+    { CODEC_ID_ATRAC3,      OMA_CODECID_ATRAC3  },

     { CODEC_ID_ATRAC3P,     OMA_CODECID_ATRAC3P },

-    { CODEC_ID_MP3,         OMA_CODECID_MP3 },

-    { CODEC_ID_PCM_S16BE,   OMA_CODECID_LPCM },

-};

-

-static const uint64_t leaf_table[] = {

-    0xd79e8283acea4620, 0x7a9762f445afd0d8,

-    0x354d60a60b8c79f1, 0x584e1cde00b07aee,

-    0x1573cd93da7df623, 0x47f98d79620dd535

-};

-

-typedef struct OMAContext {

-    uint64_t content_start;

-    int encrypted;

-    uint16_t k_size;

-    uint16_t e_size;

-    uint16_t i_size;

-    uint16_t s_size;

-    uint32_t rid;

-    uint8_t r_val[24];

-    uint8_t n_val[24];

-    uint8_t m_val[8];

-    uint8_t s_val[8];

-    uint8_t sm_val[8];

-    uint8_t e_val[8];

-    uint8_t iv[8];

-    struct AVDES av_des;

-} OMAContext;

-

-static void hex_log(AVFormatContext *s, int level, const char *name, const uint8_t *value, int len)

-{

-    char buf[33];

-    len = FFMIN(len, 16);

-    if (av_log_get_level() < level)

-        return;

-    ff_data_to_hex(buf, value, len, 1);

-    buf[len<<1] = '\0';

-    av_log(s, level, "%s: %s\n", name, buf);

-}

-

-static int kset(AVFormatContext *s, const uint8_t *r_val, const uint8_t *n_val, int len)

-{

-    OMAContext *oc = s->priv_data;

-

-    if (!r_val && !n_val)

-        return -1;

-

-    len = FFMIN(len, 16);

-

-    /* use first 64 bits in the third round again */

-    if (r_val) {

-        if (r_val != oc->r_val) {

-            memset(oc->r_val, 0, 24);

-            memcpy(oc->r_val, r_val, len);

-        }

-        memcpy(&oc->r_val[16], r_val, 8);

-    }

-    if (n_val) {

-        if (n_val != oc->n_val) {

-            memset(oc->n_val, 0, 24);

-            memcpy(oc->n_val, n_val, len);

-        }

-        memcpy(&oc->n_val[16], n_val, 8);

-    }

-

-    return 0;

-}

-

-static int rprobe(AVFormatContext *s, uint8_t *enc_header, const uint8_t *r_val)

-{

-    OMAContext *oc = s->priv_data;

-    unsigned int pos;

-    struct AVDES av_des;

-

-    if (!enc_header || !r_val)

-        return -1;

-

-    /* m_val */

-    av_des_init(&av_des, r_val, 192, 1);

-    av_des_crypt(&av_des, oc->m_val, &enc_header[48], 1, NULL, 1);

-

-    /* s_val */

-    av_des_init(&av_des, oc->m_val, 64, 0);

-    av_des_crypt(&av_des, oc->s_val, NULL, 1, NULL, 0);

-

-    /* sm_val */

-    pos = OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size;

-    av_des_init(&av_des, oc->s_val, 64, 0);

-    av_des_mac(&av_des, oc->sm_val, &enc_header[pos], (oc->i_size >> 3));

-

-    pos += oc->i_size;

-

-    return memcmp(&enc_header[pos], oc->sm_val, 8) ? -1 : 0;

-}

-

-static int nprobe(AVFormatContext *s, uint8_t *enc_header, int size, const uint8_t *n_val)

-{

-    OMAContext *oc = s->priv_data;

-    uint32_t pos, taglen, datalen;

-    struct AVDES av_des;

-

-    if (!enc_header || !n_val)

-        return -1;

-

-    pos = OMA_ENC_HEADER_SIZE + oc->k_size;

-    if (!memcmp(&enc_header[pos], "EKB ", 4))

-        pos += 32;

-

-    if (AV_RB32(&enc_header[pos]) != oc->rid)

-        av_log(s, AV_LOG_DEBUG, "Mismatching RID\n");

-

-    taglen = AV_RB32(&enc_header[pos+32]);

-    datalen = AV_RB32(&enc_header[pos+36]) >> 4;

-

-    if(taglen + (((uint64_t)datalen)<<4) + 44 > size)

-        return -1;

-

-    pos += 44 + taglen;

-

-    av_des_init(&av_des, n_val, 192, 1);

-    while (datalen-- > 0) {

-        av_des_crypt(&av_des, oc->r_val, &enc_header[pos], 2, NULL, 1);

-        kset(s, oc->r_val, NULL, 16);

-        if (!rprobe(s, enc_header, oc->r_val))

-            return 0;

-        pos += 16;

-    }

-

-    return -1;

-}

-

-static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)

-{

-    OMAContext *oc = s->priv_data;

-    ID3v2ExtraMetaGEOB *geob = NULL;

-    uint8_t *gdata;

-

-    oc->encrypted = 1;

-    av_log(s, AV_LOG_INFO, "File is encrypted\n");

-

-    /* find GEOB metadata */

-    while (em) {

-        if (!strcmp(em->tag, "GEOB") &&

-            (geob = em->data) &&

-            (!strcmp(geob->description, "OMG_LSI") ||

-             !strcmp(geob->description, "OMG_BKLSI"))) {

-            break;

-        }

-        em = em->next;

-    }

-    if (!em) {

-        av_log(s, AV_LOG_ERROR, "No encryption header found\n");

-        return -1;

-    }

-

-    if (geob->datasize < 64) {

-        av_log(s, AV_LOG_ERROR, "Invalid GEOB data size: %u\n", geob->datasize);

-        return -1;

-    }

-

-    gdata = geob->data;

-

-    if (AV_RB16(gdata) != 1)

-        av_log(s, AV_LOG_WARNING, "Unknown version in encryption header\n");

-

-    oc->k_size = AV_RB16(&gdata[2]);

-    oc->e_size = AV_RB16(&gdata[4]);

-    oc->i_size = AV_RB16(&gdata[6]);

-    oc->s_size = AV_RB16(&gdata[8]);

-

-    if (memcmp(&gdata[OMA_ENC_HEADER_SIZE], "KEYRING     ", 12)) {

-        av_log(s, AV_LOG_ERROR, "Invalid encryption header\n");

-        return -1;

-    }

-    oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]);

-    av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid);

-

-    memcpy(oc->iv, &header[0x58], 8);

-    hex_log(s, AV_LOG_DEBUG, "IV", oc->iv, 8);

-

-    hex_log(s, AV_LOG_DEBUG, "CBC-MAC", &gdata[OMA_ENC_HEADER_SIZE+oc->k_size+oc->e_size+oc->i_size], 8);

-

-    if (s->keylen > 0) {

-        kset(s, s->key, s->key, s->keylen);

-    }

-    if (!memcmp(oc->r_val, (const uint8_t[8]){0}, 8) ||

-        rprobe(s, gdata, oc->r_val) < 0 &&

-        nprobe(s, gdata, geob->datasize, oc->n_val) < 0) {

-        int i;

-        for (i = 0; i < sizeof(leaf_table); i += 2) {

-            uint8_t buf[16];

-            AV_WL64(buf, leaf_table[i]);

-            AV_WL64(&buf[8], leaf_table[i+1]);

-            kset(s, buf, buf, 16);

-            if (!rprobe(s, gdata, oc->r_val) || !nprobe(s, gdata, geob->datasize, oc->n_val))

-                break;

-        }

-        if (i >= sizeof(leaf_table)) {

-            av_log(s, AV_LOG_ERROR, "Invalid key\n");

-            return -1;

-        }

-    }

-

-    /* e_val */

-    av_des_init(&oc->av_des, oc->m_val, 64, 0);

-    av_des_crypt(&oc->av_des, oc->e_val, &gdata[OMA_ENC_HEADER_SIZE + 40], 1, NULL, 0);

-    hex_log(s, AV_LOG_DEBUG, "EK", oc->e_val, 8);

-

-    /* init e_val */

-    av_des_init(&oc->av_des, oc->e_val, 64, 1);

-

-    return 0;

-}

-

-static int oma_read_header(AVFormatContext *s,

-                           AVFormatParameters *ap)

-{

-    static const uint16_t srate_tab[6] = {320,441,480,882,960,0};

-    int     ret, framesize, jsflag, samplerate;

-    uint32_t codec_params;

-    int16_t eid;

-    uint8_t buf[EA3_HEADER_SIZE];

-    uint8_t *edata;

-    AVStream *st;

-    ID3v2ExtraMeta *extra_meta = NULL;

-    OMAContext *oc = s->priv_data;

-

-    ff_id3v2_read_all(s, ID3v2_EA3_MAGIC, &extra_meta);

-    ret = avio_read(s->pb, buf, EA3_HEADER_SIZE);

-    if (ret < EA3_HEADER_SIZE)

-        return -1;

-

-    if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}),3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {

-        av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");

-        return -1;

-    }

-

-    oc->content_start = avio_tell(s->pb);

-

-    /* encrypted file */

-    eid = AV_RB16(&buf[6]);

-    if (eid != -1 && eid != -128 && decrypt_init(s, extra_meta, buf) < 0) {

-        ff_id3v2_free_extra_meta(&extra_meta);

-        return -1;

-    }

-

-    ff_id3v2_free_extra_meta(&extra_meta);

-

-    codec_params = AV_RB24(&buf[33]);

-

-    st = avformat_new_stream(s, NULL);

-    if (!st)

-        return AVERROR(ENOMEM);

-

-    st->start_time = 0;

-    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;

-    st->codec->codec_tag   = buf[32];

-    st->codec->codec_id    = ff_codec_get_id(codec_oma_tags, st->codec->codec_tag);

-

-    switch (buf[32]) {

-        case OMA_CODECID_ATRAC3:

-            samplerate = srate_tab[(codec_params >> 13) & 7]*100;

-            if (samplerate != 44100)

-                av_log_ask_for_sample(s, "Unsupported sample rate: %d\n",

-                                      samplerate);

-

-            framesize = (codec_params & 0x3FF) * 8;

-            jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */

-            st->codec->channels    = 2;

-            st->codec->sample_rate = samplerate;

-            st->codec->bit_rate    = st->codec->sample_rate * framesize * 8 / 1024;

-

-            /* fake the atrac3 extradata (wav format, makes stream copy to wav work) */

-            st->codec->extradata_size = 14;

-            edata = av_mallocz(14 + FF_INPUT_BUFFER_PADDING_SIZE);

-            if (!edata)

-                return AVERROR(ENOMEM);

-

-            st->codec->extradata = edata;

-            AV_WL16(&edata[0],  1);             // always 1

-            AV_WL32(&edata[2],  samplerate);    // samples rate

-            AV_WL16(&edata[6],  jsflag);        // coding mode

-            AV_WL16(&edata[8],  jsflag);        // coding mode

-            AV_WL16(&edata[10], 1);             // always 1

-            // AV_WL16(&edata[12], 0);          // always 0

-

-            avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);

-            break;

-        case OMA_CODECID_ATRAC3P:

-            st->codec->channels = (codec_params >> 10) & 7;

-            framesize = ((codec_params & 0x3FF) * 8) + 8;

-            st->codec->sample_rate = srate_tab[(codec_params >> 13) & 7]*100;

-            st->codec->bit_rate    = st->codec->sample_rate * framesize * 8 / 1024;

-            avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);

-            av_log(s, AV_LOG_ERROR, "Unsupported codec ATRAC3+!\n");

-            break;

-        case OMA_CODECID_MP3:

-            st->need_parsing = AVSTREAM_PARSE_FULL;

-            framesize = 1024;

-            break;

-        case OMA_CODECID_LPCM:

-            /* PCM 44.1 kHz 16 bit stereo big-endian */

-            st->codec->channels = 2;

-            st->codec->sample_rate = 44100;

-            framesize = 1024;

-            /* bit rate = sample rate x PCM block align (= 4) x 8 */

-            st->codec->bit_rate = st->codec->sample_rate * 32;

-            st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id);

-            avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);

-            break;

-        default:

-            av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n",buf[32]);

-            return -1;

-    }

-

-    st->codec->block_align = framesize;

-

-    return 0;

-}

-

-

-static int oma_read_packet(AVFormatContext *s, AVPacket *pkt)

-{

-    OMAContext *oc = s->priv_data;

-    int packet_size = s->streams[0]->codec->block_align;

-    int ret = av_get_packet(s->pb, pkt, packet_size);

-

-    if (ret <= 0)

-        return AVERROR(EIO);

-

-    pkt->stream_index = 0;

-

-    if (oc->encrypted) {

-        /* previous unencrypted block saved in IV for the next packet (CBC mode) */

-        av_des_crypt(&oc->av_des, pkt->data, pkt->data, (packet_size >> 3), oc->iv, 1);

-    }

-

-    return ret;

-}

-

-static int oma_read_probe(AVProbeData *p)

-{

-    const uint8_t *buf;

-    unsigned tag_len = 0;

-

-    buf = p->buf;

-

-    if (p->buf_size < ID3v2_HEADER_SIZE ||

-        !ff_id3v2_match(buf, ID3v2_EA3_MAGIC) ||

-        buf[3] != 3 || // version must be 3

-        buf[4]) // flags byte zero

-        return 0;

-

-    tag_len = ff_id3v2_tag_len(buf);

-

-    /* This check cannot overflow as tag_len has at most 28 bits */

-    if (p->buf_size < tag_len + 5)

-        /* EA3 header comes late, might be outside of the probe buffer */

-        return AVPROBE_SCORE_MAX / 2;

-

-    buf += tag_len;

-

-    if (!memcmp(buf, "EA3", 3) && !buf[4] && buf[5] == EA3_HEADER_SIZE)

-        return AVPROBE_SCORE_MAX;

-    else

-        return 0;

-}

-

-static int oma_read_seek(struct AVFormatContext *s, int stream_index, int64_t timestamp, int flags)

-{

-    OMAContext *oc = s->priv_data;

-

-    pcm_read_seek(s, stream_index, timestamp, flags);

-

-    if (oc->encrypted) {

-        /* readjust IV for CBC */

-        int64_t pos = avio_tell(s->pb);

-        if (pos < oc->content_start)

-            memset(oc->iv, 0, 8);

-        else {

-            if (avio_seek(s->pb, -8, SEEK_CUR) < 0 || avio_read(s->pb, oc->iv, 8) < 8) {

-                memset(oc->iv, 0, 8);

-                return -1;

-            }

-        }

-    }

-

-    return 0;

-}

-

-AVInputFormat ff_oma_demuxer = {

-    .name           = "oma",

-    .long_name      = NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),

-    .priv_data_size = sizeof(OMAContext),

-    .read_probe     = oma_read_probe,

-    .read_header    = oma_read_header,

-    .read_packet    = oma_read_packet,

-    .read_seek      = oma_read_seek,

-    .flags          = AVFMT_GENERIC_INDEX,

-    .extensions     = "oma,omg,aa3",

-    .codec_tag      = (const AVCodecTag* const []){codec_oma_tags, 0},

+    { CODEC_ID_MP3,         OMA_CODECID_MP3     },

+    { CODEC_ID_PCM_S16BE,   OMA_CODECID_LPCM    },

+    { 0 },

 };

new file mode 100644

@@ -0,0 +1,39 @@

+/*

+ * Sony OpenMG (OMA) common data

+ *

+ * 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

+ */

+

+#ifndef AVFORMAT_OMA_H

+#define AVFORMAT_OMA_H

+

+#define EA3_HEADER_SIZE 96

+#define ID3v2_EA3_MAGIC "ea3"

+#define OMA_ENC_HEADER_SIZE 16

+

+enum {

+    OMA_CODECID_ATRAC3  = 0,

+    OMA_CODECID_ATRAC3P = 1,

+    OMA_CODECID_MP3     = 3,

+    OMA_CODECID_LPCM    = 4,

+    OMA_CODECID_WMA     = 5,

+};

+

+extern const uint16_t ff_oma_srate_tab[6];

+

+extern const AVCodecTag ff_oma_codec_tags[];

+#endif

new file mode 100644

@@ -0,0 +1,449 @@

+/*

+ * Sony OpenMG (OMA) demuxer

+ *

+ * Copyright (c) 2008 Maxim Poliakovski

+ *               2008 Benjamin Larsson

+ *               2011 David Goldwich

+ *

+ * This file is part of FFmpeg.

+ *

+ * 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.

+ *

+ * 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 FFmpeg; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+/**

+ * @file

+ * This is a demuxer for Sony OpenMG Music files

+ *

+ * Known file extensions: ".oma", "aa3"

+ * The format of such files consists of three parts:

+ * - "ea3" header carrying overall info and metadata. Except for starting with

+ *   "ea" instead of "ID", it's an ID3v2 header.

+ * - "EA3" header is a Sony-specific header containing information about

+ *   the OpenMG file: codec type (usually ATRAC, can also be MP3 or WMA),

+ *   codec specific info (packet size, sample rate, channels and so on)

+ *   and DRM related info (file encryption, content id).

+ * - Sound data organized in packets follow the EA3 header

+ *   (can be encrypted using the Sony DRM!).

+ *

+ * CODEC SUPPORT: Only ATRAC3 codec is currently supported!

+ */

+

+#include "avformat.h"

+#include "internal.h"

+#include "libavutil/intreadwrite.h"

+#include "libavutil/des.h"

+#include "oma.h"

+#include "pcm.h"

+#include "riff.h"

+#include "id3v2.h"

+

+

+static const uint64_t leaf_table[] = {

+    0xd79e8283acea4620, 0x7a9762f445afd0d8,

+    0x354d60a60b8c79f1, 0x584e1cde00b07aee,

+    0x1573cd93da7df623, 0x47f98d79620dd535