@@ -79,11 +79,11 @@ OBJS-$(CONFIG_MM_DEMUXER)                += mm.o

 OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o raw.o

 OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o riff.o

 OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o riff.o isom.o

-OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o riff.o isom.o

+OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o riff.o isom.o avc.o

 OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o

 OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o

 OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o

-OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o riff.o isom.o

+OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o riff.o isom.o avc.o

 OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.o

 OBJS-$(CONFIG_MPC8_DEMUXER)              += mpc8.o

 OBJS-$(CONFIG_MPEG1SYSTEM_MUXER)         += mpegenc.o

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

                                             oggparsevorbis.o \

                                             riff.o

 OBJS-$(CONFIG_OGG_MUXER)                 += oggenc.o

-OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o

+OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o avc.o

 OBJS-$(CONFIG_PVA_DEMUXER)               += pva.o

 OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.o

 OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.o

@@ -133,8 +133,8 @@ OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o raw.o

 OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o

 OBJS-$(CONFIG_SWF_DEMUXER)               += swf.o

 OBJS-$(CONFIG_SWF_MUXER)                 += swf.o

-OBJS-$(CONFIG_TG2_MUXER)                 += movenc.o riff.o isom.o

-OBJS-$(CONFIG_TGP_MUXER)                 += movenc.o riff.o isom.o

+OBJS-$(CONFIG_TG2_MUXER)                 += movenc.o riff.o isom.o avc.o

+OBJS-$(CONFIG_TGP_MUXER)                 += movenc.o riff.o isom.o avc.o

 OBJS-$(CONFIG_THP_DEMUXER)               += thp.o

 OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.o

 OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o

new file mode 100644

@@ -0,0 +1,135 @@

+/*

+ * AVC helper functions for muxers

+ * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@smartjog.com>

+ *

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

+ */

+#include "avformat.h"

+#include "avio.h"

+

+static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )

+{

+    uint8_t *a = p + 4 - ((long)p & 3);

+

+    for( end -= 3; p < a && p < end; p++ ) {

+        if( p[0] == 0 && p[1] == 0 && p[2] == 1 )

+            return p;

+    }

+

+    for( end -= 3; p < end; p += 4 ) {

+        uint32_t x = *(uint32_t*)p;

+//      if( (x - 0x01000100) & (~x) & 0x80008000 ) // little endian

+//      if( (x - 0x00010001) & (~x) & 0x00800080 ) // big endian

+        if( (x - 0x01010101) & (~x) & 0x80808080 ) { // generic

+            if( p[1] == 0 ) {

+                if( p[0] == 0 && p[2] == 1 )

+                    return p-1;

+                if( p[2] == 0 && p[3] == 1 )

+                    return p;

+            }

+            if( p[3] == 0 ) {

+                if( p[2] == 0 && p[4] == 1 )

+                    return p+1;

+                if( p[4] == 0 && p[5] == 1 )

+                    return p+2;

+            }

+        }

+    }

+

+    for( end += 3; p < end; p++ ) {

+        if( p[0] == 0 && p[1] == 0 && p[2] == 1 )

+            return p;

+    }

+

+    return end + 3;

+}

+

+int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)

+{

+    ByteIOContext *pb;

+    uint8_t *p = buf_in;

+    uint8_t *end = p + *size;

+    uint8_t *nal_start, *nal_end;

+    int ret = url_open_dyn_buf(&pb);

+    if(ret < 0)

+        return ret;

+

+    nal_start = avc_find_startcode(p, end);

+    while (nal_start < end) {

+        while(!*(nal_start++));

+        nal_end = avc_find_startcode(nal_start, end);

+        put_be32(pb, nal_end - nal_start);

+        put_buffer(pb, nal_start, nal_end - nal_start);

+        nal_start = nal_end;

+    }

+    av_freep(buf);

+    *size = url_close_dyn_buf(pb, buf);

+    return 0;

+}

+

+int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)

+{

+    if (len > 6) {

+        /* check for h264 start code */

+        if (AV_RB32(data) == 0x00000001) {

+            uint8_t *buf=NULL, *end;

+            uint32_t sps_size=0, pps_size=0;

+            uint8_t *sps=0, *pps=0;

+

+            int ret = avc_parse_nal_units(data, &buf, &len);

+            if (ret < 0)

+                return ret;

+            data = buf;

+            end = buf + len;

+

+            /* look for sps and pps */

+            while (buf < end) {

+                unsigned int size;

+                uint8_t nal_type;

+                size = AV_RB32(buf);

+                nal_type = buf[4] & 0x1f;

+                if (nal_type == 7) { /* SPS */

+                    sps = buf + 4;

+                    sps_size = size;

+                } else if (nal_type == 8) { /* PPS */

+                    pps = buf + 4;

+                    pps_size = size;

+                }

+                buf += size + 4;

+            }

+            assert(sps);

+            assert(pps);

+

+            put_byte(pb, 1); /* version */

+            put_byte(pb, sps[1]); /* profile */

+            put_byte(pb, sps[2]); /* profile compat */

+            put_byte(pb, sps[3]); /* level */

+            put_byte(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */

+            put_byte(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */

+

+            put_be16(pb, sps_size);

+            put_buffer(pb, sps, sps_size);

+            put_byte(pb, 1); /* number of pps */

+            put_be16(pb, pps_size);

+            put_buffer(pb, pps, pps_size);

+            av_free(data);

+        } else {

+            put_buffer(pb, data, len);

+        }

+    }

+    return 0;

+}

new file mode 100644

@@ -0,0 +1,31 @@

+/*

+ * AVC helper functions for muxers

+ * Copyright (c) 2008 Aurelien Jacobs <aurel@gnuage.org>

+ *

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

+ */

+

+#ifndef AVC_H

+#define AVC_H

+

+#include <stdint.h>

+#include "avio.h"

+

+int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size);

+int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len);

+

+#endif /* AVC_H */

@@ -23,6 +23,7 @@

 #include "riff.h"

 #include "avio.h"

 #include "isom.h"

+#include "avc.h"

 #undef NDEBUG

 #include <assert.h>

@@ -415,119 +416,6 @@ static int mov_write_svq3_tag(ByteIOContext *pb)

     return 0x15;

 }

-static uint8_t *avc_find_startcode( uint8_t *p, uint8_t *end )

-{

-    uint8_t *a = p + 4 - ((long)p & 3);

-

-    for( end -= 3; p < a && p < end; p++ ) {

-        if( p[0] == 0 && p[1] == 0 && p[2] == 1 )

-            return p;

-    }

-

-    for( end -= 3; p < end; p += 4 ) {

-        uint32_t x = *(uint32_t*)p;

-//      if( (x - 0x01000100) & (~x) & 0x80008000 ) // little endian

-//      if( (x - 0x00010001) & (~x) & 0x00800080 ) // big endian

-        if( (x - 0x01010101) & (~x) & 0x80808080 ) { // generic

-            if( p[1] == 0 ) {

-                if( p[0] == 0 && p[2] == 1 )

-                    return p-1;

-                if( p[2] == 0 && p[3] == 1 )

-                    return p;

-            }

-            if( p[3] == 0 ) {

-                if( p[2] == 0 && p[4] == 1 )

-                    return p+1;

-                if( p[4] == 0 && p[5] == 1 )

-                    return p+2;

-            }

-        }

-    }

-

-    for( end += 3; p < end; p++ ) {

-        if( p[0] == 0 && p[1] == 0 && p[2] == 1 )

-            return p;

-    }

-

-    return end + 3;

-}

-

-static int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)

-{

-    ByteIOContext *pb;

-    uint8_t *p = buf_in;

-    uint8_t *end = p + *size;

-    uint8_t *nal_start, *nal_end;

-    int ret = url_open_dyn_buf(&pb);

-    if(ret < 0)

-        return ret;

-

-    nal_start = avc_find_startcode(p, end);

-    while (nal_start < end) {

-        while(!*(nal_start++));

-        nal_end = avc_find_startcode(nal_start, end);

-        put_be32(pb, nal_end - nal_start);

-        put_buffer(pb, nal_start, nal_end - nal_start);

-        nal_start = nal_end;

-    }

-    av_freep(buf);

-    *size = url_close_dyn_buf(pb, buf);

-    return 0;

-}

-

-static int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)

-{

-    if (len > 6) {

-        /* check for h264 start code */

-        if (AV_RB32(data) == 0x00000001) {

-            uint8_t *buf=NULL, *end;

-            uint32_t sps_size=0, pps_size=0;

-            uint8_t *sps=0, *pps=0;

-

-            int ret = avc_parse_nal_units(data, &buf, &len);

-            if (ret < 0)

-                return ret;

-            data = buf;

-            end = buf + len;

-

-            /* look for sps and pps */

-            while (buf < end) {

-                unsigned int size;

-                uint8_t nal_type;

-                size = AV_RB32(buf);

-                nal_type = buf[4] & 0x1f;

-                if (nal_type == 7) { /* SPS */

-                    sps = buf + 4;

-                    sps_size = size;

-                } else if (nal_type == 8) { /* PPS */

-                    pps = buf + 4;

-                    pps_size = size;

-                }

-                buf += size + 4;

-            }

-            assert(sps);

-            assert(pps);

-

-            put_byte(pb, 1); /* version */

-            put_byte(pb, sps[1]); /* profile */

-            put_byte(pb, sps[2]); /* profile compat */

-            put_byte(pb, sps[3]); /* level */

-            put_byte(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */

-            put_byte(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */

-

-            put_be16(pb, sps_size);

-            put_buffer(pb, sps, sps_size);

-            put_byte(pb, 1); /* number of pps */

-            put_be16(pb, pps_size);

-            put_buffer(pb, pps, pps_size);

-            av_free(data);

-        } else {

-            put_buffer(pb, data, len);

-        }

-    }

-    return 0;

-}

-

 static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)

 {

     offset_t pos = url_ftell(pb);