[FFmpeg-cvslog] r15286 - in trunk/libavcodec: libdiracenc.c libschroedingerenc.c

[diego]

Author: diego
Date: Tue Sep  9 16:47:47 2008
New Revision: 15286

Log:
Add support for creating Simple Profile (I-frame only, no arithmetic coding)
Dirac bytestreams.  patch by Anuradha Suraparaju, anuradha rd.bbc.co uk


Modified:
   trunk/libavcodec/libdiracenc.c
   trunk/libavcodec/libschroedingerenc.c

Modified: trunk/libavcodec/libdiracenc.c
==============================================================================
--- trunk/libavcodec/libdiracenc.c	(original)
+++ trunk/libavcodec/libdiracenc.c	Tue Sep  9 16:47:47 2008
@@ -175,9 +175,11 @@ static int libdirac_encode_init(AVCodecC
     }
 
     /* Intra-only sequence */
-    if (avccontext->gop_size == 0 )
+    if (avccontext->gop_size == 0 ) {
         p_dirac_params->enc_ctx.enc_params.num_L1 = 0;
-    else
+        if (avccontext->coder_type == FF_CODER_TYPE_VLC)
+            p_dirac_params->enc_ctx.enc_params.using_ac = 0;
+    } else
         avccontext->has_b_frames = 1;
 
     if (avccontext->flags & CODEC_FLAG_QSCALE) {

Modified: trunk/libavcodec/libschroedingerenc.c
==============================================================================
--- trunk/libavcodec/libschroedingerenc.c	(original)
+++ trunk/libavcodec/libschroedingerenc.c	Tue Sep  9 16:47:47 2008
@@ -149,6 +149,11 @@ static int libschroedinger_encode_init(A
         schro_encoder_setting_set_double (p_schro_params->encoder,
                                           "gop_structure",
                                           SCHRO_ENCODER_GOP_INTRA_ONLY);
+
+        if (avccontext->coder_type == FF_CODER_TYPE_VLC) {
+            schro_encoder_setting_set_double (p_schro_params->encoder,
+                                              "enable_noarith", 1);
+        }
     }
     else {
         schro_encoder_setting_set_double (p_schro_params->encoder,