* 3gp patch by Joca

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1931 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

Makefile

@@ -43,12 +43,6 @@ EXTRALIBS+=-lmp3lame
 endif
 endif
 
-ifeq ($(AMR_NB),yes)
-EXTRALIBS+= libavcodec/amr/spc.a libavcodec/amr/fipop.a
-AMRLIBS=amrlibs
-CLEANAMR=cleanamr
-endif
-
 ifeq ($(CONFIG_VORBIS),yes)
 EXTRALIBS+=-logg -lvorbis -lvorbisenc
 endif
@@ -83,9 +77,6 @@ lib: $(AMRLIBS)
 	$(MAKE) -C libavcodec all
 	$(MAKE) -C libavformat all
 
-#make sure you have added -DMMS_IO to CFLAGS in libavcodec/amr/makefile!!
-amrlibs:
-	$(MAKE) -C libavcodec/amr spclib fipoplib
 
 ffmpeg_g$(EXE): ffmpeg.o .libs
 	$(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS)
@@ -138,7 +129,7 @@ endif
 	@test -f .libs || touch .libs
 	@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
 
-clean: $(CLEANVHOOK) $(CLEANAMR)
+clean: $(CLEANVHOOK)
 	$(MAKE) -C libavcodec clean
 	$(MAKE) -C libavformat clean
 	$(MAKE) -C tests clean
@@ -151,9 +142,6 @@ distclean: clean
 	$(MAKE) -C libavcodec distclean
 	rm -f config.mak config.h
 
-cleanamr:
-	$(MAKE) -C libavcodec/amr clean
-
 TAGS:
 	etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
 

configure

@@ -92,6 +92,7 @@ SLIBSUF=".so"
 risky="yes"
 small="no"
 amr_nb="no"
+amr_nb_fixed="no"
 
 # OS specific
 targetos=`uname -s`
@@ -322,6 +323,8 @@ for opt do
   ;;
   --enable-amr_nb) amr_nb="yes"
   ;;
+  --enable-amr_nb-fixed) amr_nb_fixed="yes"
+  ;;
   esac
 done
 
@@ -636,7 +639,8 @@ echo "  --enable-a52bin          open liba52.so.0 at runtime [default=no]"
 echo "  --disable-pp             disable GPL'ed post processing support [default=no]"
 echo "  --enable-shared-pp       use libpostproc.so [default=no]"
 echo "  --enable-shared          build shared libraries [default=no]"
-echo "  --enable-amr_nb          enable amr_nb audio codec"
+echo "  --enable-amr_nb          enable amr_nb float audio codec"
+echo "  --enable-amr_nb-fixed    use fixed point for amr-nb codec"
 echo ""
 echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path of source code [$source_path]"
@@ -702,7 +706,8 @@ if test "$vhook" = "yes" ; then
 echo "Imlib2 support   $imlib2"
 echo "freetype support $freetype2"
 fi
-echo "AMR-NB support"  $amr_nb
+echo "AMR-NB float support"  $amr_nb
+echo "AMR-NB fixed support"  $amr_nb_fixed
 
 echo "Creating config.mak and config.h"
 
@@ -984,13 +989,26 @@ if test "$amr_nb" = "yes" ; then
   echo "#define AMR_NB 1" >> $TMPH
   echo "AMR_NB=yes" >> config.mak
   echo
-  echo "AMR NB NOTICE! Make sure you have downloaded TS26.073 from "
+if test "$amr_nb_fixed" = "yes" ; then
+  echo "AMR_NB_FIXED=yes" >> config.mak
+  echo "#define AMR_NB_FIXED 1" >> $TMPH
+  echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
+  echo "REL-5 version 5.1.0 from "
   echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-510.zip"
   echo "and extracted src to libavcodec/amr"
-  echo "You must also add -DMMS_IO to CFLAGS in libavcodec/amr/makefile."
+  echo "You must also add -DMMS_IO and remove -pedantic-errors to/from CFLAGS in libavcodec/amr/makefile."
+  echo "i.e. CFLAGS = -Wall -I. \$(CFLAGS_\$(MODE)) -D\$(VAD) -DMMS_IO"
+  echo
+else
+  echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
+  echo "REL-5 V5.1.0 from "
+  echo "http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-510.zip"
+  echo "and extracted the source to libavcodec/amr_float"
   echo
 fi
 
+fi
+
 diff $TMPH config.h >/dev/null 2>&1
 if test $? -ne 0 ; then
 	mv -f $TMPH config.h

libavcodec/Makefile

@@ -20,7 +20,15 @@ OBJS= common.o utils.o mem.o allcodecs.o \
       vp3.o asv1.o 4xm.o cabac.o
 
 ifeq ($(AMR_NB),yes)
+ifeq ($(AMR_NB_FIXED),yes)
 OBJS+= amr.o
+AMREXTRALIBS+= amr/*.o
+AMRLIBS=amrlibs
+CLEANAMR=cleanamr
+else
+OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
+CLEANAMR=cleanamrfloat
+endif
 endif
 
 ASM_OBJS=
@@ -140,15 +148,18 @@ TESTS= imgresample-test dct-test motion-test fft-test
 
 all: $(LIB) $(SLIB)
 
+amrlibs:
+	$(MAKE) -C amr spclib fipoplib
+
 tests: apiexample cpuid_test $(TESTS)
 
-$(LIB): $(OBJS)
+$(LIB): $(OBJS) $(AMRLIBS)
 	rm -f $@
-	$(AR) rc $@ $(OBJS)
+	$(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
 	$(RANLIB) $@
 
 $(SLIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
+	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
 
 dsputil.o: dsputil.c dsputil.h
 
@@ -177,7 +188,7 @@ depend: $(SRCS)
 
 dep:	depend
 
-clean: 
+clean: $(CLEANAMR)
 	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
 	   armv4l/*.o armv4l/*~ \
 	   mlib/*.o mlib/*~ \
@@ -192,6 +203,12 @@ clean:
 distclean: clean
 	rm -f Makefile.bak .depend
 
+cleanamr:
+	$(MAKE) -C amr clean
+
+cleanamrfloat:
+	rm -f amr_float/*.o
+
 # api example program
 apiexample: apiexample.c $(LIB)
 	$(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm

libavcodec/allcodecs.c

@@ -113,6 +113,7 @@ void avcodec_register_all(void)
 
 #ifdef AMR_NB
     register_avcodec(&amr_nb_decoder);
+    register_avcodec(&amr_nb_encoder);
 #endif /* AMR_NB */
     /* pcm codecs */
 

libavcodec/avcodec.h

@@ -1245,6 +1245,7 @@ extern AVCodec h264_decoder;
 extern AVCodec indeo3_decoder;
 extern AVCodec vp3_decoder;
 extern AVCodec amr_nb_decoder;
+extern AVCodec amr_nb_encoder;
 extern AVCodec aac_decoder;
 extern AVCodec mpeg4aac_decoder;
 extern AVCodec asv1_decoder;

libavformat/Makefile

@@ -20,6 +20,10 @@ ifeq ($(CONFIG_RISKY),yes)
 OBJS+= asf.o
 endif
 
+ifeq ($(AMR_NB),yes)
+OBJS+= amr.o
+endif
+
 # image formats
 OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o
 # file I/O

libavformat/allformats.c

@@ -49,6 +49,9 @@ void av_register_all(void)
     dv_init();
     fourxm_init();
 
+#ifdef AMR_NB
+    amr_init();
+#endif
     av_register_output_format(&yuv4mpegpipe_oformat);
     
 #ifdef CONFIG_VORBIS

libavformat/avformat.h

@@ -310,6 +310,9 @@ int gif_init(void);
 /* au.c */
 int au_init(void);
 
+/* amr.c */
+int amr_init(void);
+
 /* wav.c */
 int wav_init(void);
 

libavformat/mov.c

@@ -1330,6 +1330,7 @@ static int mov_probe(AVProbeData *p)
         case MKTAG( 'f', 'r', 'e', 'e' ):
         case MKTAG( 'm', 'd', 'a', 't' ):
         case MKTAG( 'p', 'n', 'o', 't' ): /* detect movs with preview pics like ew.mov and april.mov */
+        case MKTAG( 'u', 'd', 't', 'a' ): /* Packet Video PVAuthor adds this and a lot of more junk */
             return AVPROBE_SCORE_MAX;
         case MKTAG( 'f', 't', 'y', 'p' ):
         case MKTAG( 's', 'k', 'i', 'p' ):
@@ -1486,6 +1487,33 @@ again:
 	    && ((msc->chunk_offsets[msc->next_chunk] - offset) < size))
 	    size = msc->chunk_offsets[msc->next_chunk] - offset;
     }
+
+#ifdef MOV_MINOLTA_FIX
+    //Make sure that size is according to sample_size (Needed by .mov files 
+    //created on a Minolta Dimage Xi where audio chunks contains waste data in the end)
+    //Maybe we should really not only check sc->sample_size, but also sc->sample_sizes
+    //but I have no such movies
+    if (sc->sample_size > 0) { 
+        int foundsize=0;
+        for(i=0; i<(sc->sample_to_chunk_sz); i++) {
+            if( (sc->sample_to_chunk[i].first)<=(sc->next_chunk) && (sc->sample_size>0) )
+            {
+                foundsize=sc->sample_to_chunk[i].count*sc->sample_size;
+            }
+#ifdef DEBUG
+            /*printf("sample_to_chunk first=%ld count=%ld, id=%ld\n", sc->sample_to_chunk[i].first, sc->sample_to_chunk[i].count, sc->sample_to_chunk[i].id);*/
+#endif
+        }
+        if( (foundsize>0) && (foundsize<size) )
+        {
+#ifdef DEBUG
+            /*printf("this size should actually be %d\n",foundsize);*/
+#endif
+            size=foundsize;
+        }
+    }
+#endif //MOV_MINOLTA_FIX
+
 #ifdef MOV_SPLIT_CHUNKS
     /* split chunks into samples */
     if (sc->sample_size == 0) {