[FFmpeg-cvslog] r23455 - in branches/0.6: . Changelog configure doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/libvpxenc.c

[siretart]

Author: siretart
Date: Thu Jun  3 23:36:38 2010
New Revision: 23455

Log:
VP8 encoding via libvpx.

Patch by James Zern, Google, Inc.


backport r23449 by cehoyos

Added:
   branches/0.6/libavcodec/libvpxenc.c
      - copied unchanged from r23449, trunk/libavcodec/libvpxenc.c
Modified:
   branches/0.6/   (props changed)
   branches/0.6/Changelog
   branches/0.6/configure
   branches/0.6/doc/general.texi
   branches/0.6/libavcodec/Makefile
   branches/0.6/libavcodec/allcodecs.c
   branches/0.6/libavcodec/avcodec.h

Modified: branches/0.6/Changelog
==============================================================================
--- branches/0.6/Changelog	Thu Jun  3 23:23:07 2010	(r23454)
+++ branches/0.6/Changelog	Thu Jun  3 23:36:38 2010	(r23455)
@@ -78,7 +78,7 @@ version 0.6:
 - faster H.264 decoding
 - low overhead Ogg muxing
 - WebM support in Matroska demuxer
-- VP8 decoding via libvpx
+- VP8 de/encoding via libvpx
 - CODEC_CAP_EXPERIMENTAL added
 
 

Modified: branches/0.6/configure
==============================================================================
--- branches/0.6/configure	Thu Jun  3 23:23:07 2010	(r23454)
+++ branches/0.6/configure	Thu Jun  3 23:36:38 2010	(r23455)
@@ -1352,6 +1352,7 @@ libspeex_decoder_deps="libspeex"
 libtheora_encoder_deps="libtheora"
 libvorbis_encoder_deps="libvorbis"
 libvpx_decoder_deps="libvpx"
+libvpx_encoder_deps="libvpx"
 libx264_encoder_deps="libx264"
 libxvid_encoder_deps="libxvid"
 
@@ -2616,7 +2617,8 @@ enabled libschroedinger && add_cflags $(
 enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex
 enabled libtheora  && require  libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
 enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
-enabled libvpx     && require2 libvpx "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver" -lvpx
+enabled libvpx     && require2 libvpx "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver" -lvpx &&
+                      require2 libvpx "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver" -lvpx
 enabled libx264    && require  libx264 x264.h x264_encoder_encode -lx264 -lm &&
                       { check_cpp_condition x264.h "X264_BUILD >= 83" ||
                         die "ERROR: libx264 version must be >= 0.83."; }

Modified: branches/0.6/doc/general.texi
==============================================================================
--- branches/0.6/doc/general.texi	Thu Jun  3 23:23:07 2010	(r23454)
+++ branches/0.6/doc/general.texi	Thu Jun  3 23:36:38 2010	(r23455)
@@ -437,8 +437,8 @@ following image formats are supported:
     @tab fourcc: VP50
 @item On2 VP6                @tab     @tab  X
     @tab fourcc: VP60,VP61,VP62
- at item VP8                    @tab     @tab  X
-    @tab fourcc: VP80, decoding supported through external library libvpx
+ at item VP8                    @tab  X  @tab  X
+    @tab fourcc: VP80, de/encoding supported through external library libvpx
 @item planar RGB             @tab     @tab  X
     @tab fourcc: 8BPS
 @item Q-team QPEG            @tab     @tab  X

Modified: branches/0.6/libavcodec/Makefile
==============================================================================
--- branches/0.6/libavcodec/Makefile	Thu Jun  3 23:23:07 2010	(r23454)
+++ branches/0.6/libavcodec/Makefile	Thu Jun  3 23:36:38 2010	(r23455)
@@ -526,6 +526,7 @@ OBJS-$(CONFIG_LIBSPEEX_DECODER)         
 OBJS-$(CONFIG_LIBTHEORA_ENCODER)          += libtheoraenc.o
 OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o
 OBJS-$(CONFIG_LIBVPX_DECODER)             += libvpxdec.o
+OBJS-$(CONFIG_LIBVPX_ENCODER)             += libvpxenc.o
 OBJS-$(CONFIG_LIBX264_ENCODER)            += libx264.o
 OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvidff.o libxvid_rc.o
 

Modified: branches/0.6/libavcodec/allcodecs.c
==============================================================================
--- branches/0.6/libavcodec/allcodecs.c	Thu Jun  3 23:23:07 2010	(r23454)
+++ branches/0.6/libavcodec/allcodecs.c	Thu Jun  3 23:36:38 2010	(r23455)
@@ -344,7 +344,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER (LIBSPEEX, libspeex);
     REGISTER_ENCODER (LIBTHEORA, libtheora);
     REGISTER_ENCODER (LIBVORBIS, libvorbis);
-    REGISTER_DECODER (LIBVPX, libvpx);
+    REGISTER_ENCDEC  (LIBVPX, libvpx);
     REGISTER_ENCODER (LIBX264, libx264);
     REGISTER_ENCODER (LIBXVID, libxvid);
 

Modified: branches/0.6/libavcodec/avcodec.h
==============================================================================
--- branches/0.6/libavcodec/avcodec.h	Thu Jun  3 23:23:07 2010	(r23454)
+++ branches/0.6/libavcodec/avcodec.h	Thu Jun  3 23:36:38 2010	(r23455)
@@ -31,7 +31,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 52
 #define LIBAVCODEC_VERSION_MINOR 72
-#define LIBAVCODEC_VERSION_MICRO  1
+#define LIBAVCODEC_VERSION_MICRO  2
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \