[Dirac-commits] compress/extras/patches FFMpeg-20051205-dirac-0.5.x.patch,NONE,1.1 README_FFMpeg-20051205-dirac-0.5.x_patch,NONE,1.1

[Anuradha S. <asu...@us...>]

Update of /cvsroot/dirac/compress/extras/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28174

Added Files:
	FFMpeg-20051205-dirac-0.5.x.patch 
	README_FFMpeg-20051205-dirac-0.5.x_patch 
Log Message:
FFMpeg patch for cvs version dated 05-Dec-2005.


--- NEW FILE: FFMpeg-20051205-dirac-0.5.x.patch ---
diff -ruN --exclude=CVS ffmpeg-cvs/configure ffmpeg-cvs-dirac/configure
--- ffmpeg-cvs/configure	2005-11-29 21:12:30.000000000 +0000
+++ ffmpeg-cvs-dirac/configure	2005-12-01 15:51:21.000000000 +0000
@@ -42,6 +42,7 @@
 echo "                           and libraw1394 [default=no]"
 echo "  --enable-gpl             allow use of GPL code, the resulting libav*"
 echo "                           and ffmpeg will be under GPL [default=no]"
+echo "  --enable-dirac           enable dirac codec support via libdirac_encoder/decoder [default=no]"
 echo ""
 echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path to source code [$source_path]"
@@ -207,6 +208,7 @@
 dostrip="yes"
 installstrip="-s"
 extralibs="-lm"
+extraincs=""
 simpleidct="yes"
 bigendian="no"
 inttypes="yes"
[...994 lines suppressed...]
+    OBJS+= drc.o
+	EXTRALIBS+=$(DIRAC_LIB)
+	CFLAGS+=$(DIRAC_INC)
+endif
+
 ifeq ($(CONFIG_VIDEO4LINUX),yes)
 OBJS+= grab.o
 endif
diff -ruN --exclude=CVS ffmpeg-cvs/Makefile ffmpeg-cvs-dirac/Makefile
--- ffmpeg-cvs/Makefile	2005-10-18 21:11:41.000000000 +0100
+++ ffmpeg-cvs-dirac/Makefile	2005-11-15 11:36:51.000000000 +0000
@@ -6,7 +6,7 @@
 
 VPATH=$(SRC_PATH)
 
-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat $(EXTRAINCS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 LDFLAGS+= -g 
 
 ifeq ($(TARGET_GPROF),yes)

--- NEW FILE: README_FFMpeg-20051205-dirac-0.5.x_patch ---
**Dirac patch for ffmpeg
**Tested with ffmpeg cvs version dated 05-12-2005
**Author: dir...@so...

Dirac is an open-source video codec currently under development. Both the 
encoder and decoder have been integrated with ffmpeg. This patch is only a 
basic integration such that only the salient paremeters are currently passed 
from ffmpeg to Dirac. As Dirac develops, especially with the integration of
a formalised bit-stream syntax,  then more complex screnarios can be dealt with.
Encoded Dirac files, with the right patch, can be played back using MPlayer.

Please feel free to modify/add-to the code. 

These are the instructions for enabling Dirac support in ffmpeg source
code.

1. Download Dirac 0.5.4 from
   http://sourceforge.net/projects/dirac/

2. Unpack the Dirac source
   tar xvzf dirac-0.5.4.tar.gz

3. Build and Install

   cd dirac-0.5.4
   ./configure 
   make
   make install

   The last step installs the Dirac share encoder and decoder libraries in
   /usr/local/lib (which is the default install point).
   
3. Download ffmpeg cvs version dated 05-12-2005

   cvs -d FFMpeg-20051205 -D 20051205 ffmpeg

4. Apply the patch

   cd FFMpeg-20051205
   patch -p1 < FFMpeg-20051205-dirac-0.5.x.patch

6. Build and Install
   
   ./configure --enable-dirac
   make 
   make install

The option '--enable-dirac' must be used during configuration in order to 
pick-up the Dirac code during building. pkg-config is used to determine if
dirac is available. Note that on some systems pkg-config is not available by
default and will have to be installed.


Sample Usage: (encoding)
ffmpeg -s 720x576 -i input_file.yuv -vcodec dirac -qscale 15 -f rawvideo dirac_output.drc

Currently, the output from the encoder is exactly as it is written to the .drc 
encoded file ( hence the '-f rawvideo' output). Dirac bit-rate is controlled by 
a quality-factor (currently a basic intepretation from qscale. A qscale of
1 maps to dirac uality factor 10 and 30 maps to quality factor 1)

(decoding)
ffmpeg -i input.drc -f rawvideo output.yuv

Dirac can also be invoked via ffmpeg using transcode after applying the 
transcode patch.
transcode -i input.avi -x raw -i raw_input.avi -y ffmpeg -F dirac,null -o dirac_output.avi